Package: amarok
Version: 2.8.0-8
Severity: normal
Tags: patch

Amaroks wikipedia applet stopped showing any information. According to the
upstream bug report (https://bugs.kde.org/show_bug.cgi?id=349313) this is
caused by a change in wikipedias api, which requires now a ssl connection. This
means, that all amarok versions currently available on debian are affected

The attached patch fixes the issue for the ubuntu packages (original bug report
https://bugs.launchpad.net/ubuntu/+source/amarok/+bug/1532180). Since they are
using basically the unmodified package from debian, the patch probably works
for debian too.

Its a backport of the following upstream commits:
http://commits.kde.org/amarok/8c15258b28870b6d9990b24f87ce913e2049bac8
http://commits.kde.org/amarok/333315d68755dc5dcf549386a4d50d8a15ebfbea



-- System Information:
Debian Release: 9.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.9.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages amarok depends on:
ii  amarok-common             2.8.0-8
ii  amarok-utils              2.8.0-8
ii  kde-runtime               4:16.08.3-1
ii  libavcodec57              7:3.2.2-1
ii  libavformat57             7:3.2.2-1
ii  libavutil55               7:3.2.2-1
ii  libc6                     2.24-9
ii  libcurl3-gnutls           7.52.1-1
ii  libgcrypt20               1.7.5-3
ii  libgdk-pixbuf2.0-0        2.36.4-1
ii  libgl1-mesa-glx [libgl1]  13.0.3-1
ii  libglib2.0-0              2.50.2-2
ii  libgpod4-nogtk            0.8.3-8
ii  libkcmutils4              4:4.14.26-1
ii  libkdecore5               4:4.14.26-1
ii  libkdeui5                 4:4.14.26-1
ii  libkdewebkit5             4:4.14.26-1
ii  libkdnssd4                4:4.14.26-1
ii  libkfile4                 4:4.14.26-1
ii  libkio5                   4:4.14.26-1
ii  libknewstuff3-4           4:4.14.26-1
ii  liblastfm1                1.0.9-1
ii  libloudmouth1-0           1.5.3-2
ii  libmariadbclient18        10.1.20-3
ii  libmariadbd18             10.1.20-3
ii  libmtp9                   1.1.12-1
ii  libmygpo-qt1              1.0.9-2
ii  libofa0                   0.9.3-15
ii  libphonon4                4:4.9.0-4
ii  libplasma3                4:4.14.26-1
ii  libqjson0                 0.8.1-3
ii  libqt4-dbus               4:4.8.7+dfsg-11
ii  libqt4-network            4:4.8.7+dfsg-11
ii  libqt4-opengl             4:4.8.7+dfsg-11
ii  libqt4-script             4:4.8.7+dfsg-11
ii  libqt4-sql                4:4.8.7+dfsg-11
ii  libqt4-svg                4:4.8.7+dfsg-11
ii  libqt4-xml                4:4.8.7+dfsg-11
ii  libqtcore4                4:4.8.7+dfsg-11
ii  libqtgui4                 4:4.8.7+dfsg-11
ii  libqtscript4-core         0.2.0-1
ii  libqtscript4-gui          0.2.0-1
ii  libqtscript4-network      0.2.0-1
ii  libqtscript4-sql          0.2.0-1
ii  libqtscript4-uitools      0.2.0-1
ii  libqtscript4-xml          0.2.0-1
ii  libqtwebkit4              2.3.4.dfsg-9.1
ii  libsolid4                 4:4.14.26-1
ii  libstdc++6                6.3.0-3
ii  libthreadweaver4          4:4.14.26-1
ii  libx11-6                  2:1.6.4-2
ii  libxml2                   2.9.4+dfsg1-2.1
ii  phonon                    4:4.9.0-4

Versions of packages amarok recommends:
ii  clamz        0.5-2+b1
ii  kio-audiocd  4:16.08.3-1

Versions of packages amarok suggests:
pn  amarok-doc         <none>
ii  libqt4-sql-mysql   4:4.8.7+dfsg-11
pn  libqt4-sql-psql    <none>
pn  libqt4-sql-sqlite  <none>
pn  moodbar            <none>

Versions of packages amarok-common depends on:
pn  perl:any  <none>

amarok-common recommends no packages.

Versions of packages amarok is related to:
ii  phonon-backend-gstreamer [phonon-backend]  4:4.9.0-1

-- no debconf information
diff -Naurp amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet.cpp 
amarok-2.8.0_fixed/src/context/applets/wikipedia/WikipediaApplet.cpp
--- amarok-2.8.0/src/context/applets/wikipedia/WikipediaApplet.cpp      
2013-08-14 22:22:52.000000000 +0200
+++ amarok-2.8.0_fixed/src/context/applets/wikipedia/WikipediaApplet.cpp        
2016-06-21 10:33:25.587944000 +0200
@@ -63,7 +63,7 @@ WikipediaAppletPrivate::parseWikiLangXml
             {
                 const QString &prefix = a.value("prefix").toString();
                 const QString &language = a.value("language").toString();
-                const QString &display = QString( "[%1] %2" ).arg( prefix 
).arg( language );
+                const QString &display = QString( "[%1] %2" ).arg( prefix, 
language );
                 QListWidgetItem *item = new QListWidgetItem( display, 0 );
                 // The urlPrefix is the lang code infront of the wikipedia host
                 // url. It is mostly the same as the "prefix" attribute but in
@@ -245,7 +245,7 @@ WikipediaAppletPrivate::_loadSettings()
         QListWidgetItem *item = listWidget->item( i );
         const QString &prefix = item->data( PrefixRole ).toString();
         const QString &urlPrefix = item->data( UrlPrefixRole ).toString();
-        QString concat = QString("%1:%2").arg( prefix ).arg( urlPrefix );
+        QString concat = QString("%1:%2").arg( prefix, urlPrefix );
         list << (prefix == urlPrefix ? prefix : concat);
     }
     langList = list;
@@ -411,7 +411,7 @@ WikipediaAppletPrivate::_getLangMap()
     languageSettingsUi.progressBar->setValue( 0 );
 
     KUrl url;
-    url.setScheme( "http" );
+    url.setScheme( "https" );
     url.setHost( "en.wikipedia.org" );
     url.setPath( "/w/api.php" );
     url.addQueryItem( "action", "query" );
diff -Naurp 
amarok-2.8.0/src/context/applets/wikipedia/wikipediaGeneralSettings.ui 
amarok-2.8.0_fixed/src/context/applets/wikipedia/wikipediaGeneralSettings.ui
--- amarok-2.8.0/src/context/applets/wikipedia/wikipediaGeneralSettings.ui      
2013-08-14 22:22:52.000000000 +0200
+++ 
amarok-2.8.0_fixed/src/context/applets/wikipedia/wikipediaGeneralSettings.ui    
    2016-06-21 10:34:30.319945000 +0200
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<?xml version="1.0" encoding="UTF-8"?><ui version="4.0">
  <class>wikipediaGeneralSettings</class>
  <widget class="QWidget" name="wikipediaGeneralSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>244</width>
-    <height>23</height>
+    <width>253</width>
+    <height>62</height>
    </rect>
   </property>
   <property name="sizePolicy">
diff -Naurp amarok-2.8.0/src/context/engines/wikipedia/WikipediaEngine.cpp 
amarok-2.8.0_fixed/src/context/engines/wikipedia/WikipediaEngine.cpp
--- amarok-2.8.0/src/context/engines/wikipedia/WikipediaEngine.cpp      
2013-08-14 22:22:52.000000000 +0200
+++ amarok-2.8.0_fixed/src/context/engines/wikipedia/WikipediaEngine.cpp        
2016-06-21 12:18:55.137534000 +0200
@@ -532,7 +532,7 @@ WikipediaEnginePrivate::fetchWikiUrl( co
     Q_Q( WikipediaEngine );
     KUrl pageUrl;
     QString host( ".wikipedia.org" );
-    pageUrl.setScheme( QLatin1String("http") );
+    pageUrl.setScheme( QLatin1String( "https" ) );
 
     if( useMobileVersion )
     {
@@ -570,7 +570,7 @@ WikipediaEnginePrivate::fetchLangLinks(
 {
     Q_Q( WikipediaEngine );
     KUrl url;
-    url.setScheme( QLatin1String("http") );
+    url.setScheme( QLatin1String( "https" ) );
     url.setHost( hostLang + QLatin1String(".wikipedia.org") );
     url.setPath( QLatin1String("/w/api.php") );
     url.addQueryItem( QLatin1String("action"), QLatin1String("query") );
@@ -592,7 +592,7 @@ WikipediaEnginePrivate::fetchListing( co
 {
     Q_Q( WikipediaEngine );
     KUrl url;
-    url.setScheme( QLatin1String("http") );
+    url.setScheme( QLatin1String( "https" ) );
     url.setHost( hostLang + QLatin1String(".wikipedia.org") );
     url.setPath( QLatin1String("/w/api.php") );
     url.addQueryItem( QLatin1String("action"), QLatin1String("query") );
_______________________________________________
pkg-kde-extras mailing list
pkg-kde-extras@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-kde-extras

Reply via email to