[arch-commits] Commit in goldendict/repos (12 files)
Florian Pritz
bluewind at archlinux.org
Sun Dec 6 18:00:31 UTC 2015
Date: Sunday, December 6, 2015 @ 19:00:30
Author: bluewind
Revision: 149027
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
goldendict/repos/community-staging-i686/
goldendict/repos/community-staging-i686/PKGBUILD
(from rev 149026, goldendict/trunk/PKGBUILD)
goldendict/repos/community-staging-i686/fix-wikipedia-images.patch
(from rev 149026, goldendict/trunk/fix-wikipedia-images.patch)
goldendict/repos/community-staging-i686/gcc47.patch
(from rev 149026, goldendict/trunk/gcc47.patch)
goldendict/repos/community-staging-i686/goldendict-paths.patch
(from rev 149026, goldendict/trunk/goldendict-paths.patch)
goldendict/repos/community-staging-i686/goldendict.changelog
(from rev 149026, goldendict/trunk/goldendict.changelog)
goldendict/repos/community-staging-x86_64/
goldendict/repos/community-staging-x86_64/PKGBUILD
(from rev 149026, goldendict/trunk/PKGBUILD)
goldendict/repos/community-staging-x86_64/fix-wikipedia-images.patch
(from rev 149026, goldendict/trunk/fix-wikipedia-images.patch)
goldendict/repos/community-staging-x86_64/gcc47.patch
(from rev 149026, goldendict/trunk/gcc47.patch)
goldendict/repos/community-staging-x86_64/goldendict-paths.patch
(from rev 149026, goldendict/trunk/goldendict-paths.patch)
goldendict/repos/community-staging-x86_64/goldendict.changelog
(from rev 149026, goldendict/trunk/goldendict.changelog)
-----------------------------------------------------+
community-staging-i686/PKGBUILD | 50 ++++++++++++++++++
community-staging-i686/fix-wikipedia-images.patch | 26 +++++++++
community-staging-i686/gcc47.patch | 23 ++++++++
community-staging-i686/goldendict-paths.patch | 12 ++++
community-staging-i686/goldendict.changelog | 14 +++++
community-staging-x86_64/PKGBUILD | 50 ++++++++++++++++++
community-staging-x86_64/fix-wikipedia-images.patch | 26 +++++++++
community-staging-x86_64/gcc47.patch | 23 ++++++++
community-staging-x86_64/goldendict-paths.patch | 12 ++++
community-staging-x86_64/goldendict.changelog | 14 +++++
10 files changed, 250 insertions(+)
Copied: goldendict/repos/community-staging-i686/PKGBUILD (from rev 149026, goldendict/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-06 18:00:30 UTC (rev 149027)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: m0rph <m0rph.mailbox at gmail.com>
+
+pkgname=goldendict
+pkgver=1.5.0RC
+pkgrel=2
+pkgdesc="Feature-rich dictionary lookup program"
+arch=('i686' 'x86_64')
+url="http://goldendict.org"
+license=('GPL3')
+depends=('hunspell' 'libxtst' 'libzip' 'libao' 'qtwebkit' 'phonon-qt4' 'ffmpeg')
+provides=('stardict')
+changelog=$pkgname.changelog
+source=($pkgname-$pkgver.tar.gz::https://github.com/goldendict/goldendict/archive/1.5.0-RC.tar.gz
+ $pkgname-paths.patch
+ gcc47.patch
+ fix-wikipedia-images.patch)
+sha256sums=('5705d5197509596221faf16a806965c799de7371a41fe2d2c4dc00b737ffe22e'
+ '5281dc2f57a93e2aa416de35bd702926bd90b4746d62f81d8dc434f6a689d55e'
+ '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e'
+ 'ab669d96db0cb750d4c865b123474d655b6caca9242457c044a60f1fee5b7dc7')
+
+prepare(){
+ cd "${srcdir}"/${pkgname}-1.5.0-RC
+
+ patch -Np0 -i "${srcdir}"/$pkgname-paths.patch
+# patch -p1 -i "${srcdir}"/gcc47.patch
+# patch -Np1 -i "${srcdir}"/fix-wikipedia-images.patch
+}
+
+build(){
+ cd "${srcdir}"/${pkgname}-1.5.0-RC
+
+ qmake-qt4 PREFIX="/usr"
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-1.5.0-RC
+
+ make INSTALL_ROOT="${pkgdir}" install
+
+# languages
+ install -d "${pkgdir}"/usr/share/$pkgname/locale
+ install -m644 locale/*.qm -t "${pkgdir}"/usr/share/$pkgname/locale
+
+# removing unneeded
+ rm -rf "${pkgdir}"/usr/share/app-install
+}
Copied: goldendict/repos/community-staging-i686/fix-wikipedia-images.patch (from rev 149026, goldendict/trunk/fix-wikipedia-images.patch)
===================================================================
--- community-staging-i686/fix-wikipedia-images.patch (rev 0)
+++ community-staging-i686/fix-wikipedia-images.patch 2015-12-06 18:00:30 UTC (rev 149027)
@@ -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
+
Copied: goldendict/repos/community-staging-i686/gcc47.patch (from rev 149026, goldendict/trunk/gcc47.patch)
===================================================================
--- community-staging-i686/gcc47.patch (rev 0)
+++ community-staging-i686/gcc47.patch 2015-12-06 18:00:30 UTC (rev 149027)
@@ -0,0 +1,23 @@
+diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc
+--- goldendict-1.0.1-src.orig/processwrapper.cc 2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/processwrapper.cc 2012-08-04 20:51:45.835055609 +0530
+@@ -94,6 +94,8 @@
+
+ #else
+
++#include <unistd.h>
++
+ unsigned int ProcessWrapper::currentProcessId()
+ {
+ return getpid();
+diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp
+--- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp 2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp 2012-08-04 20:48:47.761593825 +0530
+@@ -50,6 +50,7 @@
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+
+ namespace QtLP_Private {
Copied: goldendict/repos/community-staging-i686/goldendict-paths.patch (from rev 149026, goldendict/trunk/goldendict-paths.patch)
===================================================================
--- community-staging-i686/goldendict-paths.patch (rev 0)
+++ community-staging-i686/goldendict-paths.patch 2015-12-06 18:00:30 UTC (rev 149027)
@@ -0,0 +1,12 @@
+--- goldendict.pro.orig 2013-06-06 15:39:06.000000000 +0200
++++ goldendict.pro 2015-02-02 12:10:35.393194928 +0100
+@@ -84,6 +84,6 @@
+ PREFIX = $$(PREFIX)
+- isEmpty( PREFIX ):PREFIX = /usr/local
+- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
++ isEmpty( PREFIX ):PREFIX = /usr
++ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
+ target.path = $$PREFIX/bin/
+- locale.path = $$PREFIX/share/apps/goldendict/locale/
++ locale.path = $$PREFIX/share/goldendict/locale/
+ locale.files = locale/*.qm
Copied: goldendict/repos/community-staging-i686/goldendict.changelog (from rev 149026, goldendict/trunk/goldendict.changelog)
===================================================================
--- community-staging-i686/goldendict.changelog (rev 0)
+++ community-staging-i686/goldendict.changelog 2015-12-06 18:00:30 UTC (rev 149027)
@@ -0,0 +1,14 @@
+2015-02-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * goldendict 1.5.0RC-1 FS#43667 fix, localizations added again
+
+2011-12-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * goldendict 1.0.1-5 libQtWebKit.so.4 now in new qtwebkit package
+
+2010-12-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.0.1
+
+2010-02-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * FS#18350 fixed in 0.9.0-5
+
+2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Package moved to [community] in v0.9.0
Copied: goldendict/repos/community-staging-x86_64/PKGBUILD (from rev 149026, goldendict/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-06 18:00:30 UTC (rev 149027)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: m0rph <m0rph.mailbox at gmail.com>
+
+pkgname=goldendict
+pkgver=1.5.0RC
+pkgrel=2
+pkgdesc="Feature-rich dictionary lookup program"
+arch=('i686' 'x86_64')
+url="http://goldendict.org"
+license=('GPL3')
+depends=('hunspell' 'libxtst' 'libzip' 'libao' 'qtwebkit' 'phonon-qt4' 'ffmpeg')
+provides=('stardict')
+changelog=$pkgname.changelog
+source=($pkgname-$pkgver.tar.gz::https://github.com/goldendict/goldendict/archive/1.5.0-RC.tar.gz
+ $pkgname-paths.patch
+ gcc47.patch
+ fix-wikipedia-images.patch)
+sha256sums=('5705d5197509596221faf16a806965c799de7371a41fe2d2c4dc00b737ffe22e'
+ '5281dc2f57a93e2aa416de35bd702926bd90b4746d62f81d8dc434f6a689d55e'
+ '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e'
+ 'ab669d96db0cb750d4c865b123474d655b6caca9242457c044a60f1fee5b7dc7')
+
+prepare(){
+ cd "${srcdir}"/${pkgname}-1.5.0-RC
+
+ patch -Np0 -i "${srcdir}"/$pkgname-paths.patch
+# patch -p1 -i "${srcdir}"/gcc47.patch
+# patch -Np1 -i "${srcdir}"/fix-wikipedia-images.patch
+}
+
+build(){
+ cd "${srcdir}"/${pkgname}-1.5.0-RC
+
+ qmake-qt4 PREFIX="/usr"
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-1.5.0-RC
+
+ make INSTALL_ROOT="${pkgdir}" install
+
+# languages
+ install -d "${pkgdir}"/usr/share/$pkgname/locale
+ install -m644 locale/*.qm -t "${pkgdir}"/usr/share/$pkgname/locale
+
+# removing unneeded
+ rm -rf "${pkgdir}"/usr/share/app-install
+}
Copied: goldendict/repos/community-staging-x86_64/fix-wikipedia-images.patch (from rev 149026, goldendict/trunk/fix-wikipedia-images.patch)
===================================================================
--- community-staging-x86_64/fix-wikipedia-images.patch (rev 0)
+++ community-staging-x86_64/fix-wikipedia-images.patch 2015-12-06 18:00:30 UTC (rev 149027)
@@ -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
+
Copied: goldendict/repos/community-staging-x86_64/gcc47.patch (from rev 149026, goldendict/trunk/gcc47.patch)
===================================================================
--- community-staging-x86_64/gcc47.patch (rev 0)
+++ community-staging-x86_64/gcc47.patch 2015-12-06 18:00:30 UTC (rev 149027)
@@ -0,0 +1,23 @@
+diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc
+--- goldendict-1.0.1-src.orig/processwrapper.cc 2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/processwrapper.cc 2012-08-04 20:51:45.835055609 +0530
+@@ -94,6 +94,8 @@
+
+ #else
+
++#include <unistd.h>
++
+ unsigned int ProcessWrapper::currentProcessId()
+ {
+ return getpid();
+diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp
+--- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp 2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp 2012-08-04 20:48:47.761593825 +0530
+@@ -50,6 +50,7 @@
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+
+ namespace QtLP_Private {
Copied: goldendict/repos/community-staging-x86_64/goldendict-paths.patch (from rev 149026, goldendict/trunk/goldendict-paths.patch)
===================================================================
--- community-staging-x86_64/goldendict-paths.patch (rev 0)
+++ community-staging-x86_64/goldendict-paths.patch 2015-12-06 18:00:30 UTC (rev 149027)
@@ -0,0 +1,12 @@
+--- goldendict.pro.orig 2013-06-06 15:39:06.000000000 +0200
++++ goldendict.pro 2015-02-02 12:10:35.393194928 +0100
+@@ -84,6 +84,6 @@
+ PREFIX = $$(PREFIX)
+- isEmpty( PREFIX ):PREFIX = /usr/local
+- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
++ isEmpty( PREFIX ):PREFIX = /usr
++ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
+ target.path = $$PREFIX/bin/
+- locale.path = $$PREFIX/share/apps/goldendict/locale/
++ locale.path = $$PREFIX/share/goldendict/locale/
+ locale.files = locale/*.qm
Copied: goldendict/repos/community-staging-x86_64/goldendict.changelog (from rev 149026, goldendict/trunk/goldendict.changelog)
===================================================================
--- community-staging-x86_64/goldendict.changelog (rev 0)
+++ community-staging-x86_64/goldendict.changelog 2015-12-06 18:00:30 UTC (rev 149027)
@@ -0,0 +1,14 @@
+2015-02-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * goldendict 1.5.0RC-1 FS#43667 fix, localizations added again
+
+2011-12-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * goldendict 1.0.1-5 libQtWebKit.so.4 now in new qtwebkit package
+
+2010-12-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.0.1
+
+2010-02-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * FS#18350 fixed in 0.9.0-5
+
+2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Package moved to [community] in v0.9.0
More information about the arch-commits
mailing list