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 47242158091 for ; Wed, 15 Jun 2022 17:20:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D020E0923; Wed, 15 Jun 2022 17:20:20 +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 231E8E0936 for ; Wed, 15 Jun 2022 17:20:20 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02AC0341EEB for ; Wed, 15 Jun 2022 17:20:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 483C8501 for ; Wed, 15 Jun 2022 17:20:17 +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: <1655230877.f53329f738bfbd9ce93be632a5da4a0bd5767272.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/Manifest dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch dev-qt/qtcore/qtcore-5.15.4.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ dev-qt/qtcore/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f53329f738bfbd9ce93be632a5da4a0bd5767272 X-VCS-Branch: master Date: Wed, 15 Jun 2022 17:20:17 +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: cd900c00-0a89-439b-b8e5-c638ecf1f727 X-Archives-Hash: d008990b18c67afce95db66192854db2 commit: f53329f738bfbd9ce93be632a5da4a0bd5767272 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 14 11:41:24 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 14 18:21:17 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f53329f7 dev-qt/qtcore: Cleanup and make use of gentoo-patchset Ends the which-hunt. Bug: https://bugs.gentoo.org/828100 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtcore/Manifest | 1 + ...qtcore-5.14.1-cmake-macro-backward-compat.patch | 50 ---------------------- dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch | 41 ------------------ dev-qt/qtcore/qtcore-5.15.4.9999.ebuild | 5 --- 4 files changed, 1 insertion(+), 96 deletions(-) diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest new file mode 100644 index 00000000..1e41118d --- /dev/null +++ b/dev-qt/qtcore/Manifest @@ -0,0 +1 @@ +DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch deleted file mode 100644 index 30b5abc3..00000000 --- a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Andreas Sturmlechner -Date: Sun, 9 Feb 2020 11:45:00 +0100 -Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from =Qt-5.14, as a consequence of slot upgrade rebuilds, some -reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their -cmake files regenerated, leading to cmake errors like: - -https://bugs.gentoo.org/703306 -https://bugs.gentoo.org/705198 - -From mkspecs/features/create_cmake.prf: - -# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties -# functions whether a Configuration specific generator expression needs to be added to the values -# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need -# configuration specific values. For singular builds (only release or only debug), we want the -# values to be applied regardless of the configuration. -# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to -# build a Debug configuration of an application, even if Qt was built in a Release configuration. - -qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease -optional and default to FALSE. - ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100 -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 -@@ -538,8 +538,14 @@ - - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - -- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION -- IsDebugAndRelease) -+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) -+ set(IsDebugAndRelease FALSE) -+ set (list_var ${ARGN}) -+ list(LENGTH list_var num_extra_arg) -+ if (${num_extra_arg} GREATER 0) -+ list(GET list_var 0 IsDebugAndRelease) -+ endif() -+ - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) diff --git a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch deleted file mode 100644 index c83c59ac..00000000 --- a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch +++ /dev/null @@ -1,41 +0,0 @@ -# Use link option -pthread instead of -lpthread - -# https://github.com/riscv-collab/riscv-gcc/issues/12 use Option 4 -# https://stackoverflow.com/questions/23250863/difference-between-pthread-and-lpthread-while-compiling -# In riscv, "-pthread" equivalent to add link option "--push-state --as-needed -latomic --pop-state" - -diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf -index 544cc227..add969be 100644 ---- a/mkspecs/common/linux.conf -+++ b/mkspecs/common/linux.conf -@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL = -lEGL - QMAKE_LIBS_OPENGL = -lGL - QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 - QMAKE_LIBS_OPENVG = -lOpenVG --QMAKE_LIBS_THREAD = -lpthread -+QMAKE_LIBS_THREAD = -pthread - QMAKE_LIBS_VULKAN = - - QMAKE_INCDIR_WAYLAND = -diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index 9b5d19d4..da028fb2 100644 ---- a/src/corelib/configure.json -+++ b/src/corelib/configure.json -@@ -355,7 +355,7 @@ - "std::future f = std::async([]() { return 42; });", - "(void)f.get();" - ], -- "qmake": "unix:LIBS += -lpthread" -+ "qmake": "unix:LIBS += -pthread" - } - }, - "cxx11_random": { -@@ -466,7 +466,7 @@ - "shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);", - "shm_unlink(\"test\");" - ], -- "qmake": "linux: LIBS += -lpthread -lrt" -+ "qmake": "linux: LIBS += -pthread -lrt" - } - }, - "linkat": { diff --git a/dev-qt/qtcore/qtcore-5.15.4.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.4.9999.ebuild index e197e2ff..84966e24 100644 --- a/dev-qt/qtcore/qtcore-5.15.4.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.4.9999.ebuild @@ -42,11 +42,6 @@ QT5_GENTOO_PRIVATE_CONFIG=( !:xml ) -PATCHES=( - "${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306 - "${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470 -) - pkg_pretend() { use kernel_linux || return get_running_version