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

Jaroslav Lichtblau jlichtblau at archlinux.org
Wed May 11 19:19:05 UTC 2016


    Date: Wednesday, May 11, 2016 @ 21:19:02
  Author: jlichtblau
Revision: 174831

upgpkg: goldendict 1.5.0RC2-1 - new upstream release

Modified:
  goldendict/trunk/PKGBUILD
  goldendict/trunk/goldendict.changelog
Deleted:
  goldendict/trunk/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
  goldendict/trunk/goldendict-paths.patch

-----------------------------------------------------------+
 Fix-compilation-with-last-FFMpeg-versions-issue-673.patch |   52 ------------
 PKGBUILD                                                  |   27 +-----
 goldendict-paths.patch                                    |   12 --
 goldendict.changelog                                      |    3 
 4 files changed, 11 insertions(+), 83 deletions(-)

Deleted: Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
===================================================================
--- Fix-compilation-with-last-FFMpeg-versions-issue-673.patch	2016-05-11 18:43:41 UTC (rev 174830)
+++ Fix-compilation-with-last-FFMpeg-versions-issue-673.patch	2016-05-11 19:19:02 UTC (rev 174831)
@@ -1,52 +0,0 @@
-From cabc5aa7c353812f847b5d2ccc3f9767c30bde7f Mon Sep 17 00:00:00 2001
-From: Abs62 <ottomann at yandex.ru>
-Date: Wed, 17 Feb 2016 17:37:23 +0300
-Subject: [PATCH] Fix compilation with last FFMpeg versions (issue #673)
-
----
- ffmpegaudio.cc | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
-index 2a13e77..19eecc8 100644
---- a/ffmpegaudio.cc
-+++ b/ffmpegaudio.cc
-@@ -334,7 +334,11 @@ void DecoderContext::closeOutputDevice()
- 
- bool DecoderContext::play( QString & errorString )
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR < 28 )
-   AVFrame * frame = avcodec_alloc_frame();
-+#else
-+  AVFrame * frame = av_frame_alloc();
-+#endif
-   if ( !frame )
-   {
-     errorString = QObject::tr( "avcodec_alloc_frame() failed." );
-@@ -365,7 +369,11 @@ bool DecoderContext::play( QString & errorString )
-       while( pack.size > 0 );
-     }
-     // av_free_packet() must be called after each call to av_read_frame()
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
-     av_free_packet( &packet );
-+#else
-+    av_packet_unref( &packet );
-+#endif
-   }
- 
-   if ( !isCancelled_ && codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-@@ -382,8 +390,10 @@ bool DecoderContext::play( QString & errorString )
- 
- #if LIBAVCODEC_VERSION_MAJOR < 54
-   av_free( frame );
--#else
-+#elif LIBAVCODEC_VERSION_MAJOR < 55 || ( LIBAVCODEC_VERSION_MAJOR == 55 && LIBAVCODEC_VERSION_MINOR < 28 )
-   avcodec_free_frame( &frame );
-+#else
-+  av_frame_free( &frame );
- #endif
- 
-   return true;
--- 
-2.7.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-11 18:43:41 UTC (rev 174830)
+++ PKGBUILD	2016-05-11 19:19:02 UTC (rev 174831)
@@ -3,38 +3,27 @@
 # Contributor: m0rph <m0rph.mailbox at gmail.com>
 
 pkgname=goldendict
-pkgver=1.5.0RC
-pkgrel=3
+pkgver=1.5.0RC2
+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')
+depends=('hunspell' 'libxtst' 'libzip' 'libao' 'qt5-webkit' 'qt5-svg' 'qt5-tools' 'phonon-qt5' '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
-        Fix-compilation-with-last-FFMpeg-versions-issue-673.patch)
-sha256sums=('5705d5197509596221faf16a806965c799de7371a41fe2d2c4dc00b737ffe22e'
-            '5281dc2f57a93e2aa416de35bd702926bd90b4746d62f81d8dc434f6a689d55e'
-            '80bffcac787445ef272c06dfe4b73ab09da4a00733404198f60f25f2bb9edba9')
+source=($pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/1.5.0-RC2.tar.gz)
+sha256sums=('bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde')
 
-prepare(){
-  cd "${srcdir}"/$pkgname-1.5.0-RC
-
-  patch -Np0 -i "${srcdir}"/$pkgname-paths.patch
-  patch -Np1 -i "${srcdir}"/Fix-compilation-with-last-FFMpeg-versions-issue-673.patch
-}
-
 build(){
-  cd "${srcdir}"/$pkgname-1.5.0-RC
+  cd "${srcdir}"/$pkgname-1.5.0-RC2
 
-  qmake-qt4 PREFIX="/usr"
+  qmake-qt5 "CONFIG+=no_epwing_support" PREFIX="/usr" 
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname-1.5.0-RC
+  cd "${srcdir}"/$pkgname-1.5.0-RC2
 
   make INSTALL_ROOT="${pkgdir}" install
 

Deleted: goldendict-paths.patch
===================================================================
--- goldendict-paths.patch	2016-05-11 18:43:41 UTC (rev 174830)
+++ goldendict-paths.patch	2016-05-11 19:19:02 UTC (rev 174831)
@@ -1,12 +0,0 @@
---- 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	2016-05-11 18:43:41 UTC (rev 174830)
+++ goldendict.changelog	2016-05-11 19:19:02 UTC (rev 174831)
@@ -1,3 +1,6 @@
+2016-05-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* goldendict 1.5.0RC2-1
+
 2016-02-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* goldendict 1.5.0RC-3 ffmpeg 3.0 rebuild
 



More information about the arch-commits mailing list