* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/, kde-frameworks/kdelibs4support/files/
@ 2020-11-28 0:17 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-11-28 0:17 UTC (permalink / raw
To: gentoo-commits
commit: ae0f796d7cbe6e9274fb0c845cf1db81c15d8c86
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 00:15:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 00:15:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae0f796d
kde-frameworks/kdelibs4support: Rebase no-kdesignerplugin.patch
Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/757273
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...gnerplugin.patch => kdelibs4support-5.77.0-no-kdesignerplugin.patch} | 2 +-
kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.76.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch
similarity index 99%
rename from kde-frameworks/kdelibs4support/files/kdelibs4support-5.76.0-no-kdesignerplugin.patch
rename to kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch
index a3159392b2..e4e0f82fe2 100644
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.76.0-no-kdesignerplugin.patch
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch
@@ -162,7 +162,7 @@ index 20a27b52..e09b93e2 100644
@@ -20,7 +20,7 @@ include(GenerateExportHeader)
include(CMakeFindFrameworks)
- set(REQUIRED_QT_VERSION 5.12.0)
+ set(REQUIRED_QT_VERSION 5.13.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)
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index 27cc3fef8e..145ab83542 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -78,7 +78,7 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-5.76.0-no-kdesignerplugin.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.77.0-no-kdesignerplugin.patch" )
src_prepare() {
ecm_src_prepare
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/, kde-frameworks/kdelibs4support/files/
@ 2021-01-30 22:31 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-01-30 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 402a6d799aa06d0991e41a67f47e320d0b9d1a6a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 21:50:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 21:50:12 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=402a6d79
kde-frameworks/kdelibs4support: Rebase no-kdesignerplugin.patch
Reported-by: jospezial <jospezial <AT> gmx.de>
Closes: https://bugs.gentoo.org/768033
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...delibs4support-5.79.0-no-kdesignerplugin.patch} | 52 +++++++++++-----------
.../kdelibs4support/kdelibs4support-9999.ebuild | 2 +-
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch
similarity index 82%
rename from kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch
rename to kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch
index be81bf04ef..a053114c39 100644
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch
@@ -1,4 +1,4 @@
-From a97b01b220e6ef08d1517fea76fdaddb84a9773e Mon Sep 17 00:00:00 2001
+From 720711e3a4e69bcc6447c928bea243a81a777a07 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 22 Nov 2020 00:25:06 +0100
Subject: [PATCH 1/2] Drop KDE4_ADD_WIDGET_FILES macro and KF5DesignerPlugin
@@ -15,29 +15,29 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
6 files changed, 52 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f4b6d33..20a27b52 100644
+index a60c88a4..2a432591 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
--find_package(KF5DesignerPlugin ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Emoticons ${KF5_DEP_VERSION} REQUIRED)
+@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5ConfigWidgets ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5Crash ${KF_DEP_VERSION} REQUIRED)
+-find_package(KF5DesignerPlugin ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5GlobalAccel ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5DocTools ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5Emoticons ${KF_DEP_VERSION} REQUIRED)
diff --git a/KF5KDELibs4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in
-index b5194f94..5e16c780 100644
+index 3de7d530..4fe2369e 100644
--- a/KF5KDELibs4SupportConfig.cmake.in
+++ b/KF5KDELibs4SupportConfig.cmake.in
-@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF5_DEP_VERSION@")
- find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@")
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
- find_dependency(KF5Crash "@KF5_DEP_VERSION@")
--find_dependency(KF5DesignerPlugin "@KF5_DEP_VERSION@")
- find_dependency(KF5DocTools "@KF5_DEP_VERSION@")
- find_dependency(KF5Emoticons "@KF5_DEP_VERSION@")
- find_dependency(KF5GuiAddons "@KF5_DEP_VERSION@")
+@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF_DEP_VERSION@")
+ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@")
+ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@")
+ find_dependency(KF5Crash "@KF_DEP_VERSION@")
+-find_dependency(KF5DesignerPlugin "@KF_DEP_VERSION@")
+ find_dependency(KF5DocTools "@KF_DEP_VERSION@")
+ find_dependency(KF5Emoticons "@KF_DEP_VERSION@")
+ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@")
diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
index 7e252a70..b9636036 100644
--- a/cmake/modules/FindKDE4Internal.cmake
@@ -74,7 +74,7 @@ index ca868ad9..27bb28f9 100644
# functions deprecated, they still should work
macro (KDE4_AUTH_INSTALL_ACTIONS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b249bd53..3ed8114d 100644
+index cb8a3c2d..70829dd6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -371,25 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
@@ -140,10 +140,10 @@ index 1570df34..e255960d 100644
# 'appsources' - the sources of the application
# 'pngfiles' - specifies the list of icon files
--
-2.29.2
+2.30.0
-From 13277f3a50eee8ec2ebc5cd915a83b56c2613966 Mon Sep 17 00:00:00 2001
+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
@@ -156,7 +156,7 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20a27b52..e09b93e2 100644
+index 2a432591..e503999d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ include(GenerateExportHeader)
@@ -166,8 +166,8 @@ index 20a27b52..e09b93e2 100644
-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 ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
+ 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
@@ -193,5 +193,5 @@ index df354fc6..68fa6d47 100644
Script
ScriptTools
--
-2.29.2
+2.30.0
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index d4613398be..79e7352fbb 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -78,7 +78,7 @@ RDEPEND="${COMMON_DEPEND}
=kde-frameworks/kitemmodels-${PVCUT}*:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.78.0-no-kdesignerplugin.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" )
src_prepare() {
ecm_src_prepare
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/, kde-frameworks/kdelibs4support/files/
@ 2021-04-05 11:29 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-04-05 11:29 UTC (permalink / raw
To: gentoo-commits
commit: e7795fc2aa0453a81adc6ee5f2e2b2b101c03f50
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 5 11:28:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 11:29:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e7795fc2
kde-frameworks/kdelibs4support: Split no-kdesignerplugin.patch for 9999
File size management.
Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/780360
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...delibs4support-5.80.0-no-kdesignerplugin.patch} | 54 ----------------------
.../files/kdelibs4support-5.80.0-unused-dep.patch | 51 ++++++++++++++++++++
.../files/kdelibs4support-5.82.0-unused-dep.patch | 51 ++++++++++++++++++++
.../kdelibs4support/kdelibs4support-5.81.0.ebuild | 5 ++
.../kdelibs4support/kdelibs4support-9999.ebuild | 6 ++-
5 files changed, 112 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 a053114c39..1165a531ab 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 0000000000..44e474ae0e
--- /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/files/kdelibs4support-5.82.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
new file mode 100644
index 0000000000..e6a287ebda
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.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.15.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.81.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild
index 43e1d42d1e..2540091276 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild
@@ -79,6 +79,11 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
+ "${FILESDIR}/${PN}-5.80.0-unused-dep.patch"
+)
+
src_prepare() {
ecm_src_prepare
if ! use handbook; then
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index 04391ea16a..f4ecececf5 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -77,7 +77,11 @@ RDEPEND="${COMMON_DEPEND}
=kde-frameworks/kitemmodels-${PVCUT}*:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
+ "${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
+)
src_prepare() {
ecm_src_prepare
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/, kde-frameworks/kdelibs4support/files/
@ 2022-10-10 8:36 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-10-10 8:36 UTC (permalink / raw
To: gentoo-commits
commit: 718214c77d2323472c1e0b38a2abcd43dfcf27de
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 09:30:35 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 08:35:51 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=718214c7
kde-frameworks/kdelibs4support: Fix build with USE -X
Still pending upstream, but the last of Frameworks packages.
Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kdelibs4support-5.99.0-with_x11.patch | 98 ++++++++++++++++++++++
.../kdelibs4support/kdelibs4support-9999.ebuild | 11 ++-
2 files changed, 106 insertions(+), 3 deletions(-)
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch
new file mode 100644
index 0000000000..24bcb1b9cc
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch
@@ -0,0 +1,98 @@
+From 026571f37c990007be3d7e536b335c19ab98009e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 6 Aug 2022 11:16:00 +0200
+Subject: [PATCH] Add CMake option to build WITH_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config. This is a behavior change as previously
+it was silently disabled if X11 was not found.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 18 +++++++++++-------
+ src/CMakeLists.txt | 6 +++---
+ tests/CMakeLists.txt | 2 +-
+ 3 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f577df45..378d23d4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,14 +51,18 @@ if(WIN32)
+ endif()
+
+ if (NOT APPLE AND NOT WIN32)
+- find_package(X11)
++ option(WITH_X11 "Build with X11 integration and session management" ON)
++ if(WITH_X11)
++ find_package(X11)
++ set(HAVE_X11 ${X11_FOUND})
++ if (HAVE_X11)
++ add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication")
++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
++ find_package(XCB REQUIRED COMPONENTS XCB)
++ endif()
++ endif()
+ endif()
+-set(HAVE_X11 ${X11_FOUND})
+-if (HAVE_X11)
+- add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for session management in KApplication")
+- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
+- find_package(XCB REQUIRED COMPONENTS XCB)
+-endif ()
++
+ if (APPLE)
+ cmake_find_frameworks(CoreFoundation)
+ endif ()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2096b355..4649a9d5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -226,7 +226,7 @@ if (NOT KIO_NO_NEPOMUK)
+ )
+ endif ()
+
+-if (X11_FOUND)
++if (HAVE_X11)
+ set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdeui/kxerrorhandler.cpp )
+ list(APPEND libkdelibs4support_OPTIONAL_LIBS Qt5::X11Extras ${X11_LIBRARIES})
+ endif ()
+@@ -312,7 +312,7 @@ set(platformLinkLibraries)
+ if (APPLE)
+ set(platformLinkLibraries "-framework CoreFoundation -framework Carbon -lresolv")
+ endif()
+-if (X11_FOUND)
++if (HAVE_X11)
+ set(platformLinkLibraries ${XCB_XCB_LIBRARY})
+ endif()
+
+@@ -545,7 +545,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages DESTINATION ${KDE_INSTA
+ install( FILES kdeui/40.colors kdeui/Oxygen.colors kdeui/Web.colors kdeui/Royal.colors kdeui/Rainbow.colors
+ DESTINATION ${KDE_INSTALL_CONFDIR}/colors)
+
+-if (NOT X11_FOUND)
++if (NOT HAVE_X11)
+ # install our copy of the rgb.txt named colors list on systems without X11
+ install(FILES kdeui/rgb.txt DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdeui)
+ endif ()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 53f870ff..db4b28db 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -63,7 +63,7 @@ target_link_libraries(networkingservice KF5::KDELibs4Support)
+
+ ###### kxerrorhandlertest #####
+
+-if (X11_FOUND)
++if (HAVE_X11)
+ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
+ kdelibs4support_examples( kxerrorhandlertest )
+
+--
+2.35.1
+
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
index 9f084b189d..b455381245 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild
@@ -11,6 +11,7 @@ VIRTUALX_REQUIRED="test"
inherit ecm frameworks.kde.org
DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
+
LICENSE="LGPL-2+"
KEYWORDS=""
IUSE="X"
@@ -45,13 +46,13 @@ COMMON_DEPEND="
=kde-frameworks/kio-${PVCUT}*:5
=kde-frameworks/kitemviews-${PVCUT}*:5
=kde-frameworks/kjobwidgets-${PVCUT}*:5
- =kde-frameworks/knotifications-${PVCUT}*:5[X=]
+ =kde-frameworks/knotifications-${PVCUT}*:5[X?]
=kde-frameworks/kparts-${PVCUT}*:5
=kde-frameworks/kservice-${PVCUT}*:5
=kde-frameworks/ktextwidgets-${PVCUT}*:5
=kde-frameworks/kunitconversion-${PVCUT}*:5
=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
- =kde-frameworks/kwindowsystem-${PVCUT}*:5[X=]
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
virtual/libintl
@@ -79,8 +80,12 @@ BDEPEND="
"
PATCHES=(
+ # downstream patches
"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
"${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
+ # pending upstream:
+ # https://invent.kde.org/frameworks/kdelibs4support/-/merge_requests/21
+ "${FILESDIR}/${PN}-5.99.0-with_x11.patch"
)
src_prepare() {
@@ -95,7 +100,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- $(cmake_use_find_package X X11)
+ -DWITH_X11=$(usex X)
)
ecm_src_configure
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-10 8:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-30 22:31 [gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/, kde-frameworks/kdelibs4support/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-10-10 8:36 Andreas Sturmlechner
2021-04-05 11:29 Andreas Sturmlechner
2020-11-28 0:17 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox