From 9ff323e2980e0daa822d5ad430bd68263431b1b5b8e8bbb55a3805f382fdf03e Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 17 May 2019 18:24:31 +0000 Subject: [PATCH 1/3] Plasma 5.16 Beta, 2nd try. Please publish disable K:F5 before accepting, to give openQA a chance. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=453 --- 0001-Rename-qdbus-in-startkde.patch | 38 +++++++++---------- ...t-No-icons-on-the-desktop-by-default.patch | 32 +++++++--------- ...GTK_BACKEND-x11-in-a-wayland-session.patch | 13 ++++--- lazy-sddm-theme.patch | 27 ++++++------- plasma-workspace-5.15.5.tar.xz | 3 -- plasma-workspace-5.15.5.tar.xz.sig | 11 ------ plasma-workspace-5.15.90.tar.xz | 3 ++ plasma-workspace-5.15.90.tar.xz.sig | 11 ++++++ plasma5-workspace.changes | 14 +++++++ plasma5-workspace.spec | 27 +++++++------ 10 files changed, 97 insertions(+), 82 deletions(-) delete mode 100644 plasma-workspace-5.15.5.tar.xz delete mode 100644 plasma-workspace-5.15.5.tar.xz.sig create mode 100644 plasma-workspace-5.15.90.tar.xz create mode 100644 plasma-workspace-5.15.90.tar.xz.sig diff --git a/0001-Rename-qdbus-in-startkde.patch b/0001-Rename-qdbus-in-startkde.patch index f422070..e22bfd7 100644 --- a/0001-Rename-qdbus-in-startkde.patch +++ b/0001-Rename-qdbus-in-startkde.patch @@ -1,8 +1,8 @@ -Index: plasma-workspace-5.13.3/startkde/startkde.cmake +Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/startkde/startkde.cmake =================================================================== ---- plasma-workspace-5.13.3.orig/startkde/startkde.cmake -+++ plasma-workspace-5.13.3/startkde/startkde.cmake -@@ -294,7 +294,7 @@ if test $? -ne 0; then +--- plasma-workspace-5.15.80git.20190309T171418~4ede2e10.orig/startkde/startkde.cmake 2019-03-09 17:14:18.000000000 +0100 ++++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/startkde/startkde.cmake 2019-03-10 14:10:17.814466955 +0100 +@@ -258,7 +258,7 @@ exit 1 fi @@ -11,7 +11,7 @@ Index: plasma-workspace-5.13.3/startkde/startkde.cmake # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -327,13 +327,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t +@@ -292,13 +292,13 @@ # wait for remaining drkonqi instances with timeout (in seconds) wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` wait_drkonqi_counter=0 @@ -28,11 +28,11 @@ Index: plasma-workspace-5.13.3/startkde/startkde.cmake done break fi -Index: plasma-workspace-5.13.3/startkde/startplasma.cmake +Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/startkde/startplasma.cmake =================================================================== ---- plasma-workspace-5.13.3.orig/startkde/startplasma.cmake -+++ plasma-workspace-5.13.3/startkde/startplasma.cmake -@@ -140,7 +140,7 @@ if test $? -ne 0; then +--- plasma-workspace-5.15.80git.20190309T171418~4ede2e10.orig/startkde/startplasma.cmake 2019-03-09 17:14:18.000000000 +0100 ++++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/startkde/startplasma.cmake 2019-03-10 14:10:17.814466955 +0100 +@@ -99,7 +99,7 @@ exit 1 fi @@ -41,7 +41,7 @@ Index: plasma-workspace-5.13.3/startkde/startplasma.cmake # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -169,13 +169,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t +@@ -131,13 +131,13 @@ # wait for remaining drkonqi instances with timeout (in seconds) wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` wait_drkonqi_counter=0 @@ -58,11 +58,11 @@ Index: plasma-workspace-5.13.3/startkde/startplasma.cmake done break fi -Index: plasma-workspace-5.13.3/startkde/startplasmacompositor.cmake +Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/startkde/startplasmacompositor.cmake =================================================================== ---- plasma-workspace-5.13.3.orig/startkde/startplasmacompositor.cmake -+++ plasma-workspace-5.13.3/startkde/startplasmacompositor.cmake -@@ -120,12 +120,12 @@ fi +--- plasma-workspace-5.15.80git.20190309T171418~4ede2e10.orig/startkde/startplasmacompositor.cmake 2019-03-09 17:14:18.000000000 +0100 ++++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/startkde/startplasmacompositor.cmake 2019-03-10 14:10:17.814466955 +0100 +@@ -120,12 +120,12 @@ # Get a property value from org.freedesktop.locale1 queryLocale1() { @@ -77,7 +77,7 @@ Index: plasma-workspace-5.13.3/startkde/startplasmacompositor.cmake # Do not overwrite existing values. There is no point in setting only some # of them as then they would not match anymore. if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \ -@@ -175,10 +175,10 @@ fi +@@ -175,10 +175,10 @@ export XDG_DATA_DIRS # Make sure that D-Bus is running @@ -90,11 +90,11 @@ Index: plasma-workspace-5.13.3/startkde/startplasmacompositor.cmake test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null exit 1 fi -Index: plasma-workspace-5.13.3/wallpapers/image/wallpaper.knsrc +Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/wallpapers/image/wallpaper.knsrc =================================================================== ---- plasma-workspace-5.13.3.orig/wallpapers/image/wallpaper.knsrc -+++ plasma-workspace-5.13.3/wallpapers/image/wallpaper.knsrc -@@ -43,4 +43,4 @@ Categories=KDE Wallpaper 800x600,KDE Wal +--- plasma-workspace-5.15.80git.20190309T171418~4ede2e10.orig/wallpapers/image/wallpaper.knsrc 2019-03-09 17:14:18.000000000 +0100 ++++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/wallpapers/image/wallpaper.knsrc 2019-03-10 14:10:17.814466955 +0100 +@@ -43,4 +43,4 @@ StandardResource=wallpaper Uncompress=archive diff --git a/0001-Revert-No-icons-on-the-desktop-by-default.patch b/0001-Revert-No-icons-on-the-desktop-by-default.patch index 67a8d79..8a69320 100644 --- a/0001-Revert-No-icons-on-the-desktop-by-default.patch +++ b/0001-Revert-No-icons-on-the-desktop-by-default.patch @@ -14,20 +14,19 @@ reason not to have them. 3 files changed, 93 insertions(+) create mode 100644 kioslave/desktop/Home.desktop -diff --git a/kioslave/desktop/CMakeLists.txt b/kioslave/desktop/CMakeLists.txt -index e21744c3..8616a7e5 100644 ---- a/kioslave/desktop/CMakeLists.txt -+++ b/kioslave/desktop/CMakeLists.txt -@@ -25,3 +25,4 @@ install(TARGETS desktopnotifier DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded) +Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/CMakeLists.txt +=================================================================== +--- plasma-workspace-5.15.80git.20190309T171418~4ede2e10.orig/kioslave/desktop/CMakeLists.txt 2019-03-09 17:14:18.000000000 +0100 ++++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/CMakeLists.txt 2019-03-10 14:10:36.943333000 +0100 +@@ -33,3 +33,4 @@ install( FILES desktop.protocol DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install(FILES directory.desktop directory.trash DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop) +install(FILES Home.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop/DesktopLinks) -diff --git a/kioslave/desktop/Home.desktop b/kioslave/desktop/Home.desktop -new file mode 100644 -index 00000000..9ad53f0b ---- /dev/null -+++ b/kioslave/desktop/Home.desktop +Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/Home.desktop +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/Home.desktop 2019-03-10 14:10:36.943333000 +0100 @@ -0,0 +1,88 @@ +[Desktop Entry] +Encoding=UTF-8 @@ -117,11 +116,11 @@ index 00000000..9ad53f0b +Icon=user-home +Type=Link + -diff --git a/kioslave/desktop/kio_desktop.cpp b/kioslave/desktop/kio_desktop.cpp -index e05a1364..c57fed29 100644 ---- a/kioslave/desktop/kio_desktop.cpp -+++ b/kioslave/desktop/kio_desktop.cpp -@@ -82,6 +82,10 @@ void DesktopProtocol::checkLocalInstall() +Index: plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/kio_desktop.cpp +=================================================================== +--- plasma-workspace-5.15.80git.20190309T171418~4ede2e10.orig/kioslave/desktop/kio_desktop.cpp 2019-03-09 17:14:18.000000000 +0100 ++++ plasma-workspace-5.15.80git.20190309T171418~4ede2e10/kioslave/desktop/kio_desktop.cpp 2019-03-10 14:10:36.955343591 +0100 +@@ -87,6 +87,10 @@ QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.desktop")), desktopPath + "/.directory"); @@ -132,6 +131,3 @@ index e05a1364..c57fed29 100644 // Copy the desktop links QSet links; const auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/DesktopLinks"), QStandardPaths::LocateDirectory); --- -2.16.1 - diff --git a/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch b/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch index 4a2e8aa..bd0cf61 100644 --- a/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch +++ b/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch @@ -1,4 +1,4 @@ -From 6de8c88ad78bb5b3d6e599b7dacd1b2359cf4fbb Mon Sep 17 00:00:00 2001 +From 654c5d9a21b641bd45e183ee30d7cb21ba314d35 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 24 Mar 2018 12:15:10 +0100 Subject: [PATCH] Set GTK_BACKEND=x11 in a wayland session @@ -8,10 +8,10 @@ Works around missing window decorations and broken config file reading. startkde/startplasmacompositor.cmake | 4 ++++ 1 file changed, 4 insertions(+) -Index: plasma-workspace-5.15.3/startkde/startplasmacompositor.cmake -=================================================================== ---- plasma-workspace-5.15.3.orig/startkde/startplasmacompositor.cmake -+++ plasma-workspace-5.15.3/startkde/startplasmacompositor.cmake +diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake +index dcb473a4..1ebd126a 100644 +--- a/startkde/startplasmacompositor.cmake ++++ b/startkde/startplasmacompositor.cmake @@ -118,6 +118,10 @@ else export QT_WAYLAND_FORCE_DPI=96 fi @@ -23,3 +23,6 @@ Index: plasma-workspace-5.15.3/startkde/startplasmacompositor.cmake # Get a property value from org.freedesktop.locale1 queryLocale1() { qdbus-qt5 --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1" +-- +2.20.1 + diff --git a/lazy-sddm-theme.patch b/lazy-sddm-theme.patch index 9ce9d50..49da289 100644 --- a/lazy-sddm-theme.patch +++ b/lazy-sddm-theme.patch @@ -10,28 +10,25 @@ See https://github.com/sddm/sddm/pull/1017 sddm-theme/theme.conf.cmake | 1 + 2 files changed, 3 insertions(+) -diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml -index 3ef30117..775b650b 100644 ---- a/sddm-theme/Main.qml -+++ b/sddm-theme/Main.qml -@@ -170,6 +170,8 @@ PlasmaCore.ColorScope { +Index: plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/Main.qml +=================================================================== +--- plasma-workspace-5.15.80git.20190316T190106~d7654042.orig/sddm-theme/Main.qml 2019-03-16 19:01:06.000000000 +0100 ++++ plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/Main.qml 2019-03-16 20:56:49.279402750 +0100 +@@ -182,6 +182,8 @@ - if ( userListModel.count == 0 ) return false + if ( userListModel.count === 0 ) return false + if ( userListModel.hasOwnProperty("containsAllUsers") && !userListModel.containsAllUsers) return false + return userListModel.count <= userListModel.disableAvatarsThreshold && (userList.y + mainStack.y) > 0 } -diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index 69d30705..6bdbc00c 100644 ---- a/sddm-theme/theme.conf.cmake -+++ b/sddm-theme/theme.conf.cmake -@@ -2,3 +2,4 @@ - type=image +Index: plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/theme.conf.cmake +=================================================================== +--- plasma-workspace-5.15.80git.20190316T190106~d7654042.orig/sddm-theme/theme.conf.cmake 2019-03-16 19:01:06.000000000 +0100 ++++ plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/theme.conf.cmake 2019-03-16 20:56:49.279402750 +0100 +@@ -3,3 +3,4 @@ color=#1d99f3 + fontSize=10 background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png +needsFullUserModel=false --- -2.16.2 - diff --git a/plasma-workspace-5.15.5.tar.xz b/plasma-workspace-5.15.5.tar.xz deleted file mode 100644 index f520b36..0000000 --- a/plasma-workspace-5.15.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973 -size 4713728 diff --git a/plasma-workspace-5.15.5.tar.xz.sig b/plasma-workspace-5.15.5.tar.xz.sig deleted file mode 100644 index 622773f..0000000 --- a/plasma-workspace-5.15.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlzRWx8ACgkQ7JTRj38F -mX7p/gf/Z1SMsDf8eatc8kJgjypNeEqGX/f75rWJzo3tC5hjFoQz59jNTiI2AIzx -wVj+bNTtBx7J+txsdmZK0SbFHpjoR6K+T3ylYZg6klHLT4MjQWlMFPJTOXaN+6M2 -/RYzDqdbWgeI0sW6bH3tbf1gAsO/jM/VwxnGF9uCA0+fRlhTkjII6uFN5lGe1t4E -3qbyl1wBEwFOYLW45jUWDq8fZPBImoNV8UnUEShRP9FEqEetthulFW7KbcvX3FUg -LDDIWncU8lD+KPmQ/WNXe7+UU8TF9rp9rE/wT78WlzOENX6NCw8C5sKtfsqFdqqJ -cD7jEOfCjCFmIY1YAEGQa98tZHuk5Q== -=BbKK ------END PGP SIGNATURE----- diff --git a/plasma-workspace-5.15.90.tar.xz b/plasma-workspace-5.15.90.tar.xz new file mode 100644 index 0000000..511176f --- /dev/null +++ b/plasma-workspace-5.15.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d15a98596ff3233020820b7b3fc581b1e11a08329fc103c343c6fa6096d6e0fc +size 4979344 diff --git a/plasma-workspace-5.15.90.tar.xz.sig b/plasma-workspace-5.15.90.tar.xz.sig new file mode 100644 index 0000000..b84dceb --- /dev/null +++ b/plasma-workspace-5.15.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlzdRjAACgkQ7JTRj38F +mX5KCAf/RcC04HR2D6fSRJf50tlq0yiojmQBFyffJa2jdR/BNYyrIRlsUb9g9Ioh +bocrfaOQQDtYmjnHUVd7uMoHwUtNnmWU3w1NFsk7LzarDFol6tJNvma3vvuQTFU5 +p8Ale3NaOFktebKfLG7JUS3zbD27sLaKNYg+rIqsTcN2r7037bZPIRFXT+xVoOr+ +1+BT2CbG3gjwwHjMoRkzTaJzJfwUhTCNQ/B5N4JQirD85HRU0KMUVnhS3NJBxer0 +DzdiuBWwXWNxmw/cib2amvBzwsConoh+NN3GVWs3ds0gm23qRWitdkcsHsLEm78F +0yU4pavWEji4kuCraWb1jTkndb0Omw== +=u+gR +-----END PGP SIGNATURE----- diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 713fe6b..f08ff25 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu May 16 16:56:40 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.15.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.15.90.php +- Too many changes to list here +- Refresh patches: + * 0001-Rename-qdbus-in-startkde.patch + * 0001-Revert-No-icons-on-the-desktop-by-default.patch + * 0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch + * lazy-sddm-theme.patch + ------------------------------------------------------------------- Tue May 7 11:04:58 UTC 2019 - fabian@ritter-vogt.de diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 1c2cdea..dd8cf0d 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -19,7 +19,7 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %{!?_fillupdir: %global _fillupdir %{_localstatedir}/adm/fillup-templates} -%define kf5_version 5.54.0 +%define kf5_version 5.58.0 %bcond_without lang Name: plasma5-workspace @@ -27,15 +27,15 @@ Name: plasma5-workspace %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF) %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} -Version: 5.15.5 +Version: 5.15.90 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0-or-later Group: System/GUI/KDE Url: http://www.kde.org/ -Source: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz +Source: https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig Source2: plasma.keyring %endif Source3: baselibs.conf @@ -370,6 +370,7 @@ fi %{_kf5_libdir}/libtaskmanager.so.* %{_kf5_libdir}/libweather_ion.so.* %{_kf5_libdir}/libcolorcorrect.so.* +%{_kf5_libdir}/libnotificationmanager.so.* %files %license COPYING* @@ -382,7 +383,6 @@ fi %{_kf5_bindir}/ksmserver %{_kf5_bindir}/ksplashqml %{_kf5_bindir}/kstartupconfig5 -%{_kf5_bindir}/kuiserver5 %{_kf5_bindir}/plasmashell %{_kf5_bindir}/plasmawindowed %{_kf5_bindir}/startkde @@ -392,11 +392,11 @@ fi %{_kf5_configdir}/autostart/org.kde.plasmashell.desktop %{_kf5_configdir}/autostart/klipper.desktop %{_kf5_configdir}/autostart/krunner.desktop -%config %{_kf5_configdir}/plasmoids.knsrc -%config %{_kf5_configdir}/wallpaper.knsrc -%config %{_kf5_configdir}/wallpaperplugin.knsrc +%{_kf5_knsrcfilesdir}/plasmoids.knsrc +%{_kf5_knsrcfilesdir}/wallpaper.knsrc +%{_kf5_knsrcfilesdir}/wallpaperplugin.knsrc %config %{_kf5_configdir}/taskmanagerrulesrc -%config %{_kf5_configdir}/kuiserver.categories +%config %{_kf5_configdir}/plasmanotifyrc %dir %{_kf5_libdir}/libexec %{_kf5_libdir}/libexec/ksyncdbusenv %{_kf5_libdir}/libexec/startplasma @@ -405,7 +405,6 @@ fi %{_kf5_libdir}/libkdeinit5_kcminit_startup.so %{_kf5_libdir}/libkdeinit5_klipper.so %{_kf5_libdir}/libkdeinit5_ksmserver.so -%{_kf5_libdir}/libkdeinit5_kuiserver5.so %{_kf5_libdir}/kconf_update_bin/krunnerplugins %{_kf5_libdir}/libexec/baloorunner %{_kf5_plugindir}/ @@ -415,7 +414,6 @@ fi %{_kf5_applicationsdir}/org.kde.plasmashell.desktop %{_kf5_applicationsdir}/org.kde.systemmonitor.desktop %{_kf5_configkcfgdir}/freespacenotifier.kcfg -%{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service %{_kf5_sharedir}/dbus-1/services/org.kde.baloorunner.service %{_kf5_sharedir}/dbus-1/services/org.kde.plasma.Notifications.service @@ -460,17 +458,24 @@ fi %{_kf5_prefix}/include/kworkspace5/ %{_kf5_prefix}/include/plasma/ %{_kf5_prefix}/include/taskmanager/ +%{_kf5_prefix}/include/notificationmanager/ %{_kf5_prefix}/include/colorcorrect/ %{_kf5_libdir}/cmake/KRunnerAppDBusInterface/ %{_kf5_libdir}/cmake/KSMServerDBusInterface/ %{_kf5_libdir}/cmake/LibKWorkspace/ %{_kf5_libdir}/cmake/LibTaskManager/ %{_kf5_libdir}/cmake/LibColorCorrect/ +%dir %{_kf5_libdir}/cmake/LibNotificationManager/ +%{_kf5_libdir}/cmake/LibNotificationManager/LibNotificationManagerConfig.cmake +%{_kf5_libdir}/cmake/LibNotificationManager/LibNotificationManagerConfigVersion.cmake +%{_kf5_libdir}/cmake/LibNotificationManager/LibNotificationManagerLibraryTargets-none.cmake +%{_kf5_libdir}/cmake/LibNotificationManager/LibNotificationManagerLibraryTargets.cmake %{_kf5_libdir}/libkworkspace5.so %{_kf5_libdir}/libplasma-geolocation-interface.so %{_kf5_libdir}/libtaskmanager.so %{_kf5_libdir}/libweather_ion.so %{_kf5_libdir}/libcolorcorrect.so +%{_kf5_libdir}/libnotificationmanager.so %{_kf5_sharedir}/kdevappwizard/ %{_kf5_sharedir}/dbus-1/interfaces/ From 35c499e74533dbb624640a9151d367bf2f6e4b0b959c069c65a95c0abb1d5f45 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 21 May 2019 09:59:23 +0000 Subject: [PATCH 2/3] - Add patch to workaround crash with Qt 5.12.3 (kde#407220, QTBUG-75900): * 0001-Don-t-assign-a-QtObject-to-a-model.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=454 --- 0001-Don-t-assign-a-QtObject-to-a-model.patch | 51 +++++++++++++++++++ plasma5-workspace.changes | 6 +++ plasma5-workspace.spec | 6 ++- 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 0001-Don-t-assign-a-QtObject-to-a-model.patch diff --git a/0001-Don-t-assign-a-QtObject-to-a-model.patch b/0001-Don-t-assign-a-QtObject-to-a-model.patch new file mode 100644 index 0000000..c2bcbb8 --- /dev/null +++ b/0001-Don-t-assign-a-QtObject-to-a-model.patch @@ -0,0 +1,51 @@ +From 39f6129d39f183a52ceca041df17d46261125026 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Tue, 21 May 2019 11:57:19 +0200 +Subject: [PATCH] Don't assign a QtObject to a model + +Summary: +It's a weird thing to do, and that's causing us to hit +https://bugreports.qt.io/browse/QTBUG-75900 when it tries to lookup a +property (icon) that we don't have. + +BUG: 407220 + +Test Plan: Opened sddm-greeter --test-mode --theme clicked button + +Reviewers: #plasma + +Subscribers: apol, plasma-devel + +Tags: #plasma + +Differential Revision: https://phabricator.kde.org/D21274 +--- + sddm-theme/Main.qml | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml +index 46ab3932..3dace19a 100644 +--- a/sddm-theme/Main.qml ++++ b/sddm-theme/Main.qml +@@ -360,9 +360,15 @@ PlasmaCore.ColorScope { + notificationMessage: root.notificationMessage + loginScreenUiVisible: loginScreenRoot.uiVisible + +- userListModel: QtObject { +- property string name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Type in Username and Password") +- property string iconSource: "" ++ userListModel: ListModel { ++ ListElement { ++ name: "" ++ iconSource: "" ++ } ++ Component.onCompleted: { ++ // as we can't bind inside ListElement ++ setProperty(0, "name", i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Type in Username and Password")); ++ } + } + + onLoginRequest: { +-- +2.21.0 + diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index f08ff25..65ce6f6 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 21 09:58:41 UTC 2019 - Fabian Vogt + +- Add patch to workaround crash with Qt 5.12.3 (kde#407220, QTBUG-75900): + * 0001-Don-t-assign-a-QtObject-to-a-model.patch + ------------------------------------------------------------------- Thu May 16 16:56:40 UTC 2019 - fabian@ritter-vogt.de diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index dd8cf0d..c385a04 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -39,8 +39,10 @@ Source1: https://download.kde.org/unstable/plasma/%{version}/plasma-works Source2: plasma.keyring %endif Source3: baselibs.conf -# PATCHES 000-100 and above are from upstream 5.12 branch -# PATCHES 101-500 are from upstream master/5.13 branch +# PATCHES 000-100 and above are from upstream 5.16 branch +# Not merged yet (https://phabricator.kde.org/D21274) +Patch50: 0001-Don-t-assign-a-QtObject-to-a-model.patch +# PATCHES 101-500 are from upstream master/5.17 branch # PATCHES 501-??? are PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde Patch501: 0001-Rename-qdbus-in-startkde.patch From ef355e5910e72262063c449ce03429f71f141c9e3d831bb807ab632485eda592 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 6 Jun 2019 21:10:59 +0000 Subject: [PATCH 3/3] Plasma 5.16 tentative final. Please disable KF5 publishing before accepting. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=455 --- 0001-Don-t-assign-a-QtObject-to-a-model.patch | 51 ------------------- lazy-sddm-theme.patch | 18 +++---- plasma-workspace-5.15.90.tar.xz | 3 -- plasma-workspace-5.15.90.tar.xz.sig | 11 ---- plasma-workspace-5.16.0.tar.xz | 3 ++ plasma-workspace-5.16.0.tar.xz.sig | 11 ++++ plasma5-workspace.changes | 12 +++++ plasma5-workspace.spec | 8 ++- 8 files changed, 38 insertions(+), 79 deletions(-) delete mode 100644 0001-Don-t-assign-a-QtObject-to-a-model.patch delete mode 100644 plasma-workspace-5.15.90.tar.xz delete mode 100644 plasma-workspace-5.15.90.tar.xz.sig create mode 100644 plasma-workspace-5.16.0.tar.xz create mode 100644 plasma-workspace-5.16.0.tar.xz.sig diff --git a/0001-Don-t-assign-a-QtObject-to-a-model.patch b/0001-Don-t-assign-a-QtObject-to-a-model.patch deleted file mode 100644 index c2bcbb8..0000000 --- a/0001-Don-t-assign-a-QtObject-to-a-model.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 39f6129d39f183a52ceca041df17d46261125026 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Tue, 21 May 2019 11:57:19 +0200 -Subject: [PATCH] Don't assign a QtObject to a model - -Summary: -It's a weird thing to do, and that's causing us to hit -https://bugreports.qt.io/browse/QTBUG-75900 when it tries to lookup a -property (icon) that we don't have. - -BUG: 407220 - -Test Plan: Opened sddm-greeter --test-mode --theme clicked button - -Reviewers: #plasma - -Subscribers: apol, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D21274 ---- - sddm-theme/Main.qml | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml -index 46ab3932..3dace19a 100644 ---- a/sddm-theme/Main.qml -+++ b/sddm-theme/Main.qml -@@ -360,9 +360,15 @@ PlasmaCore.ColorScope { - notificationMessage: root.notificationMessage - loginScreenUiVisible: loginScreenRoot.uiVisible - -- userListModel: QtObject { -- property string name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Type in Username and Password") -- property string iconSource: "" -+ userListModel: ListModel { -+ ListElement { -+ name: "" -+ iconSource: "" -+ } -+ Component.onCompleted: { -+ // as we can't bind inside ListElement -+ setProperty(0, "name", i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Type in Username and Password")); -+ } - } - - onLoginRequest: { --- -2.21.0 - diff --git a/lazy-sddm-theme.patch b/lazy-sddm-theme.patch index 49da289..68ac237 100644 --- a/lazy-sddm-theme.patch +++ b/lazy-sddm-theme.patch @@ -10,11 +10,11 @@ See https://github.com/sddm/sddm/pull/1017 sddm-theme/theme.conf.cmake | 1 + 2 files changed, 3 insertions(+) -Index: plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/Main.qml +Index: plasma-workspace-5.16.0/sddm-theme/Main.qml =================================================================== ---- plasma-workspace-5.15.80git.20190316T190106~d7654042.orig/sddm-theme/Main.qml 2019-03-16 19:01:06.000000000 +0100 -+++ plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/Main.qml 2019-03-16 20:56:49.279402750 +0100 -@@ -182,6 +182,8 @@ +--- plasma-workspace-5.16.0.orig/sddm-theme/Main.qml ++++ plasma-workspace-5.16.0/sddm-theme/Main.qml +@@ -182,6 +182,8 @@ PlasmaCore.ColorScope { if ( userListModel.count === 0 ) return false @@ -23,12 +23,12 @@ Index: plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/Main.qml return userListModel.count <= userListModel.disableAvatarsThreshold && (userList.y + mainStack.y) > 0 } -Index: plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/theme.conf.cmake +Index: plasma-workspace-5.16.0/sddm-theme/theme.conf.cmake =================================================================== ---- plasma-workspace-5.15.80git.20190316T190106~d7654042.orig/sddm-theme/theme.conf.cmake 2019-03-16 19:01:06.000000000 +0100 -+++ plasma-workspace-5.15.80git.20190316T190106~d7654042/sddm-theme/theme.conf.cmake 2019-03-16 20:56:49.279402750 +0100 -@@ -3,3 +3,4 @@ +--- plasma-workspace-5.16.0.orig/sddm-theme/theme.conf.cmake ++++ plasma-workspace-5.16.0/sddm-theme/theme.conf.cmake +@@ -3,3 +3,4 @@ type=image color=#1d99f3 fontSize=10 - background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png + background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png +needsFullUserModel=false diff --git a/plasma-workspace-5.15.90.tar.xz b/plasma-workspace-5.15.90.tar.xz deleted file mode 100644 index 511176f..0000000 --- a/plasma-workspace-5.15.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d15a98596ff3233020820b7b3fc581b1e11a08329fc103c343c6fa6096d6e0fc -size 4979344 diff --git a/plasma-workspace-5.15.90.tar.xz.sig b/plasma-workspace-5.15.90.tar.xz.sig deleted file mode 100644 index b84dceb..0000000 --- a/plasma-workspace-5.15.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlzdRjAACgkQ7JTRj38F -mX5KCAf/RcC04HR2D6fSRJf50tlq0yiojmQBFyffJa2jdR/BNYyrIRlsUb9g9Ioh -bocrfaOQQDtYmjnHUVd7uMoHwUtNnmWU3w1NFsk7LzarDFol6tJNvma3vvuQTFU5 -p8Ale3NaOFktebKfLG7JUS3zbD27sLaKNYg+rIqsTcN2r7037bZPIRFXT+xVoOr+ -1+BT2CbG3gjwwHjMoRkzTaJzJfwUhTCNQ/B5N4JQirD85HRU0KMUVnhS3NJBxer0 -DzdiuBWwXWNxmw/cib2amvBzwsConoh+NN3GVWs3ds0gm23qRWitdkcsHsLEm78F -0yU4pavWEji4kuCraWb1jTkndb0Omw== -=u+gR ------END PGP SIGNATURE----- diff --git a/plasma-workspace-5.16.0.tar.xz b/plasma-workspace-5.16.0.tar.xz new file mode 100644 index 0000000..1f85923 --- /dev/null +++ b/plasma-workspace-5.16.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52da11a30708b375136ec5c280d75948e2651ecdb03f745e596d10168ab0ffae +size 4891740 diff --git a/plasma-workspace-5.16.0.tar.xz.sig b/plasma-workspace-5.16.0.tar.xz.sig new file mode 100644 index 0000000..39777e7 --- /dev/null +++ b/plasma-workspace-5.16.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAlz5EbcACgkQ7JTRj38F +mX4xxggAtfYFwvmvRwqu+Qniu5DphwKSW+KX3f8v6LYIm8jqm8TgqwRr/DZhQq1T ++ozNhLsivVZ5IGZnuBhrcT6wvdfyZ9kFnNXD0qwUcf9JtPCCeYPgyGy1pcabSce5 +1CnaTgOqSi+EEaBzPD31/VBi5uEiIY7/KNBDdEMXQllAG7vBLHnywNbx8ScNQuAb +ILaYr4ft0UOdxqBEj3VaJLdGo2/ECj/ryYOsOtw6zUvjamOPAKsfOsljIs8vtGT0 +ll2kq/Bsj8j2Y8J+yd3BjodXirKCjLaaaUTSJHPhxK0nMTtlyWAFhZGMOvrBIQvs +MzYIZWCSFpcO0WPLGDrON02+UroLHA== +=MAlm +-----END PGP SIGNATURE----- diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 65ce6f6..fec430b 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 6 14:07:10 UTC 2019 - fabian@ritter-vogt.de + +- Update to 5.16.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.16.0.php +- Too many changes to list here +- Drop patches, now upstream: + * 0001-Don-t-assign-a-QtObject-to-a-model.patch +- Refresh lazy-sddm-theme.patch + ------------------------------------------------------------------- Tue May 21 09:58:41 UTC 2019 - Fabian Vogt diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index c385a04..9206f4c 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -27,21 +27,19 @@ Name: plasma5-workspace %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF) %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} -Version: 5.15.90 +Version: 5.16.0 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0-or-later Group: System/GUI/KDE Url: http://www.kde.org/ -Source: https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz +Source: plasma-workspace-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig +Source1: plasma-workspace-%{version}.tar.xz.sig Source2: plasma.keyring %endif Source3: baselibs.conf # PATCHES 000-100 and above are from upstream 5.16 branch -# Not merged yet (https://phabricator.kde.org/D21274) -Patch50: 0001-Don-t-assign-a-QtObject-to-a-model.patch # PATCHES 101-500 are from upstream master/5.17 branch # PATCHES 501-??? are PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- Rename the qdbus executable in startkde