From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 717AD1382C5 for ; Mon, 5 Apr 2021 11:53:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D468E081B; Mon, 5 Apr 2021 11:53:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98CA7E0817 for ; Mon, 5 Apr 2021 11:53:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB6CC335C7D for ; Mon, 5 Apr 2021 11:53:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4661C63B for ; Mon, 5 Apr 2021 11:53:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1617623610.b8ef6d509bad32290071de305f67d5383d480369.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdelibs4support/, kde-frameworks/kdelibs4support/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild X-VCS-Directories: kde-frameworks/kdelibs4support/ kde-frameworks/kdelibs4support/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b8ef6d509bad32290071de305f67d5383d480369 X-VCS-Branch: master Date: Mon, 5 Apr 2021 11:53:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 07341de0-1ec2-438d-9688-ad49fe1a82e2 X-Archives-Hash: c1430d4612641392b8cac44d3226ff2e commit: b8ef6d509bad32290071de305f67d5383d480369 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 5 11:24:37 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 5 11:53:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ef6d50 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 gentoo.org> ...delibs4support-5.80.0-no-kdesignerplugin.patch} | 54 ---------------------- .../files/kdelibs4support-5.80.0-unused-dep.patch | 51 ++++++++++++++++++++ .../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 similarity index 77% rename from kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch rename to kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch index a053114c39b..1165a531ab0 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 -Date: Sun, 22 Nov 2020 00:27:55 +0100 -Subject: [PATCH 2/2] Drop Qt5Designer dependency - -Signed-off-by: Andreas Sturmlechner ---- - 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 00000000000..44e474ae0e9 --- /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 +Date: Sun, 22 Nov 2020 00:27:55 +0100 +Subject: [PATCH 2/2] Drop Qt5Designer dependency + +Signed-off-by: Andreas Sturmlechner +--- + 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 43e1d42d1e4..e11d25ca53b 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