[gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/files/, kde-frameworks/kdelibs4support/

2022-11-02 Thread Andreas Sturmlechner 
commit: 39d720bca9a1a9e89859dbbf3f91c7d10fe6d755
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov  2 10:25:10 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov  2 12:58:55 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=39d720bc

kde-frameworks/kdelibs4support: Drop upstreamed patch

Upstream commit 598dcb3b1549230c931bb6dcf9001b395f8ec9f4

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kdelibs4support-5.99.0-with_x11.patch| 98 --
 .../kdelibs4support/kdelibs4support-.ebuild|  3 -
 2 files changed, 101 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
deleted file mode 100644
index 24bcb1b9cc..00
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 026571f37c990007be3d7e536b335c19ab98009e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-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 

- 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-.ebuild 
b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
index b455381245..fd04667df1 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
@@ -83,9 +83,6 @@ PATCHES=(
# downstream patches
"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
"${FILESDIR}/${PN}-5.86.0-unused-d

[gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/files/, kde-frameworks/kdelibs4support/

2021-08-15 Thread Andreas Sturmlechner 
commit: 51e558c9cf16e1bb284f6cca99945de07b7f0eaa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 15 14:57:42 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 15 14:57:42 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=51e558c9

kde-frameworks/kdelibs4support: Rebase no-kdesignerplugin.patch

Reported-by: jospezial  gmx.de>
Closes: https://bugs.gentoo.org/808465
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 82.0-unused-dep.patch => kdelibs4support-5.86.0-unused-dep.patch} | 2 +-
 kde-frameworks/kdelibs4support/kdelibs4support-.ebuild| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch 
b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
similarity index 98%
rename from 
kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
rename to 
kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
index e6a287ebda..8614a84902 100644
--- 
a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
+++ 
b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
@@ -17,7 +17,7 @@ index 2a432591..e503999d 100644
 @@ -20,7 +20,7 @@ include(GenerateExportHeader)
  include(CMakeFindFrameworks)
  
- set(REQUIRED_QT_VERSION 5.15.0)
+ set(REQUIRED_QT_VERSION 5.15.2)
 -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-.ebuild 
b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
index 62b97e97d2..c2207b179e 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
@@ -78,8 +78,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
-   "${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
+   "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
+   "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
 )
 
 src_prepare() {

[gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/files/, kde-frameworks/kdelibs4support/

2020-12-19 Thread Andreas Sturmlechner 
commit: e36ce6576c16630918df818fddefc73b5d1183a1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 19 23:13:43 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 19 23:14:20 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e36ce657

kde-frameworks/kdelibs4support: Rebase no-kdesignerplugin.patch

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/760741
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...gnerplugin.patch => kdelibs4support-5.78.0-no-kdesignerplugin.patch} | 2 +-
 kde-frameworks/kdelibs4support/kdelibs4support-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch
 
b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch
similarity index 99%
rename from 
kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch
rename to 
kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch
index e4e0f82fe2..be81bf04ef 100644
--- 
a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch
+++ 
b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.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.13.0)
+ 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)
  

diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild 
b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
index 145ab83542..4f151f3867 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
@@ -78,7 +78,7 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-5.77.0-no-kdesignerplugin.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.78.0-no-kdesignerplugin.patch" )
 
 src_prepare() {
ecm_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/files/, kde-frameworks/kdelibs4support/

2020-11-24 Thread Andreas Sturmlechner 
commit: 755b9a57e8871600401f017841519183b1f7e728
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 22 23:48:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 24 20:40:02 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=755b9a57

kde-frameworks/kdelibs4support: Drop KF5Designerplugin/Qt5Designer

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...kdelibs4support-5.76.0-no-kdesignerplugin.patch | 197 +
 .../kdelibs4support/kdelibs4support-.ebuild|   4 +-
 2 files changed, 199 insertions(+), 2 deletions(-)

diff --git 
a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.76.0-no-kdesignerplugin.patch
 
b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.76.0-no-kdesignerplugin.patch
new file mode 100644
index 00..a3159392b2
--- /dev/null
+++ 
b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.76.0-no-kdesignerplugin.patch
@@ -0,0 +1,197 @@
+From a97b01b220e6ef08d1517fea76fdaddb84a9773e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 22 Nov 2020 00:25:06 +0100
+Subject: [PATCH 1/2] Drop KDE4_ADD_WIDGET_FILES macro and KF5DesignerPlugin
+ dependency
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt   |  1 -
+ KF5KDELibs4SupportConfig.cmake.in|  1 -
+ cmake/modules/FindKDE4Internal.cmake |  4 
+ cmake/modules/KDE4Macros.cmake   |  2 --
+ src/CMakeLists.txt   | 19 ---
+ src/KDEUIMacros.cmake| 25 -
+ 6 files changed, 52 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9f4b6d33..20a27b52 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)
+diff --git a/KF5KDELibs4SupportConfig.cmake.in 
b/KF5KDELibs4SupportConfig.cmake.in
+index b5194f94..5e16c780 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@")
+diff --git a/cmake/modules/FindKDE4Internal.cmake 
b/cmake/modules/FindKDE4Internal.cmake
+index 7e252a70..b9636036 100644
+--- a/cmake/modules/FindKDE4Internal.cmake
 b/cmake/modules/FindKDE4Internal.cmake
+@@ -179,10 +179,6 @@
+ #Use optional USE_RELATIVE_PATH to generate the classes in the build 
following the given
+ #relative path to the file.
+ #
+-#  KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
+-#Use this to add widget description files for the makekdewidgets code 
generator
+-#for Qt Designer plugins.
+-#
+ #  KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN )
+ #Create a KDE plugin (KPart, kioslave, etc.) from the given source files.
+ #If WITH_PREFIX is given, the resulting plugin will have the prefix 
"lib", otherwise it won't.
+diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
+index ca868ad9..27bb28f9 100644
+--- a/cmake/modules/KDE4Macros.cmake
 b/cmake/modules/KDE4Macros.cmake
+@@ -10,7 +10,6 @@
+ # KDE4_ADD_KDEINIT_EXECUTABLE
+ # KDE4_ADD_UNIT_TEST
+ # KDE4_ADD_EXECUTABLE
+-# KDE4_ADD_WIDGET_FILES
+ # KDE4_UPDATE_ICONCACHE
+ # KDE4_INSTALL_ICONS
+ # KDE4_REMOVE_OBSOLETE_CMAKE_FILES
+@@ -486,7 +485,6 @@ include("${KF5Auth_DIR}/KF5AuthMacros.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
+ include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
+-include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake")
+ 
+ # 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
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -371,25 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
+ )
+ 
+ 
+-## Designer plugin
+-
+-kf5designerplugin_add_plugin(kf5deprecatedwidgets
+-kdedeprecated.widgets
+-kdedeprecated.qrc
+-classpreviews.cpp
+-)
+-
+-target_link_libraries(kf5deprecatedwidgets KF5::KDELibs4Support
+-Qt5::Widgets
+