From 9d0673651c57438d51e18c6b8ca894d0491b2df3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 24 Aug 2022 20:48:34 +0100 Subject: gentoo auto-resync : 24:08:2022 - 20:48:33 --- kde-apps/Manifest.gz | Bin 37261 -> 37261 bytes kde-apps/kdialog/Manifest | 5 ++- .../files/kdialog-22.04.3-without_x11.patch | 44 +++++++++++++++++++++ kde-apps/kdialog/kdialog-22.04.3.ebuild | 4 +- kde-apps/kdialog/kdialog-22.08.0.ebuild | 4 +- 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 kde-apps/kdialog/files/kdialog-22.04.3-without_x11.patch (limited to 'kde-apps') diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz index b4484deb7e9c..b5edb10b319b 100644 Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest index ad4fb0b8447c..20ab920a05c3 100644 --- a/kde-apps/kdialog/Manifest +++ b/kde-apps/kdialog/Manifest @@ -1,5 +1,6 @@ +AUX kdialog-22.04.3-without_x11.patch 1512 BLAKE2B 23a1635976f0efc858b280e62c2aaf7b771e0e10d314fe434134dacb1a99bdac0b9664333829866db8c21f59b49a682266b62bcf5a1370470ca6b0674ca241b2 SHA512 cbed0b7c679d4b6cd71eece006e96cac0e84df6295b9727cdf3d4e9fad2b398a9ef2aa5941ac4ea429f39f7dd2de235a46c73ef5ed7e3d89fef0e18821fa059e DIST kdialog-22.04.3.tar.xz 116660 BLAKE2B 424a2cf7c1505147df023e604011bb3e7db042b2e0efd7ebc95e29d7b283b06d4f79e234f8a4276fd35e92546f34edb5ae75272f56168706fe52ef214b24b13d SHA512 a1b7ae0703fc88ae8e96c9b00f0fb918ed92a104c149cedf8cad5188187fdcaffe8bbafd5def2f1ad0317d1a55a4c5e3a23b554fc49a730060dbc5cd6c9424e1 DIST kdialog-22.08.0.tar.xz 116720 BLAKE2B 7d268b42611129744112c405103fe851d88f0559b9d802b8a3907e0a57815db45f882a06800101290bf9c2563f4bf0dcd83d5a5ff22329606ff0a01a0e1412cb SHA512 ffc0f680dbe460245bf8b69f628f477132eb6991ea12aabc4bc0141ab6e1a8825796eaeeec1aca99841e5ab075db47aae4807b8acec0a3c918b1ca9eae8e7f1d -EBUILD kdialog-22.04.3.ebuild 1048 BLAKE2B 673daa214fb1adbb59b40795e9da89d09e3d7e118e5b373d6fedd31953c28791230fe5760d39997dbf63cd91816fba05fb9ad1bfac19b59c81b741e797561ce8 SHA512 11e07f3cce2b081b00272d4f8c25a70677375b0f23e2ab717673c83c2ba9d321d4a521caa124d0369051f14b62d14ec5aa1a741ea1e6775bf02b12e0582806a5 -EBUILD kdialog-22.08.0.ebuild 1051 BLAKE2B 6d6f9ef00e135ac9d187adfcd2b27125a2624843a0118b4cbfcc28f5d6f235627b40338a91cfaba50c30fb659290e217dc4e327fd999bd33440c7f8bbc9b28db SHA512 6b39722908269339afce94e99c569e84c92d53771fe7ef3726bdfbbef2528d5a86010c046e2de02a5361d4a45d5cbacd4b5005a2b21a160bc9a8658594278b24 +EBUILD kdialog-22.04.3.ebuild 1091 BLAKE2B 9b865ffbec5ba98124955eac95b9724e438735b43b3100eb0fcfe1520ce7ef0da89a807cdf73195f7f4dc5fd11b969a45199897f3654a2b2b0b0389e93f0b7cc SHA512 7ed699bc8991010011f6ae024a1928cb8e6fc06d02a7a22bfb8fee016fbad72f03fa6644477cb7b5592c12c2d95902750d0716308928599590b314c435491784 +EBUILD kdialog-22.08.0.ebuild 1103 BLAKE2B b22c84cae72833b0ec7dcd325fdc26890ea4d6af99c3685aa046563dc2d3e87b80a9945f61549c806a7ffd18a7f0e11bab6ec553217317e20fd7a5574cd6a8d8 SHA512 d0828451493c5b117720fccd2cc7ddb6480b8c33c42fa3bf037d26d185f74e1fe071260a5c548b35a31954143642226897fcfa4487d9bb2c4cdf309cd2a28202 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/kdialog/files/kdialog-22.04.3-without_x11.patch b/kde-apps/kdialog/files/kdialog-22.04.3-without_x11.patch new file mode 100644 index 000000000000..d0b7cd2a25f7 --- /dev/null +++ b/kde-apps/kdialog/files/kdialog-22.04.3-without_x11.patch @@ -0,0 +1,44 @@ +From 0a50669e229a965a61039e5f9f20c345d72231b5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 27 Nov 2021 13:52:23 +0100 +Subject: [PATCH] Add CMake option to build WITHOUT_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. + +Introducing this option means there is no behavior change by default, +cmake will just skip finding X11 or adding unwanted features if the +option is enabled. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2bb478129..8449057db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,10 +26,10 @@ include(FeatureSummary) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS TextWidgets Notifications GuiAddons IconThemes WindowSystem KIO DBusAddons) + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS DBus) + +- +-find_package(X11) +-if(X11_FOUND) +- set(HAVE_X11 1) ++option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) ++if (NOT WITHOUT_X11) ++ find_package(X11) ++ set(HAVE_X11 ${X11_FOUND}) + endif() + + add_definitions( +-- +GitLab + diff --git a/kde-apps/kdialog/kdialog-22.04.3.ebuild b/kde-apps/kdialog/kdialog-22.04.3.ebuild index e2d42a868e72..e5d612fcbb4e 100644 --- a/kde-apps/kdialog/kdialog-22.04.3.ebuild +++ b/kde-apps/kdialog/kdialog-22.04.3.ebuild @@ -34,9 +34,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-without_x11.patch" ) + src_configure() { local mycmakeargs=( - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure } diff --git a/kde-apps/kdialog/kdialog-22.08.0.ebuild b/kde-apps/kdialog/kdialog-22.08.0.ebuild index ca75d0c43665..66a144fd0a8d 100644 --- a/kde-apps/kdialog/kdialog-22.08.0.ebuild +++ b/kde-apps/kdialog/kdialog-22.08.0.ebuild @@ -34,9 +34,11 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) + src_configure() { local mycmakeargs=( - $(cmake_use_find_package X X11) + -DWITHOUT_X11=$(usex !X) ) ecm_src_configure } -- cgit v1.2.3