gentoo auto-resync : 23:05:2024 - 00:06:39

3 files changed, 2 insertions, 80 deletions

diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
index 57b6dc3ffede..79fca5956404 100644
--- a/games-util/lgogdownloader/Manifest
+++ b/games-util/lgogdownloader/Manifest
@@ -1,5 +1,4 @@
-AUX lgogdownloader-qt6.patch 2398 BLAKE2B 1e75fb6913b4bd50863f5858f2ec78f7bc965bcb824340a274f0157a7829e76a8ae4e8eb7588d9af120bb5c640e122d89b8ecf78305cdfaa1ca935ca31d1bfb5 SHA512 eec9cdf6a5bec1c6b9fb99786b1fa502b7650d55038f8a0526d5ece8bb3c52c8da84e67997a7e3f5f14ec322e9c9e0a38883d2cf18c86331cfb427f0b8161672
-DIST lgogdownloader-3.12.tar.gz 96896 BLAKE2B 27e967c6be6919eda7a0adade72221d7b90e5b328e9a10201afa32046a384488f3c312ed94ff86ce376e7f1b9e99baabc3752a1f9536fdacf4fcc987132253f6 SHA512 04a753f772434cdbc634efd69ccf4007376c789d68b9204947045bafc0f953d8bbfad0104b6ffaad257bd3d1eabcae73e7ee56b65611799ceff6454418dc86b8
-EBUILD lgogdownloader-3.12-r1.ebuild 1064 BLAKE2B 58265e4e14256f03d6c50fe4d93fb0bebbd217282e5f7d1ade04bcfaaf212afb6ceff6501fdf17ed9b106242e1183e469c2388236dc7502f42486d5466c8917b SHA512 82c18bcfae4f4d08342d2e46d13f05d03053c01076ebc93048b335794bb1a13402020e95652f55c66da1cf2bc39fc75402e81d2bece40f179cab43dc9637ac7d
+DIST lgogdownloader-3.13.tar.gz 98904 BLAKE2B 11e09a93c34d626d3ed82e99b5b0e855f46d365ca655571955f57acd45d3ecb7e8b6ad666c1f42574291a3499db1428e432c8074c61828ae4c4b13cf1e23f8f2 SHA512 0a936543eec350c5d257c43fa99552428365c1ddba8f0d51d7add27a4fb7a8a2ac823545ff211b9bab4fc64307dd200c9fdff2d412903094a0d2ab46eb20e767
+EBUILD lgogdownloader-3.13.ebuild 1020 BLAKE2B 1c10dd9b190fa40fe5ea8a58b3f4b6cf815559c2cd9c9fd94f0d1bc29ff83a0c8d3bb5aa841e08b7f686614b92f77dccddcd989d079dbad3b52abcfeead8b2f4 SHA512 b7fa80501c9bb76809a6fceabf0e0996bfd1284a43d3622911de3bcdd61173b0d4edf4de04ef6bf4e95bf4c2586a5d8a4a6e497f5c9236c7edae1fd218f11ac0
 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
deleted file mode 100644
index 5d1652bcbdd7..000000000000
--- a/games-util/lgogdownloader/files/lgogdownloader-qt6.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 3f223684cbe1367c68b2b68301eeaaf644a4c0be Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-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.13.ebuild
index e07404cb11a4..18c12cef2fca 100644
--- a/games-util/lgogdownloader/lgogdownloader-3.12-r1.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-3.13.ebuild
@@ -36,10 +36,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-qt6.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_QT_GUI=$(usex gui)