[skip-ci] goldendict: fix some build error

This commit is contained in:
Jeff Huang 2018-10-10 01:33:21 +02:00
parent 07c4e1c9b8
commit 21beda6777
3 changed files with 13 additions and 37 deletions

View File

@ -1,18 +1,27 @@
pkgname=goldendict
pkgver=1.5.0rc2
pkgrel=8
pkgrel=9
pkgdesc="Feature-rich dictionary lookup program"
arch=('x86_64')
url="http://goldendict.berlios.de/"
url="http://goldendict.org/"
license=('GPL3')
depends=('hunspell' 'libxtst' 'libzip' 'libao' 'qt5-webkit' 'qt5-svg'
'qt5-x11extras' 'qt5-tools' 'phonon-qt5' 'ffmpeg')
provides=('stardict')
source=($pkgname-$pkgver.tar.gz::https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz)
sha256sums=('bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde')
source=($pkgname-$pkgver.tar.gz::https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz
goldendict-ffmpeg4.patch::"https://github.com/goldendict/goldendict/commit/03bbe01b.patch"
qt511.patch::"https://github.com/goldendict/goldendict/commit/3d4a468.patch"
groupwidget.patch::"https://github.com/goldendict/goldendict/commit/a659678.patch")
sha256sums=('bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde'
'c09649081dff26b7a4eb5d6828a077089eaedf0d8cc392d5bb8232fc64e2537f'
'dbcd8f40c8a6d35bf00fdb80cd559e22068ea4a57633d3feed711babae8af8d4'
'628eeec6b50a1f027347f799c2b06e01300412b94452bd72a611b3735e62bb98')
prepare(){
cd "${srcdir}"/${pkgname}-1.5.0-RC2
patch -p1 -i ../goldendict-ffmpeg4.patch # Fix build with ffmpeg 4
patch -p1 -i ../qt511.patch # Fix build with Qt 5.11
patch -p1 -i ../groupwidget.patch # Another fox build with Qt 5.11
}
build(){

View File

@ -1,21 +0,0 @@
--- qtsingleapplication/src/qtlocalpeer.cpp.orig 2012-07-19 15:01:51.610446745 +0000
+++ qtsingleapplication/src/qtlocalpeer.cpp 2012-07-19 15:01:10.499880379 +0000
@@ -49,6 +49,7 @@
static PProcessIdToSessionId pProcessIdToSessionId = 0;
#endif
#if defined(Q_OS_UNIX)
+#include <unistd.h>
#include <time.h>
#endif
--- processwrapper.cc.orig 2012-07-19 14:59:46.495424725 +0000
+++ processwrapper.cc 2012-07-19 15:00:07.155695828 +0000
@@ -94,6 +94,8 @@
#else
+#include <unistd.h>
+
unsigned int ProcessWrapper::currentProcessId()
{
return getpid();

View File

@ -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