[arch-commits] Commit in goldendict/trunk (4 files)

[Jaroslav Lichtblau]

    Date: Monday, February 2, 2015 @ 12:22:11
  Author: jlichtblau
Revision: 126977

upgpkg: goldendict 1.5.0RC-1

Added:
  goldendict/trunk/goldendict-paths.patch
Modified:
  goldendict/trunk/PKGBUILD
  goldendict/trunk/goldendict.changelog
Deleted:
  goldendict/trunk/goldendict-paths.diff

------------------------+
 PKGBUILD               |   42 +++++++++++++++++++++++-------------------
 goldendict-paths.diff  |   10 ----------
 goldendict-paths.patch |   12 ++++++++++++
 goldendict.changelog   |   11 +++++++----
 4 files changed, 42 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-02 10:21:17 UTC (rev 126976)
+++ PKGBUILD	2015-02-02 11:22:11 UTC (rev 126977)
@@ -1,46 +1,50 @@
 # $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
 # Contributor: m0rph <m0rph.mailbox at gmail.com>
 
 pkgname=goldendict
-pkgver=1.0.1
-pkgrel=7
+pkgver=1.5.0RC
+pkgrel=1
 pkgdesc="Feature-rich dictionary lookup program"
 arch=('i686' 'x86_64')
-url="http://goldendict.berlios.de/"
+url="http://goldendict.org"
 license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
+depends=('hunspell' 'libxtst' 'libzip' 'libao' 'qtwebkit' 'phonon-qt4' 'ffmpeg')
 provides=('stardict')
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
-        $pkgname-paths.diff
+source=(https://github.com/goldendict/goldendict/archive/1.5.0-RC.tar.gz
+        $pkgname-paths.patch
         gcc47.patch
         fix-wikipedia-images.patch)
-sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
-            '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589'
+sha256sums=('5705d5197509596221faf16a806965c799de7371a41fe2d2c4dc00b737ffe22e'
+            '5281dc2f57a93e2aa416de35bd702926bd90b4746d62f81d8dc434f6a689d55e'
             '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e'
             'ab669d96db0cb750d4c865b123474d655b6caca9242457c044a60f1fee5b7dc7')
 
 prepare(){
-  cd ${srcdir}
+  cd "${srcdir}"/${pkgname}-1.5.0-RC
 
-  patch -Np0 -i ${srcdir}/$pkgname-paths.diff
-  patch -p1 -i ${srcdir}/gcc47.patch
-  patch -Np1 -i ${srcdir}/fix-wikipedia-images.patch
+  patch -Np0 -i "${srcdir}"/$pkgname-paths.patch
+#  patch -p1 -i "${srcdir}"/gcc47.patch
+#  patch -Np1 -i "${srcdir}"/fix-wikipedia-images.patch
 }
 
 build(){
-  cd ${srcdir}
+  cd "${srcdir}"/${pkgname}-1.5.0-RC
 
-  qmake-qt4
+  qmake-qt4 PREFIX="/usr"
   make
 }
 
 package() {
-  cd ${srcdir}
+  cd "${srcdir}"/${pkgname}-1.5.0-RC
 
-  make INSTALL_ROOT=${pkgdir} install
+  make INSTALL_ROOT="${pkgdir}" install
 
-  #removing unneeded
-  rm -rf ${pkgdir}/usr/share/app-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: goldendict-paths.diff
===================================================================
--- goldendict-paths.diff	2015-02-02 10:21:17 UTC (rev 126976)
+++ goldendict-paths.diff	2015-02-02 11:22:11 UTC (rev 126977)
@@ -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/

Added: goldendict-paths.patch
===================================================================
--- goldendict-paths.patch	                        (rev 0)
+++ goldendict-paths.patch	2015-02-02 11:22:11 UTC (rev 126977)
@@ -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

Modified: goldendict.changelog
===================================================================
--- goldendict.changelog	2015-02-02 10:21:17 UTC (rev 126976)
+++ goldendict.changelog	2015-02-02 11:22:11 UTC (rev 126977)
@@ -1,11 +1,14 @@
-2011-12-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+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 <dragonlord at aur.archlinux.org>
+2010-12-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* Update to major release 1.0.1
 
-2010-02-16 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2010-02-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* FS#18350 fixed in 0.9.0-5
 
-2009-06-21 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+2009-06-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* Package moved to [community] in v0.9.0