diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-08 22:20:37 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-08 22:20:37 -0300 |
commit | fccf9769e2c26f577f6214ed9d0dbb30cb8c51bd (patch) | |
tree | cc5312eeed95e18d8e2c6009c568f3d32501bc01 /community/goldendict | |
parent | 69962c022fb4ed68b9163e60183fff714308e4e3 (diff) | |
parent | 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/abe/PKGBUILD
community/account-plugins/PKGBUILD
community/adesklets/PKGBUILD
community/aircrack-ng/PKGBUILD
community/audit/PKGBUILD
community/bchunk/PKGBUILD
community/bibutils/PKGBUILD
community/cantata/PKGBUILD
community/cdck/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/clusterssh/PKGBUILD
community/consonance/PKGBUILD
community/credentials-preferences/PKGBUILD
community/dee/PKGBUILD
community/dosbox/PKGBUILD
community/drbd/PKGBUILD
community/dvdisaster/PKGBUILD
community/ekg/PKGBUILD
community/ekg2/PKGBUILD
community/emelfm2/PKGBUILD
community/erlang/PKGBUILD
community/ettercap/PKGBUILD
community/evilwm/PKGBUILD
community/fatrat/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/fcrackzip/PKGBUILD
community/ffmpegsource/PKGBUILD
community/fssos-nsvs/PKGBUILD
community/geda-gaf/PKGBUILD
community/gnome-applets/PKGBUILD
community/gnome-panel/PKGBUILD
community/gnustep-make/PKGBUILD
community/gwibber/PKGBUILD
community/html2text/PKGBUILD
community/intellij-idea-libs/PKGBUILD
community/libcgns2/PKGBUILD
community/libmatio/PKGBUILD
community/librcc/PKGBUILD
community/libsignon-glib/PKGBUILD
community/linux-tools/PKGBUILD
community/minitube/PKGBUILD
community/mpdscribble/PKGBUILD
community/mplayer2/PKGBUILD
community/musepack-tools/PKGBUILD
community/nginx/PKGBUILD
community/pam_pwcheck/PKGBUILD
community/portaudio/PKGBUILD
community/portaudio_cpp/PKGBUILD
community/prelink/PKGBUILD
community/projectm/PKGBUILD
community/prosody/PKGBUILD
community/python-basemap/PKGBUILD
community/qgit/PKGBUILD
community/raptor1/PKGBUILD
community/sensors-applet/PKGBUILD
community/signon-keyring-extension/PKGBUILD
community/signon-plugin-oauth2/PKGBUILD
community/signon-ui/PKGBUILD
community/sshguard/PKGBUILD
community/tea/PKGBUILD
community/tint2/PKGBUILD
community/tremulous/PKGBUILD
community/vobcopy/PKGBUILD
community/windowlab/PKGBUILD
community/xdelta/PKGBUILD
community/xmms2/PKGBUILD
community/xosd/PKGBUILD
core/gdbm/PKGBUILD
core/heirloom-mailx/PKGBUILD
core/libffi/PKGBUILD
core/procps-ng/PKGBUILD
core/systemd/PKGBUILD
core/tar/PKGBUILD
cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
extra/arj/PKGBUILD
extra/audacity/PKGBUILD
extra/cdparanoia/PKGBUILD
extra/elfutils/PKGBUILD
extra/fltk/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/gstreamer/PKGBUILD
extra/gtk2/PKGBUILD
extra/gvfs/PKGBUILD
extra/imagemagick/PKGBUILD
extra/indent/PKGBUILD
extra/kdepim/PKGBUILD
extra/lcms/PKGBUILD
extra/lesstif/PKGBUILD
extra/libchewing/PKGBUILD
extra/libdrm/PKGBUILD
extra/libmodplug/PKGBUILD
extra/libnotify/PKGBUILD
extra/libsm/PKGBUILD
extra/libxmu/PKGBUILD
extra/libxpm/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/neon/PKGBUILD
extra/ocaml/PKGBUILD
extra/phonon-vlc/PKGBUILD
extra/php-xcache/PKGBUILD
extra/polkit/PKGBUILD
extra/pycups/PKGBUILD
extra/python-cairo/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
extra/sqlite/PKGBUILD
extra/talloc/PKGBUILD
extra/thunar-archive-plugin/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/totem/PKGBUILD
extra/vinagre/PKGBUILD
extra/vino/PKGBUILD
extra/vlc/PKGBUILD
extra/wget/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-twm/PKGBUILD
extra/xorg-xclipboard/PKGBUILD
extra/xorg-xclock/PKGBUILD
extra/xorg-xkill/PKGBUILD
extra/xorg-xlsclients/PKGBUILD
extra/xorg-xman/PKGBUILD
extra/xorg-xrdb/PKGBUILD
extra/xpdf/PKGBUILD
extra/xvidcore/PKGBUILD
extra/yelp/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/mc-libre/PKGBUILD
libre/python2-reportlab-libre/PKGBUILD
Diffstat (limited to 'community/goldendict')
-rw-r--r-- | community/goldendict/PKGBUILD | 18 | ||||
-rw-r--r-- | community/goldendict/fix-wikipedia-images.patch | 26 |
2 files changed, 38 insertions, 6 deletions
diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index a615d0664..75788ba61 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -1,30 +1,36 @@ -# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $ +# $Id: PKGBUILD 96817 2013-09-05 20:34:32Z bgyorgy $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: m0rph <m0rph.mailbox@gmail.com> pkgname=goldendict pkgver=1.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64' 'mips64el') 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 diff --git a/community/goldendict/fix-wikipedia-images.patch b/community/goldendict/fix-wikipedia-images.patch new file mode 100644 index 000000000..ea28bcd91 --- /dev/null +++ b/community/goldendict/fix-wikipedia-images.patch @@ -0,0 +1,26 @@ +From 8c056589e989781c6ed5aac7491c802414489ae9 Mon Sep 17 00:00:00 2001 +From: Abs62 <ottomann@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 + |