[arch-commits] Commit in goldendict/repos/community-i686 (10 files)
Jaroslav Lichtblau
jlichtblau at archlinux.org
Mon Feb 2 11:32:24 UTC 2015
Date: Monday, February 2, 2015 @ 12:32:24
Author: jlichtblau
Revision: 126987
archrelease: copy trunk to community-i686
Added:
goldendict/repos/community-i686/PKGBUILD
(from rev 126986, goldendict/trunk/PKGBUILD)
goldendict/repos/community-i686/fix-wikipedia-images.patch
(from rev 126986, goldendict/trunk/fix-wikipedia-images.patch)
goldendict/repos/community-i686/gcc47.patch
(from rev 126986, goldendict/trunk/gcc47.patch)
goldendict/repos/community-i686/goldendict-paths.patch
(from rev 126986, goldendict/trunk/goldendict-paths.patch)
goldendict/repos/community-i686/goldendict.changelog
(from rev 126986, goldendict/trunk/goldendict.changelog)
Deleted:
goldendict/repos/community-i686/PKGBUILD
goldendict/repos/community-i686/fix-wikipedia-images.patch
goldendict/repos/community-i686/gcc47.patch
goldendict/repos/community-i686/goldendict-paths.diff
goldendict/repos/community-i686/goldendict.changelog
----------------------------+
PKGBUILD | 96 ++++++++++++++++++++++---------------------
fix-wikipedia-images.patch | 52 +++++++++++------------
gcc47.patch | 46 ++++++++++----------
goldendict-paths.diff | 10 ----
goldendict-paths.patch | 12 +++++
goldendict.changelog | 25 ++++++-----
6 files changed, 125 insertions(+), 116 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-02-02 11:27:50 UTC (rev 126986)
+++ PKGBUILD 2015-02-02 11:32:24 UTC (rev 126987)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: m0rph <m0rph.mailbox at gmail.com>
-
-pkgname=goldendict
-pkgver=1.0.1
-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')
-provides=('stardict')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
- $pkgname-paths.diff
- gcc47.patch
- fix-wikipedia-images.patch)
-sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
- '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589'
- '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e'
- 'ab669d96db0cb750d4c865b123474d655b6caca9242457c044a60f1fee5b7dc7')
-
-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
-}
-
-package() {
- cd ${srcdir}
-
- make INSTALL_ROOT=${pkgdir} install
-
- #removing unneeded
- rm -rf ${pkgdir}/usr/share/app-install
-}
Copied: goldendict/repos/community-i686/PKGBUILD (from rev 126986, goldendict/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-02-02 11:32:24 UTC (rev 126987)
@@ -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=1
+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=(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
+}
Deleted: fix-wikipedia-images.patch
===================================================================
--- fix-wikipedia-images.patch 2015-02-02 11:27:50 UTC (rev 126986)
+++ fix-wikipedia-images.patch 2015-02-02 11:32:24 UTC (rev 126987)
@@ -1,26 +0,0 @@
-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-i686/fix-wikipedia-images.patch (from rev 126986, goldendict/trunk/fix-wikipedia-images.patch)
===================================================================
--- fix-wikipedia-images.patch (rev 0)
+++ fix-wikipedia-images.patch 2015-02-02 11:32:24 UTC (rev 126987)
@@ -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
+
Deleted: gcc47.patch
===================================================================
--- gcc47.patch 2015-02-02 11:27:50 UTC (rev 126986)
+++ gcc47.patch 2015-02-02 11:32:24 UTC (rev 126987)
@@ -1,23 +0,0 @@
-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-i686/gcc47.patch (from rev 126986, goldendict/trunk/gcc47.patch)
===================================================================
--- gcc47.patch (rev 0)
+++ gcc47.patch 2015-02-02 11:32:24 UTC (rev 126987)
@@ -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 {
Deleted: goldendict-paths.diff
===================================================================
--- goldendict-paths.diff 2015-02-02 11:27:50 UTC (rev 126986)
+++ goldendict-paths.diff 2015-02-02 11:32:24 UTC (rev 126987)
@@ -1,10 +0,0 @@
---- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100
-+++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100
-@@ -63,2 +63,2 @@
-- isEmpty( PREFIX ):PREFIX = /usr/local
-- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
-+ isEmpty( PREFIX ):PREFIX = /usr
-+ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
-@@ -66 +66 @@
-- locale.path = $$PREFIX/share/apps/goldendict/locale/
-+ locale.path = $$PREFIX/share/goldendict/locale/
Copied: goldendict/repos/community-i686/goldendict-paths.patch (from rev 126986, goldendict/trunk/goldendict-paths.patch)
===================================================================
--- goldendict-paths.patch (rev 0)
+++ goldendict-paths.patch 2015-02-02 11:32:24 UTC (rev 126987)
@@ -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
Deleted: goldendict.changelog
===================================================================
--- goldendict.changelog 2015-02-02 11:27:50 UTC (rev 126986)
+++ goldendict.changelog 2015-02-02 11:32:24 UTC (rev 126987)
@@ -1,11 +0,0 @@
-2011-12-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * goldendict 1.0.1-5 libQtWebKit.so.4 now in new qtwebkit package
-
-2010-12-27 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * Update to major release 1.0.1
-
-2010-02-16 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * FS#18350 fixed in 0.9.0-5
-
-2009-06-21 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
- * Package moved to [community] in v0.9.0
Copied: goldendict/repos/community-i686/goldendict.changelog (from rev 126986, goldendict/trunk/goldendict.changelog)
===================================================================
--- goldendict.changelog (rev 0)
+++ goldendict.changelog 2015-02-02 11:32:24 UTC (rev 126987)
@@ -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