From 64c7dee8643c3a5a4fa6619c494e97ba435ade3f Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 17 Mar 2019 20:40:15 +0000 Subject: Sun Mar 17 20:40:15 UTC 2019 Saint Patrick was a gentleman Who through strategy and stealth Drove all the snakes from Ireland Here's toasting to his health - But not too many toastings Lest you lose yourself, and then, Forget the good Saint Patrick And see all those snakes again. a/eudev-3.2.7-x86_64-3.txz: Rebuilt. Added tqmx86_wdt to watchdog.conf. Thanks to Robby Workman. d/vala-0.44.1-x86_64-1.txz: Upgraded. kde/ktorrent-4.3.1-x86_64-4.txz: Rebuilt. Embed a copy of the GeoIP database since the download link no longer works. l/glibmm-2.58.1-x86_64-1.txz: Upgraded. l/mozilla-nss-3.43-x86_64-1.txz: Upgraded. x/imake-1.0.8-x86_64-1.txz: Upgraded. x/libXdmcp-1.1.3-x86_64-1.txz: Upgraded. x/libXext-1.3.4-x86_64-1.txz: Upgraded. x/libXft-2.3.3-x86_64-1.txz: Upgraded. x/libXmu-1.1.3-x86_64-1.txz: Upgraded. x/libXrandr-1.5.2-x86_64-1.txz: Upgraded. x/libXvMC-1.0.11-x86_64-1.txz: Upgraded. x/libXxf86dga-1.1.5-x86_64-1.txz: Upgraded. x/libxkbfile-1.1.0-x86_64-1.txz: Upgraded. x/makedepend-1.0.6-x86_64-1.txz: Upgraded. x/x11perf-1.6.1-x86_64-1.txz: Upgraded. x/xf86-video-intel-20190301_6afed33b-x86_64-1.txz: Upgraded. x/xf86-video-savage-20190128_8579718-x86_64-1.txz: Upgraded. x/xf86-video-sis-20181217_22d3c79-x86_64-1.txz: Upgraded. x/xtrans-1.4.0-noarch-1.txz: Upgraded. --- source/kde/build/ktorrent | 2 +- source/kde/patch/ktorrent.patch | 2 ++ source/kde/patch/ktorrent/geoip.dat | Bin 0 -> 1242574 bytes .../ktorrent.use.package.geoip.database.diff | 37 +++++++++++++++++++++ source/kde/post-install/ktorrent.post-install | 2 ++ 5 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 source/kde/patch/ktorrent.patch create mode 100644 source/kde/patch/ktorrent/geoip.dat create mode 100644 source/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff create mode 100644 source/kde/post-install/ktorrent.post-install (limited to 'source/kde') diff --git a/source/kde/build/ktorrent b/source/kde/build/ktorrent index 00750edc0..b8626c4cf 100644 --- a/source/kde/build/ktorrent +++ b/source/kde/build/ktorrent @@ -1 +1 @@ -3 +4 diff --git a/source/kde/patch/ktorrent.patch b/source/kde/patch/ktorrent.patch new file mode 100644 index 000000000..0f75eabc0 --- /dev/null +++ b/source/kde/patch/ktorrent.patch @@ -0,0 +1,2 @@ +zcat $CWD/patch/ktorrent/ktorrent.use.package.geoip.database.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/source/kde/patch/ktorrent/geoip.dat b/source/kde/patch/ktorrent/geoip.dat new file mode 100644 index 000000000..be8b031f7 Binary files /dev/null and b/source/kde/patch/ktorrent/geoip.dat differ diff --git a/source/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff b/source/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff new file mode 100644 index 000000000..0a9fd8042 --- /dev/null +++ b/source/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff @@ -0,0 +1,37 @@ +--- ./plugins/infowidget/geoipmanager.cpp.orig 2013-01-14 11:12:24.000000000 -0600 ++++ ./plugins/infowidget/geoipmanager.cpp 2019-03-17 15:14:38.020018110 -0500 +@@ -39,7 +39,7 @@ + #ifdef USE_SYSTEM_GEOIP + geo_ip = GeoIP_open_type(GEOIP_COUNTRY_EDITION, GEOIP_STANDARD); + #else +- geoip_data_file = KStandardDirs::locate("data", "ktorrent/geoip.dat"); ++ geoip_data_file = "/usr/share/apps/ktorrent/GeoIP/geoip.dat"; + if (geoip_data_file.isNull()) + geoip_data_file = KStandardDirs::locate("data", "ktorrent/GeoIP.dat"); + +@@ -54,12 +54,6 @@ + { + QFileInfo fi(geoip_data_file); + QDateTime now = QDateTime::currentDateTime(); +- if (fi.lastModified().daysTo(now) >= 30) +- { +- // if the last time the geoip file was modified, was more then +- // 30 days ago, redownload it +- downloadDataBase(); +- } + } + } + #endif +@@ -104,12 +98,6 @@ + + void GeoIPManager::downloadDataBase() + { +-#ifndef USE_SYSTEM_GEOIP +- Out(SYS_INW|LOG_NOTICE) << "Downloading GeoIP database: " << geoip_url.prettyUrl() << endl; +- download_destination = kt::DataDir() + geoip_url.fileName(); +- KIO::CopyJob* job = KIO::copy(geoip_url,download_destination,KIO::Overwrite|KIO::HideProgressInfo); +- connect(job,SIGNAL(result(KJob*)),this,SLOT(databaseDownloadFinished(KJob*))); +-#endif + } + + void GeoIPManager::databaseDownloadFinished(KJob* job) diff --git a/source/kde/post-install/ktorrent.post-install b/source/kde/post-install/ktorrent.post-install new file mode 100644 index 000000000..a1e191624 --- /dev/null +++ b/source/kde/post-install/ktorrent.post-install @@ -0,0 +1,2 @@ +mkdir $PKG/usr/share/apps/ktorrent/GeoIP +zcat $CWD/patch/ktorrent/geoip.dat.gz > $PKG/usr/share/apps/ktorrent/GeoIP/geoip.dat -- cgit v1.2.3