[arch-commits] Commit in goldendict/trunk (PKGBUILD fix-wikipedia-images.patch)

[Balló György]

    Date: Thursday, September 5, 2013 @ 22:34:21
  Author: bgyorgy
Revision: 96816

upgpkg: goldendict 1.0.1-7

Fix wikipedia images (FS#27517)

Added:
  goldendict/trunk/fix-wikipedia-images.patch
Modified:
  goldendict/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   16 +++++++++++-----
 fix-wikipedia-images.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-05 20:15:59 UTC (rev 96815)
+++ PKGBUILD	2013-09-05 20:34:21 UTC (rev 96816)
@@ -4,28 +4,34 @@
 
 pkgname=goldendict
 pkgver=1.0.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Feature-rich dictionary lookup program"
 arch=('i686' 'x86_64')
 url="http://goldendict.berlios.de/"
 license=('GPL3')
 depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
-makedepends=('patch')
 provides=('stardict')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
         $pkgname-paths.diff
-        gcc47.patch)
+        gcc47.patch
+        fix-wikipedia-images.patch)
 sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
             '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589'
-            '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e')
+            '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e'
+            'ab669d96db0cb750d4c865b123474d655b6caca9242457c044a60f1fee5b7dc7')
 
-build(){
+prepare(){
   cd ${srcdir}
 
   patch -Np0 -i ${srcdir}/$pkgname-paths.diff
   patch -p1 -i ${srcdir}/gcc47.patch
+  patch -Np1 -i ${srcdir}/fix-wikipedia-images.patch
+}
 
+build(){
+  cd ${srcdir}
+
   qmake-qt4
   make
 }

Added: fix-wikipedia-images.patch
===================================================================
--- fix-wikipedia-images.patch	                        (rev 0)
+++ fix-wikipedia-images.patch	2013-09-05 20:34:21 UTC (rev 96816)
@@ -0,0 +1,26 @@
+From 8c056589e989781c6ed5aac7491c802414489ae9 Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann at yandex.ru>
+Date: Sat, 22 Oct 2011 15:52:52 +0400
+Subject: [PATCH] Fix Wikipedia images loading
+
+---
+ mediawiki.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mediawiki.cc b/mediawiki.cc
+index e67fdb3..9fff3dc 100644
+--- a/mediawiki.cc
++++ b/mediawiki.cc
+@@ -293,6 +293,9 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
+             // Replace the href="/foo/bar/Baz" to just href="Baz".
+             articleString.replace( QRegExp( "<a\\shref=\"/([\\w\\.]*/)*" ), "<a href=\"" );
+   
++            // Add "http:" to image source urls
++            articleString.replace( " src=\"//", " src=\"http://" );
++
+             // In those strings, change any underscores to spaces
+             for( ; ; )
+             {
+-- 
+1.8.4
+