diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-12 08:41:54 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-12 08:41:54 +0100 |
commit | 4df3bf9762850b34cd1ead5c80374d1a0fc3362e (patch) | |
tree | 3080c5cb7ad17abcb63776a9f21c4947845546a6 /kde-plasma | |
parent | 814f4cf860e299a046b649eaee5463427984c09c (diff) |
gentoo resync : 12.07.2021
Diffstat (limited to 'kde-plasma')
-rw-r--r-- | kde-plasma/Manifest.gz | bin | 9112 -> 9107 bytes | |||
-rw-r--r-- | kde-plasma/discover/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/discover/files/discover-5.21.4-missing-link.patch | 49 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch | 108 | ||||
-rw-r--r-- | kde-plasma/milou/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch | 29 | ||||
-rw-r--r-- | kde-plasma/plasma-nm/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch | 30 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch | 35 | ||||
-rw-r--r-- | kde-plasma/xembed-sni-proxy/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch | 59 |
13 files changed, 0 insertions, 316 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz Binary files differindex 92477ce6ec10..a0124305ee90 100644 --- a/kde-plasma/Manifest.gz +++ b/kde-plasma/Manifest.gz diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index dc4642374c6d..ed4dc2cbfd83 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,4 +1,3 @@ -AUX discover-5.21.4-missing-link.patch 2141 BLAKE2B 23b81f9f4e0daa05183ed3a31e98d8c1f3ac3ecfdb08511c3fb14bbf726a14086c5c834d3c7b7cc3f575500eb86f4cc85e141c48361597329a62c47c45807956 SHA512 f8201dad0e00e1a36338ab9dc956cd1baa7268ce4dd23c3d2b5a7ba9c9922da216697115396b7c32c3656faa60a107da62343af3b7a250d64e6d51c43768a9ae AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf DIST discover-5.22.3.tar.xz 8457300 BLAKE2B 9d67bf05b95a3f06e08519122a29ebe38c8792220a2a448b44c4b8d1f1e5876efb255673d7616ca43391c80937dec4967cf86e7938856d008f9903bf6f0b90ae SHA512 ed6772f9573ac5e43f30ea83c344365154b43f87c1beea0573f646e5f7239727d49eda1eaa9588b2afae32e3fbcbeeb7f36a6fdd6ed6e2b06b82967f86c60be0 diff --git a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch deleted file mode 100644 index c8c8b152ea7c..000000000000 --- a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3c578beeb5d3748d9fdacae4ace42fe6098d9184 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 25 Apr 2021 00:26:12 +0200 -Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries - -This was working as long as it was implicitly provided by KIO. -Other backends are fine. - -Fixes: -- DiscoverCommon w/ AppStreamQt -- packagekit-backend - -See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - libdiscover/CMakeLists.txt | 2 +- - libdiscover/backends/PackageKitBackend/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt -index 1097ea84..3e2a6c9c 100644 ---- a/libdiscover/CMakeLists.txt -+++ b/libdiscover/CMakeLists.txt -@@ -48,7 +48,7 @@ if(TARGET AppStreamQt) - appstream/AppStreamIntegration.cpp - appstream/AppStreamUtils.cpp - ) -- target_link_libraries(DiscoverCommon PRIVATE AppStreamQt) -+ target_link_libraries(DiscoverCommon PRIVATE Qt5::Concurrent AppStreamQt) - - if(AppStreamQt_VERSION VERSION_GREATER 0.12.4) - target_compile_definitions(DiscoverCommon PRIVATE -DAPPSTREAM_HAS_SPDX=1) -diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt -index cfeb38f1..466dbc49 100644 ---- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt -+++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt -@@ -19,7 +19,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe - - add_library(packagekit-backend MODULE ${packagekit-backend_SRCS}) - --target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt) -+target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core Qt5::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt) - install(TARGETS packagekit-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover) - - if(TARGET PkgConfig::Markdown) --- -2.31.1 - diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index 8ab78d3cdcad..a4f359835129 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,4 +1,3 @@ -AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f AUX libkworkspace-5.21.5-standalone.patch 4984 BLAKE2B 84a43baece5d0233c7e274c28a7212d6fcec6692c51047ebe5459c9502bfc0fab9a46687fa57424d29691d20987ed9e2bd207b7d2d99a13ddfa7b5091267fa18 SHA512 710d9804ec23fed811d57e1f713738b435a526511609540f45953fa678eb733542682487d8a429940b20dd26bb898fbd70f2d6da3727fa6d26ff9cd839c6c447 AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch deleted file mode 100644 index 8c8213d002dc..000000000000 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 2 Feb 2020 18:29:57 +0100 -Subject: [PATCH] libkworkspace: Allow standalone build - ---- - libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++- - 1 file changed, 66 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ba097a6e..66f70c0b6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,56 @@ -+project(libkworkspace) -+ -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+ set(PROJECT_VERSION "GENTOO_PV") -+ set(PROJECT_VERSION_MAJOR 5) -+ -+ cmake_minimum_required(VERSION 3.0) -+ -+ set(QT_MIN_VERSION "5.14.0") -+ set(KF5_MIN_VERSION "5.71.0") -+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) -+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -+ -+ include(KDEInstallDirs) -+ include(KDECMakeSettings) -+ include(KDECompilerSettings NO_POLICY_SCOPE) -+ include(ECMMarkNonGuiExecutable) -+ include(CMakePackageConfigHelpers) -+ include(WriteBasicConfigVersionFile) -+ include(CheckIncludeFiles) -+ include(FeatureSummary) -+ include(ECMQtDeclareLoggingCategory) -+ include(KDEPackageAppTemplates) -+ include(ECMMarkAsTest) -+ include(GenerateExportHeader) -+ -+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem) -+ -+ find_package(KWinDBusInterface CONFIG REQUIRED) -+ find_package(KScreenLocker 5.13.80 REQUIRED) -+ find_package(ScreenSaverDBusInterface CONFIG REQUIRED) -+ -+ find_package(X11) -+ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" -+ URL "http://www.x.org" -+ TYPE OPTIONAL -+ PURPOSE "Required for X11 support") -+ -+ if(X11_FOUND) -+ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED) -+ set(HAVE_X11 1) -+ endif() -+ -+ if(BUILD_TESTING) -+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+ endif() -+ -+ check_include_files(unistd.h HAVE_UNISTD_H) -+ -+ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h) -+ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -+endif() - - set(kworkspace_LIB_SRCS kdisplaymanager.cpp - kworkspace.cpp -@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) -+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) -+set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) -+else() - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) -+set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) -+endif() - - set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" - "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" -@@ -34,7 +95,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte - qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) - --set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) - qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) - - add_library(kworkspace ${kworkspace_LIB_SRCS}) -@@ -100,3 +160,8 @@ if(BUILD_TESTING) - add_subdirectory(autotests) - add_subdirectory(tests) - endif() -+ -+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") -+ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel ) -+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -+endif() --- -2.27.0 - diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest index 1dfe8a4ace2c..d2aee87e5913 100644 --- a/kde-plasma/milou/Manifest +++ b/kde-plasma/milou/Manifest @@ -1,4 +1,3 @@ -AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748bb695c86dec1d12b93252a5deda724ccee92b72ab9cdb132848746771dd4ee539eb8ba6f83681c410b28c1a203cde50a0a36b7ffc SHA512 c5dd9078754ef0dabe5704df18423ddc273c0ac0d7a685cc3df949588202bc18dd3542925e67dba868074e2e4bb5ad06ca4c6d8efec91d19af6fbea2642d6d2b DIST milou-5.21.5.tar.xz 43912 BLAKE2B 070d5ba66bfd05dea05095524c71c2635dcff640deb1742ea71c08ee02d848aaf9e3f8abbed49b2d8fee3344e7a91b155f6a5cca45d9d0852c66316fbd2f3c4e SHA512 49f029d1cd5568aaaae7e7170c98e076c917bd6eeed83ea379a412f2faf2e11ce403b5d31f287cb151a37a1ad567f6f42c5f9f48c9af437d0c1ed339aaed802f DIST milou-5.22.3.tar.xz 52680 BLAKE2B b3e20185fb36043e1ca1f5eca2dcf9015b55ea6ab6d0e41a801651e89a7c7c60a6a0d79ccecdd73af19d236eeaaa28498f7ccbe60c43fc97d5df218f15c1eb08 SHA512 b674c192cde5bd32ed224442541235f693f8662f978d872a08d9fd477a37c9bf6402b61ce4987476cfeaa06cf67da69cc282e6e81c6d6c62b7df71fd7e3ec247 EBUILD milou-5.21.5.ebuild 823 BLAKE2B 753fd5c8246b905c36f73ff26ff58945a9d51bc5e46dae3ea6f6f011a2cac481cfbb4cb7323454656c72ee3d980854eccbe5e71f8fabbdacf26acc6719d34fe8 SHA512 0d1ad8eb23a902c13deb12da2e4d1471df72ad510335ed56c72f67a2a4ded48373ca4d8d41f1eb7fdd3758f9630a0586c102d5bf27fc7aece2d002cc9b515c54 diff --git a/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch b/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch deleted file mode 100644 index a9e3b029f910..000000000000 --- a/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b239834faa093a972bd7ca33296484609f121a3b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 14 Jul 2020 20:24:01 +0200 -Subject: [PATCH] Disable test dir based on BUILD_TESTING or unavailability of - Qt5::Test - -These tests are manual; an attempt to run them ended in failure. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - lib/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index a739c5c..92dd0be 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -39,4 +39,7 @@ install(TARGETS milou EXPORT MilouLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_A - - add_subdirectory(qml) - add_subdirectory(previews) --add_subdirectory(test) -+ -+if(BUILD_TESTING AND TARGET Qt5::Test) -+ add_subdirectory(test) -+endif() --- -2.27.0 - diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index 9866afdb6f14..daf6b38ccf9f 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,5 +1,4 @@ AUX plasma-nm-5.21.5-missing-include.patch 930 BLAKE2B e73b80967df714f8b9a5afbddef8e5951d02c553b70d2b7a40f7162db5fdf2ab16930ceef649818fc3afa658989eb6caf6e0f4eb91476aa88581307545f1740e SHA512 2f67d123a5280303ddd8c904828da6c2b8aa6b8c6fb06853d55d47050255d154b5731703c70208802ced0e03ffdbe85d292636cb686f0f70777903c7c5bc1ed2 -AUX plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch 871 BLAKE2B 6d65acc1f5ec663529abba3ab69c9705b81553b229c73f535563fcc8c64331a880b600d892675e23f6517b72c02ae64550ca5b0fbf3eae13a43fbbdb06739a65 SHA512 9421f54bccc1e6c6489bf002331d0b4c1e8b3fe259baa14928596caec82652e3b5ba0cfab8ef640bbce4be7438e3c48963716c477f259bf8024c9deac0ad2f50 DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa DIST plasma-nm-5.22.3.tar.xz 899928 BLAKE2B 3c24721041ae342bed946a5f1ac5f65bcf32b40b6aeacbfcefac17e20f8438bd2a29e354d3590766d569fbafd8e0ef05f97b38d7335dd7e7a76552dd750edaf9 SHA512 eb70b1291560634b990b442e4a9d72bda0b90c14126b003efe5df8e952621a98dafdfe18bc48e3f2bc153f1e3fbf9e36f5e8982225a3c4fae6e41e48e7fde51f EBUILD plasma-nm-5.21.5.ebuild 2333 BLAKE2B 79c1df7a5e2f57323c73e9ea432093a05918f93956ad4ff3b13d308d04f62648ae8a34f8884fef890a786ba2183134eb4667e8e2ef979b51488bbadff4823b48 SHA512 04a6eb5b20bab5ee3372f2b0cc9d0ba21731119e70704ffc6cc6865af3ddef64621a69f49e25f0d01961511c9d4fde86e4501e35ebc4f612fbdd842051c6a7e1 diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch deleted file mode 100644 index 133b3e225c54..000000000000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.22.0-qt-5.15.2ff-missing-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 55ab9bfd83fb74d14e26cc1a3d8f257bc47c45ea Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heiko.becker@kde.org> -Date: Sun, 6 Jun 2021 19:34:16 +0200 -Subject: [PATCH] Add missing QFile include - -Used since 40d056195bc400bc4e249cd152993000011687c2. I suppose it's -implicitly pulled in some cases, but for me the build fails against -Qt from KDE's patch collection with "libs/handler.cpp:704:5: error: -'QFile' was not declared in this scope;". - -(cherry picked from commit 6cac88b61da1277dcb9a801e47f2d69829c68086) ---- - libs/handler.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libs/handler.cpp b/libs/handler.cpp -index 470b0fc1..7c8302be 100644 ---- a/libs/handler.cpp -+++ b/libs/handler.cpp -@@ -45,6 +45,7 @@ - #include <QDBusError> - #include <QDBusMetaType> - #include <QDBusPendingReply> -+#include <QFile> - #include <QIcon> - - #include <KNotification> --- -GitLab - diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 415bb8cb641f..38b1112e4517 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,6 +1,5 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678 -AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d AUX plasma-workspace-5.21.5-dangerous-shortcuts.patch 2114 BLAKE2B 88cb2dc9bb202aa44ec75eb69ff806a2b48cf23d2aecf1db89b747269aa1f4689b6577cee5ef14399bd91839db366e2aae155e2bce2b6e8683aaacb63b267cc9 SHA512 42a3954e7d6a1c78e9f59a073be4dd671e1cce51b72d9ebb415d1e5bce1136c3a5fcbb8fc723ef7c82fd7a8ddda18a12935a375e7abd12d771a5911f3cc8e8c4 AUX plasma-workspace-5.21.5-revert-activate-krunner.patch 2369 BLAKE2B e3b8b1ae433a8e212ac65dd7a20cc56ac190200afdad33bc0f24243d1bbbb5a7db40025f6fea033d3e7a9ca71f77650962af39c8c624d07cbc1a3fb1c939faf9 SHA512 2235fdd5624fa3a8d4727cf553801e35b074e22d1db78ccdf12b2e40448e8d3ef85c20e74936359cd84155a288a4fe1df1142370a61790325ce93c5163b78c60 AUX plasma-workspace-5.21.5-split-libkworkspace.patch 1154 BLAKE2B d37f649971b95c3fd99c551ec7512054460d8ba04c265e56c2ee53d968c7885929724c81df2895eeae8609a5a0a4c28839461429579f56bcbde4dcaa5646e15b SHA512 c41d2c56170914a309c9765a58a6cccaf4a9afae937ce762387590f3b2ccf59969b5873f702986369c4c3118c74d314f8b68916bfabce5e7379b3cb27daebb50 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch deleted file mode 100644 index f12d9f4daf5b..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Mon, 22 Oct 2018 10:35:10 +0200 -Subject: [PATCH] libkworkspace: Allow standalone build - ---- - CMakeLists.txt | 6 +++- - 1 file changed, 5 insertions(+), 1 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e587a386..d1a63527 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" - - find_package(KF5TextEditor) - find_package(KWinDBusInterface CONFIG REQUIRED) -+find_package(LibKWorkspace 5.14.1) - - find_package(KScreenLocker 5.13.80 REQUIRED) - find_package(ScreenSaverDBusInterface CONFIG REQUIRED) -@@ -135,7 +136,10 @@ endif() - add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - - add_subdirectory(doc) --add_subdirectory(libkworkspace) -+if(NOT LibKWorkspace_FOUND) -+ message(STATUS "System LibKWorkspace not found, using bundled.") -+ add_subdirectory(libkworkspace) -+endif() - add_subdirectory(libdbusmenuqt) - add_subdirectory(appmenu) - --- -2.19.1 diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest index ff6edc04e759..88688af278cb 100644 --- a/kde-plasma/xembed-sni-proxy/Manifest +++ b/kde-plasma/xembed-sni-proxy/Manifest @@ -1,4 +1,3 @@ -AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 DIST plasma-workspace-5.22.3.tar.xz 8358432 BLAKE2B 3d84425fb66986db03c39c8148ef12465c07fbefaa5734c8f80465f1ff3e523420c4a78c0072523a17088fd3cadf22ac3691321b9d6b8b18efa07921e868a6c1 SHA512 9720c5aad03fb329714b54947e073b4ea0c3617ee269cc3b6a562fc6528c386a9e29a2ecaa1944593ccf4023446163e0daa1baf31110ebae0cfe51afbd8db85d diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch deleted file mode 100644 index 8fb3c1709042..000000000000 --- a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 42008129f1659bc34c454ce14632fd279679f556 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Mon, 22 Oct 2018 21:44:33 +0200 -Subject: [PATCH] xembed-sni-proxy: Allow standalone build - ---- - CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2f67ac6..30b2c1b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,34 @@ -+project(xembed-sni-proxy) -+ -+if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_SOURCE_DIR}) -+ set(PROJECT_VERSION "GENTOO_PV") -+ set(PROJECT_VERSION_MAJOR 5) -+ -+ cmake_minimum_required(VERSION 3.0) -+ -+ set(QT_MIN_VERSION "5.11.0") -+ set(KF5_MIN_VERSION "5.54.0") -+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras) -+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -+ -+ include(KDEInstallDirs) -+ include(KDECMakeSettings) -+ include(KDECompilerSettings NO_POLICY_SCOPE) -+ include(FeatureSummary) -+ include(ECMQtDeclareLoggingCategory) -+ -+ find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED) -+ find_package(X11 REQUIRED) -+ find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR) -+ set_package_properties(XCB PROPERTIES TYPE REQUIRED) -+ -+ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -+else() -+ set(PROJECT_VERSION "5.14.90") -+ set(PROJECT_VERSION_MAJOR 5) -+endif() -+ - add_definitions(-DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_URL_CAST_FROM_STRING -@@ -64,3 +95,7 @@ target_link_libraries(xembedsniproxy - install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR}) - -+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") -+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -+endif() -+ --- -2.19.1 - |