From d522d1ab80efc308821a88512ab6d40850d54cb0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Mar 2024 00:48:13 +0000 Subject: gentoo auto-resync : 16:03:2024 - 00:48:12 --- games-util/Manifest.gz | Bin 8226 -> 8222 bytes games-util/lgogdownloader/Manifest | 5 +- .../lgogdownloader/files/lgogdownloader-qt6.patch | 73 +++++++++++++++++++++ .../lgogdownloader/lgogdownloader-3.12-r1.ebuild | 56 ++++++++++++++++ .../lgogdownloader/lgogdownloader-3.12.ebuild | 39 ----------- .../lgogdownloader/lgogdownloader-9999.ebuild | 27 ++++++-- 6 files changed, 152 insertions(+), 48 deletions(-) create mode 100644 games-util/lgogdownloader/files/lgogdownloader-qt6.patch create mode 100644 games-util/lgogdownloader/lgogdownloader-3.12-r1.ebuild delete mode 100644 games-util/lgogdownloader/lgogdownloader-3.12.ebuild (limited to 'games-util') diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz index c96ea5830ddb..2bd64351f7d1 100644 Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest index 4416d7b6deff..57b6dc3ffede 100644 --- a/games-util/lgogdownloader/Manifest +++ b/games-util/lgogdownloader/Manifest @@ -1,4 +1,5 @@ +AUX lgogdownloader-qt6.patch 2398 BLAKE2B 1e75fb6913b4bd50863f5858f2ec78f7bc965bcb824340a274f0157a7829e76a8ae4e8eb7588d9af120bb5c640e122d89b8ecf78305cdfaa1ca935ca31d1bfb5 SHA512 eec9cdf6a5bec1c6b9fb99786b1fa502b7650d55038f8a0526d5ece8bb3c52c8da84e67997a7e3f5f14ec322e9c9e0a38883d2cf18c86331cfb427f0b8161672 DIST lgogdownloader-3.12.tar.gz 96896 BLAKE2B 27e967c6be6919eda7a0adade72221d7b90e5b328e9a10201afa32046a384488f3c312ed94ff86ce376e7f1b9e99baabc3752a1f9536fdacf4fcc987132253f6 SHA512 04a753f772434cdbc634efd69ccf4007376c789d68b9204947045bafc0f953d8bbfad0104b6ffaad257bd3d1eabcae73e7ee56b65611799ceff6454418dc86b8 -EBUILD lgogdownloader-3.12.ebuild 835 BLAKE2B dacf0698125fee85b15751699abaf1258f4733f48518084dbf723ef04ff7aa09b1d0821ffee6c6fa2da5e35e34cfff41f8002114c4a258507aa312d15a53b512 SHA512 7333203f1a72d0350411ec12f2d80b2299527bba1b2b8423bfdf28740bf9a3fe5930998f12ccc6eb7f258f0002cc4c1aa7f1dd4cc02df3b699a20bd4d25b3016 -EBUILD lgogdownloader-9999.ebuild 801 BLAKE2B 1bb0ba50a08359c0655997e118589033116c5373c0674fb766e08985c2d4c58a29c8861b384ec080811fc2e798d49067d6d325d63de78a2785b4b1876516d792 SHA512 40c07450090e9b2c6f48afd8df0d98ed6052f9b85f4fb99469aec774a2dd38a1c24b9626ea8350f03585b6cfaba93dec241fcf0742ff5aab9953a3afc64649d5 +EBUILD lgogdownloader-3.12-r1.ebuild 1064 BLAKE2B 58265e4e14256f03d6c50fe4d93fb0bebbd217282e5f7d1ade04bcfaaf212afb6ceff6501fdf17ed9b106242e1183e469c2388236dc7502f42486d5466c8917b SHA512 82c18bcfae4f4d08342d2e46d13f05d03053c01076ebc93048b335794bb1a13402020e95652f55c66da1cf2bc39fc75402e81d2bece40f179cab43dc9637ac7d +EBUILD lgogdownloader-9999.ebuild 986 BLAKE2B fc2d9edaafbf8693bd3b687a10bdf7d5c8bd7ecbf2b0537e434ace09fa5811c669889c7fd76756a1402a7526495e89b2ce0ce2192f280e44b1387fa22a47c0d0 SHA512 d18b343f75a3717607bac774f72fd008311db0ab06ad9660c4823623e65dc0b7c5e6be06a21964d58f47187778d6dc58897aa02c1440672c0709e67d727a9067 MISC metadata.xml 1098 BLAKE2B 154a5ed56c5e935723180acca12ae6e0a14ee2353b1a1626e16e1932922121b8d4b5eb6b5e1f2ade2f707eff696f744677e7d8f9059cdfd6f1357c77a6dc3196 SHA512 b28a6adab900d56756f206983b4fc39f5b0158702cc7a053d4c6a60f926d0dfd5d2853e0df7e99684891d7b6451829b3908c3fe9ff6a320d4fcf51c0910d417e diff --git a/games-util/lgogdownloader/files/lgogdownloader-qt6.patch b/games-util/lgogdownloader/files/lgogdownloader-qt6.patch new file mode 100644 index 000000000000..5d1652bcbdd7 --- /dev/null +++ b/games-util/lgogdownloader/files/lgogdownloader-qt6.patch @@ -0,0 +1,73 @@ +From 3f223684cbe1367c68b2b68301eeaaf644a4c0be Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Thu, 14 Mar 2024 22:12:02 +0000 +Subject: [PATCH] Add support for Qt6 (as well as Qt5) + +No actual code changes were necessary. + +I have partly followed +https://doc.qt.io/qt-6/cmake-qt5-and-qt6-compatibility.html, but the +versionless targets only work from Qt 5.15 onwards. The suggested +workaround chooses 5 over 6 and does not appear to work properly when +one of the required components is missing. Using the versionless +approach with an additional variable for the targets seems to work best. + +If necessary, Qt 5 can be forced over 6 by passing +`-DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON`. + +I have tested this by tweaking the code to force the GUI to appear. +--- + CMakeLists.txt | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0fe7568..9f489c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,8 +45,12 @@ file(GLOB SRC_FILES + ) + + if(USE_QT_GUI) +- find_package(Qt5Widgets CONFIG REQUIRED) +- find_package(Qt5WebEngineWidgets CONFIG REQUIRED) ++ set(QT Qt6) ++ find_package(Qt6 COMPONENTS Widgets WebEngineWidgets CONFIG) ++ if(NOT Qt6_FOUND) ++ set(QT Qt5) ++ find_package(Qt5 REQUIRED COMPONENTS Widgets WebEngineWidgets CONFIG) ++ endif() + + file(GLOB QT_GUI_SRC_FILES + src/gui_login.cpp +@@ -140,11 +144,17 @@ file(REMOVE ${CMAKE_BINARY_DIR}/test_atomic.cpp) + + if(USE_QT_GUI) + target_link_libraries(${PROJECT_NAME} +- PRIVATE Qt5::Widgets +- PRIVATE Qt5::WebEngineWidgets ++ PRIVATE ${QT}::Widgets ++ PRIVATE ${QT}::WebEngineWidgets + ) + endif(USE_QT_GUI) + ++if(Qt6_FOUND) ++ set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17) ++else() ++ set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) ++endif(Qt6_FOUND) ++ + if(MSVC) + # Force to always compile with W4 + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") +@@ -154,7 +164,7 @@ if(MSVC) + endif() + elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + # Update if necessary +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wno-long-long -fexceptions") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-long-long -fexceptions") + endif() + + set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables") +-- +2.43.2 + diff --git a/games-util/lgogdownloader/lgogdownloader-3.12-r1.ebuild b/games-util/lgogdownloader/lgogdownloader-3.12-r1.ebuild new file mode 100644 index 000000000000..e07404cb11a4 --- /dev/null +++ b/games-util/lgogdownloader/lgogdownloader-3.12-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Unofficial GOG.com downloader for Linux" +HOMEPAGE="https://sites.google.com/site/gogdownloader/" +SRC_URI="https://github.com/Sude-/${PN}/releases/download/v${PV}/${P}.tar.gz" +LICENSE="WTFPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gui qt5 qt6" +REQUIRED_USE="gui? ( ^^ ( qt5 qt6 ) )" + +RDEPEND=" + >=app-crypt/rhash-1.3.3-r2:0= + dev-cpp/htmlcxx:0= + dev-libs/boost:=[zlib] + >=dev-libs/jsoncpp-1.7:0= + dev-libs/tinyxml2:0= + >=net-misc/curl-7.55:0=[ssl] + gui? ( + qt5? ( dev-qt/qtwebengine:5[widgets] ) + qt6? ( dev-qt/qtwebengine:6[widgets] ) + ) +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + sys-apps/help2man + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-qt6.patch +) + +src_configure() { + local mycmakeargs=( + -DUSE_QT_GUI=$(usex gui) + ) + use gui && mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=$(usex qt5) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die +} diff --git a/games-util/lgogdownloader/lgogdownloader-3.12.ebuild b/games-util/lgogdownloader/lgogdownloader-3.12.ebuild deleted file mode 100644 index 17e3c906771f..000000000000 --- a/games-util/lgogdownloader/lgogdownloader-3.12.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Unofficial GOG.com downloader for Linux" -HOMEPAGE="https://sites.google.com/site/gogdownloader/" -SRC_URI="https://github.com/Sude-/${PN}/releases/download/v${PV}/${P}.tar.gz" -LICENSE="WTFPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gui" - -RDEPEND=">=app-crypt/rhash-1.3.3-r2:0= - dev-cpp/htmlcxx:0= - dev-libs/boost:=[zlib] - >=dev-libs/jsoncpp-1.7:0= - dev-libs/tinyxml2:0= - >=net-misc/curl-7.55:0=[ssl] - gui? ( dev-qt/qtwebengine:5=[widgets] )" - -DEPEND="${RDEPEND}" - -BDEPEND="sys-apps/help2man - virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( - -DUSE_QT_GUI=$(usex gui) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die -} diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild index de26bf23392b..daf26178322c 100644 --- a/games-util/lgogdownloader/lgogdownloader-9999.ebuild +++ b/games-util/lgogdownloader/lgogdownloader-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,25 +10,38 @@ HOMEPAGE="https://sites.google.com/site/gogdownloader/" EGIT_REPO_URI="https://github.com/Sude-/lgogdownloader.git" LICENSE="WTFPL-2" SLOT="0" -IUSE="gui" +IUSE="gui qt5 qt6" +REQUIRED_USE="gui? ( ^^ ( qt5 qt6 ) )" -RDEPEND=">=app-crypt/rhash-1.3.3-r2:0= +RDEPEND=" + >=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:=[zlib] >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= >=net-misc/curl-7.55:0=[ssl] - gui? ( dev-qt/qtwebengine:5=[widgets] )" + gui? ( + qt5? ( dev-qt/qtwebengine:5[widgets] ) + qt6? ( dev-qt/qtwebengine:6[widgets] ) + ) +" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} +" -BDEPEND="sys-apps/help2man - virtual/pkgconfig" +BDEPEND=" + sys-apps/help2man + virtual/pkgconfig +" src_configure() { local mycmakeargs=( -DUSE_QT_GUI=$(usex gui) ) + use gui && mycmakeargs+=( + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=$(usex qt5) + ) cmake_src_configure } -- cgit v1.2.3