Hello community, here is the log from the commit of package ktorrent for openSUSE:Factory checked in at 2014-02-20 10:12:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktorrent (Old) and /work/SRC/openSUSE:Factory/.ktorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktorrent" Changes: -------- --- /work/SRC/openSUSE:Factory/ktorrent/ktorrent.changes 2013-01-22 22:21:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktorrent.new/ktorrent.changes 2014-02-20 10:12:23.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 19 10:23:39 UTC 2014 - [email protected] + +- Added upstream bugfix patch - ipfilter_bugfix.diff: + Fix gzip not working in ipfilter plugin due to wrong mimetype, + kde#315239 + +------------------------------------------------------------------- New: ---- ipfilter_bugfix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktorrent.spec ++++++ --- /var/tmp/diff_new_pack.7FvjG2/_old 2014-02-20 10:12:24.000000000 +0100 +++ /var/tmp/diff_new_pack.7FvjG2/_new 2014-02-20 10:12:24.000000000 +0100 @@ -34,6 +34,8 @@ Patch1: suse-dht-warning.diff # PATCH-FIX-OPENSUSE initial-preference.diff [email protected] -- InitialPreference to set it as the default torrent downloader Patch2: initial-preference.diff +# PATCH-FIX-UPSTREAM ipfilter_bugfix.diff -- Fix gzip not working in ipfilter plugin due to wrong mimetype, kde#315239 +Patch3: ipfilter_bugfix.diff BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel @@ -73,6 +75,7 @@ %endif %patch2 tar jxf %{SOURCE1} +%patch3 %build %cmake_kde4 -d build ++++++ ipfilter_bugfix.diff ++++++ commit 3dfcbeb9765e99f9b99951134b17268eb7a617d2 Author: Joris Guisson <[email protected]> Date: Thu Aug 1 13:19:29 2013 +0200 Backport ipfilter extraction fixes from master branch to 4.3 branch BUG: 315239 diff --git a/plugins/ipfilter/downloadandconvertjob.cpp b/plugins/ipfilter/downloadandconvertjob.cpp index d3092ac..4080c2a 100644 --- plugins/ipfilter/downloadandconvertjob.cpp +++ plugins/ipfilter/downloadandconvertjob.cpp @@ -114,12 +114,13 @@ namespace kt //now determine if it's ZIP or TXT file KMimeType::Ptr ptr = KMimeType::findByPath(temp); + Out(SYS_IPF|LOG_NOTICE) << "Mimetype: " << ptr->name() << endl; if (ptr->name() == "application/zip") { active_job = KIO::file_move(temp,QString(kt::DataDir() + QLatin1String("level1.zip")),-1,KIO::HideProgressInfo|KIO::Overwrite); connect(active_job,SIGNAL(result(KJob*)),this,SLOT(extract(KJob*))); } - else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip") + else if (ptr->name() == "application/x-gzip" || ptr->name() == "application/x-bzip" || ptr->name() == "application/gzip") { active_job = new bt::DecompressFileJob(temp,QString(kt::DataDir() + "level1.txt")); connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); @@ -174,23 +175,10 @@ namespace kt } QString destination = kt::DataDir() + "level1.txt"; - if (zip->directory()->entries().contains("splist.txt")) + QStringList entries = zip->directory()->entries(); + if (entries.count() >= 1) { - active_job = new bt::ExtractFileJob(zip,"splist.txt",destination); - connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); - unzip = true; - active_job->start(); - } - else if (zip->directory()->entries().contains("level1.txt")) - { - active_job = new bt::ExtractFileJob(zip,"level1.txt",destination); - connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); - unzip = true; - active_job->start(); - } - else if (zip->directory()->entries().contains("ipfilter.dat")) - { - active_job = new bt::ExtractFileJob(zip,"ipfilter.dat",destination); + active_job = new bt::ExtractFileJob(zip,entries.front(),destination); connect(active_job,SIGNAL(result(KJob*)),this,SLOT(convert(KJob*))); unzip = true; active_job->start(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
