commit: 9e844940c0fe6048fd6c470adb9d08d31afef23f
Author: Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 2 04:56:18 2014 +0000
Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sun Nov 2 04:56:18 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9e844940
app-text/goldendict: update live ebuild with improvements from bug #526690
---
.../files/goldendict-2602a03cd-gcc-4.7.patch | 13 -------------
...ndict-36a761108-qtsingleapplication-unbundle.patch} | 18 +++++++++---------
app-text/goldendict/goldendict-9999.ebuild | 8 +++++---
3 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/app-text/goldendict/files/goldendict-2602a03cd-gcc-4.7.patch
b/app-text/goldendict/files/goldendict-2602a03cd-gcc-4.7.patch
deleted file mode 100644
index e0fe871..0000000
--- a/app-text/goldendict/files/goldendict-2602a03cd-gcc-4.7.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- processwrapper.cc.orig 2013-10-20 12:10:13.525203117 +0400
-+++ processwrapper.cc 2013-10-20 12:10:29.516204511 +0400
-@@ -2,6 +2,10 @@
-
- #include <QtCore>
-
-+#if defined(Q_OS_UNIX)
-+#include <unistd.h>
-+#endif
-+
- #ifdef Q_OS_WIN32
-
- #include <windows.h>
diff --git
a/app-text/goldendict/files/goldendict-2602a03cd-qtsingleapplication-unbundle.patch
b/app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch
similarity index 51%
rename from
app-text/goldendict/files/goldendict-2602a03cd-qtsingleapplication-unbundle.patch
rename to
app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch
index e3195c2..407b261 100644
---
a/app-text/goldendict/files/goldendict-2602a03cd-qtsingleapplication-unbundle.patch
+++
b/app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch
@@ -1,18 +1,18 @@
---- goldendict.pro.orig 2013-10-20 12:16:58.420238403 +0400
-+++ goldendict.pro 2013-10-20 12:17:13.747239739 +0400
-@@ -25,7 +25,8 @@
- QT += phonon
+--- goldendict.pro.orig 2014-11-02 12:42:07.845942253 +0800
++++ goldendict.pro 2014-11-02 12:44:22.965590774 +0800
+@@ -24,7 +24,8 @@
CONFIG += exceptions \
rtti \
-- stl
-+ stl \
+ stl \
+- help
++ help \
+ qtsingleapplication
OBJECTS_DIR = build
UI_DIR = build
MOC_DIR = build
-@@ -322,5 +323,3 @@
- TS_OUT = $$TRANSLATIONS
+@@ -548,5 +549,3 @@
TS_OUT ~= s/.ts/.qm/g
PRE_TARGETDEPS += $$TS_OUT
--
+
-include( qtsingleapplication/src/qtsingleapplication.pri )
+-
diff --git a/app-text/goldendict/goldendict-9999.ebuild
b/app-text/goldendict/goldendict-9999.ebuild
index ae0840a..ace856c 100644
--- a/app-text/goldendict/goldendict-9999.ebuild
+++ b/app-text/goldendict/goldendict-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=5
-EGIT_REPO_URI="git://gitorious.org/goldendict/goldendict"
+EGIT_REPO_URI="https://github.com/goldendict/goldendict.git";
LANGSLONG="ar_SA bg_BG cs_CZ de_DE el_GR lt_LT ru_RU zh_CN"
inherit qt4-r2 git-r3
@@ -17,12 +17,15 @@ KEYWORDS=""
IUSE="debug kde"
RDEPEND=">=app-text/hunspell-1.2
+ dev-libs/eb
dev-qt/qtsingleapplication
+ media-libs/libao
media-libs/libogg
media-libs/libvorbis
sys-libs/zlib
x11-libs/libXtst
>=dev-qt/qtcore-4.5:4[exceptions]
+ >=dev-qt/qthelp-4.5:4[exceptions]
>=dev-qt/qtgui-4.5:4[exceptions]
>=dev-qt/qtwebkit-4.5:4[exceptions]
!kde? ( || (
@@ -34,8 +37,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}/${PN}-2602a03cd-gcc-4.7.patch"
- "${FILESDIR}/${PN}-2602a03cd-qtsingleapplication-unbundle.patch"
+ "${FILESDIR}/${PN}-36a761108-qtsingleapplication-unbundle.patch"
)
src_prepare() {
