From 2883dfc2f499f97addf15b36aba3c3111f29aa1d Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Sat, 18 Mar 2023 02:24:33 -0400 Subject: [PATCH] LGOGDownloader: update to 3.11 --- .../LGOGDownloader/patches/curl-7.87.patch | 90 ------------------- srcpkgs/LGOGDownloader/template | 6 +- 2 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 srcpkgs/LGOGDownloader/patches/curl-7.87.patch diff --git a/srcpkgs/LGOGDownloader/patches/curl-7.87.patch b/srcpkgs/LGOGDownloader/patches/curl-7.87.patch deleted file mode 100644 index 02f17429663e..000000000000 --- a/srcpkgs/LGOGDownloader/patches/curl-7.87.patch +++ /dev/null @@ -1,90 +0,0 @@ -Force destruction of downloader before curl_global_cleanup -See: https://github.com/Sude-/lgogdownloader/commit/6ce6aeb1dc06f8af1508c5ce6ee71775b8d188b3 -Index: LGOGDownloader-3.9/main.cpp -=================================================================== ---- LGOGDownloader-3.9.orig/main.cpp -+++ LGOGDownloader-3.9/main.cpp -@@ -607,9 +607,10 @@ int main(int argc, char *argv[]) - std::cerr << std::endl; - } - -+ int res = 0; - // Init curl globally - curl_global_init(CURL_GLOBAL_ALL); -- -+ { - Downloader downloader; - - int iLoginTries = 0; -@@ -636,8 +637,8 @@ int main(int argc, char *argv[]) - // Login failed, cleanup - if (!bLoginOK && !bIsLoggedin) - { -- curl_global_cleanup(); -- return 1; -+ res = 1; -+ goto end; - } - - // Make sure that config file and cookie file are only readable/writable by owner -@@ -699,15 +700,14 @@ int main(int argc, char *argv[]) - Util::setFilePermissions(Globals::globalConfig.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write); - if (Globals::globalConfig.bSaveConfig) - { -- curl_global_cleanup(); -- return 0; -+ goto end; - } - } - else - { - std::cerr << "Failed to create config: " << Globals::globalConfig.sConfigFilePath << std::endl; -- curl_global_cleanup(); -- return 1; -+ res = 1; -+ goto end; - } - } - else if (Globals::globalConfig.bResetConfig) -@@ -719,26 +719,23 @@ int main(int argc, char *argv[]) - if (!Globals::globalConfig.bRespectUmask) - Util::setFilePermissions(Globals::globalConfig.sConfigFilePath, boost::filesystem::owner_read | boost::filesystem::owner_write); - -- curl_global_cleanup(); -- return 0; -+ goto end; - } - else - { - std::cerr << "Failed to create config: " << Globals::globalConfig.sConfigFilePath << std::endl; -- curl_global_cleanup(); -- return 1; -+ res = 1; -+ goto end; - } - } - - bool bInitOK = downloader.init(); - if (!bInitOK) - { -- curl_global_cleanup(); -- return 1; -+ res = 1; -+ goto end; - } - -- int res = 0; -- - if (Globals::globalConfig.bShowWishlist) - downloader.showWishlist(); - else if (Globals::globalConfig.bUpdateCache) -@@ -801,7 +798,8 @@ int main(int argc, char *argv[]) - // Orphan check was called at the same time as download. Perform it after download has finished - if (!Globals::globalConfig.sOrphanRegex.empty() && Globals::globalConfig.bDownload) - downloader.checkOrphans(); -- -+ } -+end: - curl_global_cleanup(); - - return res; diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index fd0f265685bc..2284da4a3747 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,7 +1,7 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader -version=3.9 -revision=4 +version=3.11 +revision=1 build_style=cmake configure_args="$(vopt_bool qt USE_QT_GUI)" hostmakedepends="pkg-config" @@ -14,7 +14,7 @@ maintainer="RunningDroid " license="WTFPL" homepage="https://github.com/Sude-/lgogdownloader" distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz" -checksum=4ab9fe89b47bde7744d5100663c7822de74bb161e2790baddede8146056430b1 +checksum=01c9556287d5f49662c2219365b9d306482e8efadc805c3dbb9381d5110df719 build_options="qt" desc_option_qt="Include QT WebEngine to support solving captchas"