From 2c8e782c0ff823a452aefef9a499d5f85d3d059b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 11 Nov 2020 23:10:59 +0000 Subject: Wed Nov 11 23:10:59 UTC 2020 a/kernel-generic-5.4.77-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.77-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.77-x86_64-1.txz: Upgraded. ap/lsof-4.94.0-x86_64-1.txz: Upgraded. ap/mariadb-10.5.8-x86_64-1.txz: Upgraded. d/gnucobol-3.1-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.77-x86-1.txz: Upgraded. k/kernel-source-5.4.77-noarch-1.txz: Upgraded. l/python-urllib3-1.26.0-x86_64-1.txz: Upgraded. n/openldap-2.4.56-x86_64-1.txz: Upgraded. xap/mozilla-thunderbird-78.4.3-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/78.4.3/releasenotes/ isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/vtown/kde/sddm-0.19.0-x86_64-1_vtown_1.txz: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- .../vtown/kde/sddm-0.18.1-x86_64-1_vtown_3.txt | 11 --- .../vtown/kde/sddm-0.19.0-x86_64-1_vtown_1.txt | 11 +++ testing/source/vtown/kde/build/sddm | 2 +- .../source/vtown/kde/build/vtown-build-number/sddm | 2 +- testing/source/vtown/kde/patch/sddm.patch | 20 ----- testing/source/vtown/kde/patch/sddm/sddm_auth.diff | 25 ------ .../source/vtown/kde/patch/sddm/sddm_avatars.patch | 33 -------- .../vtown/kde/patch/sddm/sddm_ck2_revert.patch | 20 ----- .../vtown/kde/patch/sddm/sddm_consolekit.diff | 9 --- .../source/vtown/kde/patch/sddm/sddm_qstring.patch | 88 ---------------------- .../vtown/kde/patch/sddm/sddm_userxsession.diff | 13 ---- testing/source/vtown/kde/slack-desc/sddm | 2 +- 12 files changed, 14 insertions(+), 222 deletions(-) delete mode 100644 testing/packages/vtown/kde/sddm-0.18.1-x86_64-1_vtown_3.txt create mode 100644 testing/packages/vtown/kde/sddm-0.19.0-x86_64-1_vtown_1.txt delete mode 100644 testing/source/vtown/kde/patch/sddm/sddm_auth.diff delete mode 100644 testing/source/vtown/kde/patch/sddm/sddm_avatars.patch delete mode 100644 testing/source/vtown/kde/patch/sddm/sddm_ck2_revert.patch delete mode 100644 testing/source/vtown/kde/patch/sddm/sddm_consolekit.diff delete mode 100644 testing/source/vtown/kde/patch/sddm/sddm_qstring.patch delete mode 100644 testing/source/vtown/kde/patch/sddm/sddm_userxsession.diff (limited to 'testing') diff --git a/testing/packages/vtown/kde/sddm-0.18.1-x86_64-1_vtown_3.txt b/testing/packages/vtown/kde/sddm-0.18.1-x86_64-1_vtown_3.txt deleted file mode 100644 index 488681535..000000000 --- a/testing/packages/vtown/kde/sddm-0.18.1-x86_64-1_vtown_3.txt +++ /dev/null @@ -1,11 +0,0 @@ -sddm: sddm (QML based X11 display manager) -sddm: -sddm: SDDM is a modern display manager for X11 aiming to be fast, simple and -sddm: beautiful. It uses modern technologies like QtQuick, which in turn -sddm: gives the designer the ability to create smooth, animated user -sddm: interfaces. SDDM is extremely themeable. There are a few sample themes -sddm: distributed with SDDM. They can be used as a starting point for new -sddm: themes. -sddm: -sddm: Homepage: https://github.com/sddm/ -sddm: diff --git a/testing/packages/vtown/kde/sddm-0.19.0-x86_64-1_vtown_1.txt b/testing/packages/vtown/kde/sddm-0.19.0-x86_64-1_vtown_1.txt new file mode 100644 index 000000000..5dadb80ee --- /dev/null +++ b/testing/packages/vtown/kde/sddm-0.19.0-x86_64-1_vtown_1.txt @@ -0,0 +1,11 @@ +sddm: sddm (QML based X11 display manager) +sddm: +sddm: SDDM is a modern display manager for X11 aiming to be fast, simple and +sddm: beautiful. It uses modern technologies like QtQuick, which in turn +sddm: gives the designer the ability to create smooth, animated user +sddm: interfaces. SDDM is extremely themeable. There are a few sample themes +sddm: distributed with SDDM. They can be used as a starting point for new +sddm: themes. +sddm: +sddm: Homepage: https://github.com/sddm/sddm +sddm: diff --git a/testing/source/vtown/kde/build/sddm b/testing/source/vtown/kde/build/sddm index 951e7a5b2..2739e2ea5 100644 --- a/testing/source/vtown/kde/build/sddm +++ b/testing/source/vtown/kde/build/sddm @@ -1 +1 @@ -1_vtown_3 +1_vtown_1 diff --git a/testing/source/vtown/kde/build/vtown-build-number/sddm b/testing/source/vtown/kde/build/vtown-build-number/sddm index 00750edc0..d00491fd7 100644 --- a/testing/source/vtown/kde/build/vtown-build-number/sddm +++ b/testing/source/vtown/kde/build/vtown-build-number/sddm @@ -1 +1 @@ -3 +1 diff --git a/testing/source/vtown/kde/patch/sddm.patch b/testing/source/vtown/kde/patch/sddm.patch index e433a27e4..a77c521f6 100644 --- a/testing/source/vtown/kde/patch/sddm.patch +++ b/testing/source/vtown/kde/patch/sddm.patch @@ -1,23 +1,3 @@ -if [ "$SLKELOGIND" == "no" ]; then - # Add missing consolekit support - # (brings back the switch_user functionality in KDE): - cat $CWD/patch/sddm/sddm_consolekit.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - - # Don't assume that ConsoleKit2 exposes a login1 dbus interface: - cat $CWD/patch/sddm/sddm_ck2_revert.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -fi - # Properly honor supplemental groups, https://github.com/sddm/sddm/issues/1159 : cat $CWD/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } cat $CWD/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# SDDM 0.14 sources $HOME/.xsession which in Slackware will override the -# session selection you make in SDDM. We fix that unwanted side effect by -# reverting the change: -cat $CWD/patch/sddm/sddm_userxsession.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - -# Add the dutch translation: -if ! grep -q nl.ts data/translations/CMakeLists.txt ; then - sed -e '/set(TRANSLATION_FILES/s/TRANSLATION_FILES/&\n nl.ts/' \ - -i data/translations/CMakeLists.txt -fi diff --git a/testing/source/vtown/kde/patch/sddm/sddm_auth.diff b/testing/source/vtown/kde/patch/sddm/sddm_auth.diff deleted file mode 100644 index f5d21cf67..000000000 --- a/testing/source/vtown/kde/patch/sddm/sddm_auth.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -uar sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.cpp sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.cpp ---- sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.cpp 2014-08-27 16:42:23.000000000 +0200 -+++ sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.cpp 2014-09-15 12:24:06.717173942 +0200 -@@ -20,8 +20,8 @@ - - #include "PasswdBackend.h" - --#include "auth/AuthMessages.h" --#include "helper/HelperApp.h" -+#include "Auth.h" -+#include "../HelperApp.h" - - #include - -diff -uar sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.h sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.h ---- sddm-qt5-7c8cc3a_20140827git.orig/src/helper/backend/PasswdBackend.h 2014-08-27 16:42:23.000000000 +0200 -+++ sddm-qt5-7c8cc3a_20140827git/src/helper/backend/PasswdBackend.h 2014-09-15 12:17:43.135172278 +0200 -@@ -21,6 +21,7 @@ - #if !defined(PASSWDBACKEND_H) && !defined(USE_PAM) - #define PASSWDBACKEND_H - -+#include "AuthMessages.h" - #include "../Backend.h" - - namespace SDDM { diff --git a/testing/source/vtown/kde/patch/sddm/sddm_avatars.patch b/testing/source/vtown/kde/patch/sddm/sddm_avatars.patch deleted file mode 100644 index d40f68c10..000000000 --- a/testing/source/vtown/kde/patch/sddm/sddm_avatars.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ecb903e48822bd90650bdd64fe80754e3e9664cb Mon Sep 17 00:00:00 2001 -From: Bastian Beischer -Date: Fri, 2 Sep 2016 13:05:18 +0200 -Subject: [PATCH] Fix display of user avatars. (#684) - -QFile::exists("...") does not understand file:// URLs, at least in Qt -5.7.0 and Qt 4.8.7. ---- - src/greeter/UserModel.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp -index 41a9f10..94c492d 100644 ---- a/src/greeter/UserModel.cpp -+++ b/src/greeter/UserModel.cpp -@@ -107,13 +107,13 @@ namespace SDDM { - d->lastIndex = i; - - if (avatarsEnabled) { -- const QString userFace = QStringLiteral("file://%1/.face.icon").arg(user->homeDir); -- const QString systemFace = QStringLiteral("file://%1/%2.face.icon").arg(facesDir).arg(user->name); -+ const QString userFace = QStringLiteral("%1/.face.icon").arg(user->homeDir); -+ const QString systemFace = QStringLiteral("%1/%2.face.icon").arg(facesDir).arg(user->name); - - if (QFile::exists(userFace)) -- user->icon = userFace; -+ user->icon = QStringLiteral("file://%1").arg(userFace); - else if (QFile::exists(systemFace)) -- user->icon = systemFace; -+ user->icon = QStringLiteral("file://%1").arg(systemFace); - } - } - } diff --git a/testing/source/vtown/kde/patch/sddm/sddm_ck2_revert.patch b/testing/source/vtown/kde/patch/sddm/sddm_ck2_revert.patch deleted file mode 100644 index bbe2a2728..000000000 --- a/testing/source/vtown/kde/patch/sddm/sddm_ck2_revert.patch +++ /dev/null @@ -1,20 +0,0 @@ -SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2 -has the same interface names as logind. - -This patch forces sddm to use legacy behaviour when consolekit2 is detected. - -Bug: https://bugs.gentoo.org/633920 -Bug: https://github.com/sddm/sddm/issues/903 -Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99 - ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -60,7 +60,7 @@ - - if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { - qDebug() << "Console kit interface found"; -- available = true; -+ available = false; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); - managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind diff --git a/testing/source/vtown/kde/patch/sddm/sddm_consolekit.diff b/testing/source/vtown/kde/patch/sddm/sddm_consolekit.diff deleted file mode 100644 index 9b535bf71..000000000 --- a/testing/source/vtown/kde/patch/sddm/sddm_consolekit.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- sddm-0.14.0/data/scripts/Xsession.orig 2016-08-28 13:54:03.000000000 +0200 -+++ sddm-0.14.0/data/scripts/Xsession 2016-11-05 21:47:28.502096600 +0100 -@@ -91,5 +91,5 @@ - if [ -z "$@" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - else -- exec $@ -+ exec ck-launch-session dbus-launch --sh-syntax --exit-with-session $@ - fi diff --git a/testing/source/vtown/kde/patch/sddm/sddm_qstring.patch b/testing/source/vtown/kde/patch/sddm/sddm_qstring.patch deleted file mode 100644 index 40c3879af..000000000 --- a/testing/source/vtown/kde/patch/sddm/sddm_qstring.patch +++ /dev/null @@ -1,88 +0,0 @@ -Slightly modified from this patch in order to apply against SDDM master git: -https://github.com/AOSC-Dev/sddm/commit/c6be72636f43a28f1b6aebff9d682d0182dd7a1e.patch - -From c6be72636f43a28f1b6aebff9d682d0182dd7a1e Mon Sep 17 00:00:00 2001 -From: Leslie Zhai -Date: Mon, 31 Aug 2015 14:04:17 +0800 -Subject: [PATCH] Disable pam backend because loginFailed - ---- -diff -uar sddm-d42700a_20150822git.orig/CMakeLists.txt sddm-d42700a_20150822git/CMakeLists.txt ---- sddm-d42700a_20150822git.orig/CMakeLists.txt 2015-08-22 16:17:37.000000000 +0200 -+++ sddm-d42700a_20150822git/CMakeLists.txt 2015-08-31 12:01:47.342810382 +0200 -@@ -31,6 +31,7 @@ - # Options - option(BUILD_MAN_PAGES "Build man pages" OFF) - option(ENABLE_JOURNALD "Enable logging to journald" ON) -+option(ENABLE_PAM "Enable pam" OFF) - - # Definitions - add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) -@@ -66,7 +67,7 @@ - find_package(PkgConfig) - - # PAM --if(NOT NO_PAM) -+if(ENABLE_PAM) - find_package(PAM) - - if(PAM_FOUND) -diff -uar sddm-d42700a_20150822git.orig/src/helper/backend/PasswdBackend.cpp sddm-d42700a_20150822git/src/helper/backend/PasswdBackend.cpp ---- sddm-d42700a_20150822git.orig/src/helper/backend/PasswdBackend.cpp 2015-08-22 16:17:37.000000000 +0200 -+++ sddm-d42700a_20150822git/src/helper/backend/PasswdBackend.cpp 2015-08-31 12:00:43.995324823 +0200 -@@ -38,7 +38,7 @@ - if (m_autologin) - return true; - -- if (m_user == "sddm") { -+ if (m_user == QStringLiteral("sddm")) { - if (m_greeter) - return true; - else -@@ -49,17 +49,17 @@ - QString password; - - if (m_user.isEmpty()) -- r.prompts << Prompt(AuthPrompt::LOGIN_USER, "Login", false); -- r.prompts << Prompt(AuthPrompt::LOGIN_PASSWORD, "Password", true); -+ r.prompts << Prompt(AuthPrompt::LOGIN_USER, QStringLiteral("Login"), false); -+ r.prompts << Prompt(AuthPrompt::LOGIN_PASSWORD, QStringLiteral("Password"), true); - - Request response = m_app->request(r); - Q_FOREACH(const Prompt &p, response.prompts) { - switch (p.type) { - case AuthPrompt::LOGIN_USER: -- m_user = p.response; -+ m_user = QString::fromUtf8(p.response); - break; - case AuthPrompt::LOGIN_PASSWORD: -- password = p.response; -+ password = QString::fromUtf8(p.response); - break; - default: - break; -@@ -68,13 +68,13 @@ - - struct passwd *pw = getpwnam(qPrintable(m_user)); - if (!pw) { -- m_app->error(QString("Wrong user/password combination"), Auth::ERROR_AUTHENTICATION); -+ m_app->error(QStringLiteral("Wrong user/password combination"), Auth::ERROR_AUTHENTICATION); - return false; - } - - struct spwd *spw = getspnam(pw->pw_name); - if (!spw) { -- qWarning() << "[Passwd] Could get passwd but not shadow"; -+ qWarning() << QStringLiteral("[Passwd] Could get passwd but not shadow"); - return false; - } - -@@ -86,7 +86,7 @@ - return true; - } - -- m_app->error(QString("Wrong user/password combination"), Auth::ERROR_AUTHENTICATION); -+ m_app->error(QStringLiteral("Wrong user/password combination"), Auth::ERROR_AUTHENTICATION); - return false; - } - diff --git a/testing/source/vtown/kde/patch/sddm/sddm_userxsession.diff b/testing/source/vtown/kde/patch/sddm/sddm_userxsession.diff deleted file mode 100644 index 3dcea1f0b..000000000 --- a/testing/source/vtown/kde/patch/sddm/sddm_userxsession.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- sddm-0.18.1/data/scripts/Xsession.orig 2018-09-26 21:03:47.000000000 +0200 -+++ sddm-0.18.1/data/scripts/Xsession 2020-01-21 11:55:24.997845799 +0100 -@@ -91,10 +91,6 @@ - fi - [ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources - --if [ -f "$USERXSESSION" ]; then -- . "$USERXSESSION" --fi -- - if [ -z "$*" ]; then - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - else diff --git a/testing/source/vtown/kde/slack-desc/sddm b/testing/source/vtown/kde/slack-desc/sddm index 1cd2d0584..7fa590b2a 100644 --- a/testing/source/vtown/kde/slack-desc/sddm +++ b/testing/source/vtown/kde/slack-desc/sddm @@ -15,5 +15,5 @@ sddm: interfaces. SDDM is extremely themeable. There are a few sample themes sddm: distributed with SDDM. They can be used as a starting point for new sddm: themes. sddm: -sddm: Homepage: https://github.com/sddm/ +sddm: Homepage: https://github.com/sddm/sddm sddm: -- cgit v1.2.3