diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-04-05 13:24:37 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-04-05 13:53:30 +0200 |
commit | b8ef6d509bad32290071de305f67d5383d480369 (patch) | |
tree | 5677610545df79416411c24968390f33ad2dd968 /kde-frameworks/kdelibs4support | |
parent | x11-terms/sakura: Drop 3.7.0, cmake-utils-- (diff) | |
download | gentoo-b8ef6d509bad32290071de305f67d5383d480369.tar.gz gentoo-b8ef6d509bad32290071de305f67d5383d480369.tar.bz2 gentoo-b8ef6d509bad32290071de305f67d5383d480369.zip |
kde-frameworks/kdelibs4support: Split no-kdesignerplugin.patch
File size management (way) ahead of 5.82.0 release.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kdelibs4support')
-rw-r--r-- | kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch (renamed from kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch) | 54 | ||||
-rw-r--r-- | kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch | 51 | ||||
-rw-r--r-- | kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild | 5 |
3 files changed, 55 insertions, 55 deletions
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch index a053114c39bc..1165a531ab02 100644 --- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch @@ -141,57 +141,3 @@ index 1570df34..e255960d 100644 # 'pngfiles' - specifies the list of icon files -- 2.30.0 - - -From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 22 Nov 2020 00:27:55 +0100 -Subject: [PATCH 2/2] Drop Qt5Designer dependency - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 2 +- - cmake/modules/ECMQt4To5Porting.cmake | 1 - - cmake/modules/FindQt5Transitional.cmake | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a432591..e503999d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,7 +20,7 @@ include(GenerateExportHeader) - include(CMakeFindFrameworks) - - set(REQUIRED_QT_VERSION 5.14.0) --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer) -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport) - - find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED) - find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) -diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake -index 4204fa54..01b8f995 100644 ---- a/cmake/modules/ECMQt4To5Porting.cmake -+++ b/cmake/modules/ECMQt4To5Porting.cmake -@@ -160,7 +160,6 @@ set(_qt_modules - DBus - Network - Test -- Designer - Concurrent - Xml - UiTools -diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake -index df354fc6..68fa6d47 100644 ---- a/cmake/modules/FindQt5Transitional.cmake -+++ b/cmake/modules/FindQt5Transitional.cmake -@@ -6,7 +6,6 @@ if (Qt5Core_FOUND) - Core - Gui - DBus -- Designer - Declarative - Script - ScriptTools --- -2.30.0 - diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch new file mode 100644 index 000000000000..44e474ae0e91 --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch @@ -0,0 +1,51 @@ +From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 22 Nov 2020 00:27:55 +0100 +Subject: [PATCH 2/2] Drop Qt5Designer dependency + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + cmake/modules/ECMQt4To5Porting.cmake | 1 - + cmake/modules/FindQt5Transitional.cmake | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a432591..e503999d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ include(GenerateExportHeader) + include(CMakeFindFrameworks) + + set(REQUIRED_QT_VERSION 5.14.0) +-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer) ++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport) + + find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED) + find_package(KF5Config ${KF_DEP_VERSION} REQUIRED) +diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake +index 4204fa54..01b8f995 100644 +--- a/cmake/modules/ECMQt4To5Porting.cmake ++++ b/cmake/modules/ECMQt4To5Porting.cmake +@@ -160,7 +160,6 @@ set(_qt_modules + DBus + Network + Test +- Designer + Concurrent + Xml + UiTools +diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake +index df354fc6..68fa6d47 100644 +--- a/cmake/modules/FindQt5Transitional.cmake ++++ b/cmake/modules/FindQt5Transitional.cmake +@@ -6,7 +6,6 @@ if (Qt5Core_FOUND) + Core + Gui + DBus +- Designer + Declarative + Script + ScriptTools +-- +2.30.0 diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild index 43e1d42d1e4b..e11d25ca53b7 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild @@ -77,7 +77,10 @@ RDEPEND="${COMMON_DEPEND} =kde-frameworks/kitemmodels-${PVCUT}*:5 " -PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" ) +PATCHES=( + "${FILESDIR}/${P}-no-kdesignerplugin.patch" + "${FILESDIR}/${P}-unused-dep.patch" +) src_prepare() { ecm_src_prepare |