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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B139B158094 for ; Sun, 9 Oct 2022 16:39:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C0AEE092C; Sun, 9 Oct 2022 16:39:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3ED2EE092C for ; Sun, 9 Oct 2022 16:39:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C041341081 for ; Sun, 9 Oct 2022 16:39:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CBC4624 for ; Sun, 9 Oct 2022 16:39:26 +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: <1665333512.8ec7bc2fdaf3f3f1f921c1211c118f59142a304a.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kinit/files/, kde-frameworks/khtml/files/, ... X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch kde-frameworks/kio/files/kio-5.96.0-with_x11.patch X-VCS-Directories: kde-frameworks/kio/files/ kde-frameworks/khtml/files/ kde-frameworks/kinit/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8ec7bc2fdaf3f3f1f921c1211c118f59142a304a X-VCS-Branch: master Date: Sun, 9 Oct 2022 16:39:26 +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: db56bd10-0fe2-40e5-a75a-9d7e50d856bd X-Archives-Hash: e6e9ca4fd2ef40ee04cef0d311bc5116 commit: 8ec7bc2fdaf3f3f1f921c1211c118f59142a304a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 8 18:02:36 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 9 16:38:32 2022 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ec7bc2f kde-frameworks/*: Drop upstreamed patches Signed-off-by: Andreas Sturmlechner gentoo.org> .../khtml/files/khtml-5.96.0-with_x11.patch | 100 --------------------- .../kinit/files/kinit-5.96.0-with_x11.patch | 72 --------------- kde-frameworks/kio/files/kio-5.96.0-with_x11.patch | 72 --------------- 3 files changed, 244 deletions(-) diff --git a/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch b/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch deleted file mode 100644 index fb75eaa49c..0000000000 --- a/kde-frameworks/khtml/files/khtml-5.96.0-with_x11.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 9712a641636bf9b794e1ce3b7ec00534de56faa1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 6 Aug 2022 11:03:35 +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 | 14 +++++++------- - src/CMakeLists.txt | 5 ++--- - tests/CMakeLists.txt | 4 ++-- - 3 files changed, 11 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bca3622..700a0a7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,9 +60,13 @@ set_package_properties(Perl PROPERTIES - PURPOSE "Required for generating JS bindings for elements" - ) - --if(NOT APPLE) -- find_package(X11) -- set(HAVE_X11 ${X11_FOUND}) -+if(NOT WIN32 AND NOT APPLE) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if(WITH_X11) -+ find_package(X11 REQUIRED) -+ set(HAVE_X11 1) -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -+ endif() - endif() - - find_package(Phonon4Qt5 4.6.60) -@@ -94,10 +98,6 @@ set_package_properties(PNG PROPERTIES DESCRIPTION "PNG decoding library" - PURPOSE "Required for decoding and displaying PNG images" - ) - --if(NOT WIN32 AND NOT APPLE AND X11_FOUND) -- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) --endif() -- - find_package(Gperf REQUIRED) - - # remove definitions set by KDEFrameworkCompilerSettings which we fail to meet -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 573fa88..14b2e73 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -592,7 +592,6 @@ target_link_libraries(KF5KHtml - ${JPEG_LIBRARIES} - ${GIF_LIBRARIES} - ${PNG_LIBRARIES} -- ${X11_LIBRARIES} - Qt5::PrintSupport - KF5::Archive - KF5::SonnetCore -@@ -604,8 +603,8 @@ target_link_libraries(KF5KHtml - KF5::Bookmarks - KF5::KIOWidgets # KUrlRequester - ) --if(NOT WIN32 AND NOT APPLE AND X11_FOUND) -- target_link_libraries(KF5KHtml PRIVATE Qt5::X11Extras) -+if(NOT WIN32 AND NOT APPLE AND HAVE_X11) -+ target_link_libraries(KF5KHtml PRIVATE ${X11_LIBRARIES} Qt5::X11Extras) - endif() - - if (KJS_DEBUGGER) -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index ae079ae..b6347d7 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,6 +1,6 @@ - include(ECMMarkAsTest) - --if(NOT WIN32 AND NOT APPLE AND X11_FOUND) -+if(NOT WIN32 AND NOT APPLE AND HAVE_X11) - find_package(Qt5X11Extras "${REQUIRED_QT_VERSION}" CONFIG REQUIRED) - set_package_properties(Qt5X11Extras PROPERTIES PURPOSE "Required for tests") - endif() -@@ -79,7 +79,7 @@ endif() - - # Note that testregression can't be compiled by default, it needs private Qt headers. - # See also BUILDING-TESTREGRESSION --if (KHTML_BUILD_TESTREGRESSION) -+if (KHTML_BUILD_TESTREGRESSION AND HAVE_X11) - - set(testregression_SRCS - test_regression.cpp --- -GitLab - diff --git a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch b/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch deleted file mode 100644 index fd6efe2fae..0000000000 --- a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 85ca4b6515ac2539fb31b74db6fe5ceae1590be1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 2 Aug 2022 00:19:19 +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 | 15 +++++++++------ - src/kdeinit/CMakeLists.txt | 4 ++-- - 2 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 90baa57..e27c41f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,13 +30,16 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KINIT - - #optional features - if (NOT APPLE) -- find_package(X11) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if(WITH_X11) -+ find_package(X11 REQUIRED) -+ set(HAVE_X11 1) -+ -+ find_package(XCB MODULE COMPONENTS XCB) -+ set_package_properties(XCB PROPERTIES TYPE OPTIONAL) -+ set(HAVE_XCB ${XCB_XCB_FOUND}) -+ endif() - endif() --set(HAVE_X11 ${X11_FOUND}) -- --find_package(XCB MODULE COMPONENTS XCB) --set_package_properties(XCB PROPERTIES TYPE OPTIONAL) --set(HAVE_XCB ${XCB_XCB_FOUND}) - - # used by 4 executables in this module - if(HAVE_SOCKET_LIBRARY) -diff --git a/src/kdeinit/CMakeLists.txt b/src/kdeinit/CMakeLists.txt -index af84a14..3fcbd1c 100644 ---- a/src/kdeinit/CMakeLists.txt -+++ b/src/kdeinit/CMakeLists.txt -@@ -38,7 +38,7 @@ target_compile_definitions(kdeinit5 PRIVATE - KDE_INSTALL_FULL_LIBEXECDIR_KF5="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}" - ) - --if (X11_FOUND) -+if (HAVE_X11) - target_link_libraries(kdeinit5 ${X11_X11_LIB}) - endif() - -@@ -63,7 +63,7 @@ if (NOT WIN32) - - target_link_libraries(kdeinit5_wrapper ${KINIT_SOCKET_LIBRARY} Qt5::Core KF5::DBusAddons) - -- if (NOT X11_FOUND) -+ if (NOT HAVE_X11) - target_compile_definitions(kdeinit5_wrapper PRIVATE -DNO_DISPLAY) - endif () - --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch deleted file mode 100644 index 9f87ec989a..0000000000 --- a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c7a277e6810b74b7f664b029573beab592932421 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Mon, 1 Aug 2022 22:10:02 +0200 -Subject: [PATCH] Drop obsolete X11 dependency, introduce WITH_X11 option - instead - -This will only determine whether to search for Qt5X11Extras and then -set HAVE_X11 accordingly. This is a behavior change as previously it was -silently disabled if X11 was not found. - -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. - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 19 +++++++++---------- - src/ioslaves/http/CMakeLists.txt | 3 --- - 2 files changed, 9 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 95b5db299..c3372f7ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -117,17 +117,16 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of - PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used" - ) - --if (NOT APPLE AND NOT WIN32) -- find_package(X11) --endif() -- --set(HAVE_X11 ${X11_FOUND}) --if (HAVE_X11) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -- else() -- # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above -+if (NOT APPLE AND NOT WIN32 AND NOT ANDROID) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if(WITH_X11) -+ if (QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -+ else() -+ # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above -+ endif() - endif() -+ set(HAVE_X11 ${WITH_X11}) - endif() - - find_package(ACL) -diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt -index 4fbddb4a3..689f63dd8 100644 ---- a/src/ioslaves/http/CMakeLists.txt -+++ b/src/ioslaves/http/CMakeLists.txt -@@ -3,9 +3,6 @@ include(ECMMarkNonGuiExecutable) - include(ConfigureChecks.cmake) - configure_file(config-kioslave-http.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h ) - --find_package(X11) --set(HAVE_X11 ${X11_FOUND}) -- - if(GSSAPI_FOUND) - set(HAVE_LIBGSSAPI 1) - if(GSSAPI_FLAVOR STREQUAL "MIT") --- -GitLab -