diff options
Diffstat (limited to 'kde-frameworks/kdelibs4support')
| -rw-r--r-- | kde-frameworks/kdelibs4support/Manifest | 5 | ||||
| -rw-r--r-- | kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch | 98 | ||||
| -rw-r--r-- | kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild (renamed from kde-frameworks/kdelibs4support/kdelibs4support-5.98.0.ebuild) | 11 |
3 files changed, 109 insertions, 5 deletions
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest index be5e10b5265d..5ce0f0bd9f3a 100644 --- a/kde-frameworks/kdelibs4support/Manifest +++ b/kde-frameworks/kdelibs4support/Manifest @@ -1,7 +1,8 @@ AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f7e39eb110d7b838ed6ff3bb34ca8b44242d57359b3efc4bebde8ae615b27df31cba42d14349697ba303b3aa20b09c1d83d044cff2cd6700f0 SHA512 2a7a1c05c6ef7f440ca84eef7b65f65f92d780fa411301e2a8554115717cbe543127e1878ae5642f07f7ddcae4a62ed075468f85e7c7cdb13992b4bada270bff AUX kdelibs4support-5.86.0-unused-dep.patch 1693 BLAKE2B b310444effa8bf0a2a203cdc7e427ade52caceabc77b1dce96cbc739443c9d8429c2f1186f3d1e5180a0b8ef6323ea805a040ded435b2a0a3abdcef0e4dceee9 SHA512 bf7637791517739ebfa296beb91f3873d21165c4760374df8972fa75f237dfefb24cac7ea7895f359dcf368a18f974005b83646f9ba3cd6891ba6181880a4a6a +AUX kdelibs4support-5.99.0-with_x11.patch 3483 BLAKE2B ab24a33b62d9221c9b6583d62273e3c641c2ceadc9db57cce6133c8a5d2351b804907c98f549d3ba957c3a2aa1a6104b85c188e87f271818c3f286572ce69487 SHA512 cb234fb1cc0f97e97a490c936b72f9121b6827f28d2ed8aa8886eb369f2ecad7be9ddf82c4cba4b158516d1e7f11b8361b8d101147fc893303642abbc3c0b0d2 DIST kdelibs4support-5.96.0.tar.xz 3657280 BLAKE2B 5450ad4aced1e73b68dab9ce5f858f65765b96d98b2d977a796d13f148f31e8cb6d2562713569b4694afa163e3fac2d93ee94e6bd1592710e1141e6095320761 SHA512 25d80c003b6cc661058d24e3af4b9ef43c05029375c74ea2aedd1b4cbb8a09896404d2e2cb4eca884ad091f7d26b9afebd1a0ff13c96b9d793c40880300fb59d -DIST kdelibs4support-5.98.0.tar.xz 3667136 BLAKE2B 2afe48da81073c45040036cf2a3cdb3c1c0d96a19ec5a1f1c3b6659af24946bbc5f6134079dc93fbeda762b36f604c7bdfcdad0a3501fed7babc6a89750fac76 SHA512 e721ce662c9961a643c82b734d51c09935888545d8298abde93066db14d06d694aaabc2fad7bb98e3b6053e1d668ca32dbc2d85755df009fd724c1a59c0aa542 +DIST kdelibs4support-5.99.0.tar.xz 3667732 BLAKE2B 371b9b96e1f99424d85034d20c79759b0d2a4796ed3771626c2623f9732b37d0f02451c44e9e42e78eddd211f6c4f24c3b0dfa20f21181d17124af28583299e9 SHA512 06716965e50d0adbfe57f3024045ee7f60b62f0ee9910e0ebcf92cf0592434631fae45d5be6ee4e91fdc9ca384bfedbedb9fb3c32acd09b81ce5ee37695f2676 EBUILD kdelibs4support-5.96.0.ebuild 2640 BLAKE2B 95d5b39d277f76051b99c1851eaf89cfc0e7d0e14d3ace1ac2c9decc90cd3dfec24172b18275b722c7cfbdd6285efc20d1a62f1ab1e8212f564cd152088a9084 SHA512 674fe77b5567fe4afde0022d0f16e89328b62e95543e0023f7e9dbe3ef3cd63d28b6db6c9982c942edde79702a0397eba5ad00083087e0eed4ade7690e0de4b6 -EBUILD kdelibs4support-5.98.0.ebuild 2643 BLAKE2B 56436cf7be8f4fefe58316f73894d73591a27f614392ac4e9c9e8253034dcdcf78b9dbf3650d5b6e712016ce76fc3277bd37ae449a0b6deae31e83e4c6bf4304 SHA512 80d6fa2a871ee73d472bb723806fd8d4843bf0cdd28f0bdf84907662e4f6aacd636848a014dd56f787c6303fd25520dcf7d443d9402e3eb4d8cba15658d04c53 +EBUILD kdelibs4support-5.99.0.ebuild 2784 BLAKE2B 9cce216a5cd44bbedca2bd92e890bf4954ff34684bd1493b44893341726a63830af915cdc257b49acc3a17cd3e80a95efc15dd6707c4f7213c59990f359ee735 SHA512 04ec9fda18ab4e8c10c1ddfc576f0c43b1659eedd6658dea16e0dc36c9547cb0d610b4bc60ed076c13875980d9d123b0bb26c1a3b59c37229b3e103cfbaae76e MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 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 000000000000..24bcb1b9cca0 --- /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-5.98.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild index 90fd9ac526a5..e67de1df9f7e 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.98.0.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.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="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" 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}/${P}-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 |