diff options
Diffstat (limited to 'source/kde')
| -rw-r--r-- | source/kde/build/ktorrent | 2 | ||||
| -rw-r--r-- | source/kde/patch/ktorrent.patch | 2 | ||||
| -rw-r--r-- | source/kde/patch/ktorrent/geoip.dat | bin | 0 -> 1242574 bytes | |||
| -rw-r--r-- | source/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff | 37 | ||||
| -rw-r--r-- | source/kde/post-install/ktorrent.post-install | 2 |
5 files changed, 42 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 000000000..be8b031f7 --- /dev/null +++ b/source/kde/patch/ktorrent/geoip.dat 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 |