mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 22:53:51 +02:00
LGOGDownloader: update to 3.11
This commit is contained in:
parent
7de3327732
commit
1ccb18712e
2 changed files with 3 additions and 93 deletions
|
@ -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;
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'LGOGDownloader'
|
# Template file for 'LGOGDownloader'
|
||||||
pkgname=LGOGDownloader
|
pkgname=LGOGDownloader
|
||||||
version=3.9
|
version=3.11
|
||||||
revision=5
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="$(vopt_bool qt USE_QT_GUI)"
|
configure_args="$(vopt_bool qt USE_QT_GUI)"
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
|
@ -14,7 +14,7 @@ maintainer="RunningDroid <runningdroid@zoho.com>"
|
||||||
license="WTFPL"
|
license="WTFPL"
|
||||||
homepage="https://github.com/Sude-/lgogdownloader"
|
homepage="https://github.com/Sude-/lgogdownloader"
|
||||||
distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz"
|
distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz"
|
||||||
checksum=4ab9fe89b47bde7744d5100663c7822de74bb161e2790baddede8146056430b1
|
checksum=01c9556287d5f49662c2219365b9d306482e8efadc805c3dbb9381d5110df719
|
||||||
|
|
||||||
build_options="qt"
|
build_options="qt"
|
||||||
desc_option_qt="Include QT WebEngine to support solving captchas"
|
desc_option_qt="Include QT WebEngine to support solving captchas"
|
||||||
|
|
Loading…
Add table
Reference in a new issue