[gentoo-commits] proj/qt:master commit in: app-text/goldendict/files/, app-text/goldendict/
commit: a520a7ebaaf7d6cc515a47a9c910c673d6a3b5c6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 20 11:52:27 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 20 21:17:32 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a520a7eb
app-text/goldendict: EAPI-7 bump (sync with Gentoo ebuild repo)
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner gentoo.org>
...ndict-1.5.0-qtsingleapplication-unbundle.patch} | 0
app-text/goldendict/goldendict-.ebuild | 32 +++---
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/app-text/goldendict/files/goldendict--qtsingleapplication-unbundle.patch
b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
similarity index 100%
rename from
app-text/goldendict/files/goldendict--qtsingleapplication-unbundle.patch
rename to
app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
diff --git a/app-text/goldendict/goldendict-.ebuild
b/app-text/goldendict/goldendict-.ebuild
index 74aae628..32672acb 100644
--- a/app-text/goldendict/goldendict-.ebuild
+++ b/app-text/goldendict/goldendict-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils git-r3 qmake-utils
+inherit desktop git-r3 qmake-utils
DESCRIPTION="Feature-rich dictionary lookup program"
HOMEPAGE="http://goldendict.org/";
@@ -14,7 +14,11 @@ SLOT="0"
KEYWORDS=""
IUSE="debug ffmpeg libav"
-RDEPEND="
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+DEPEND="
app-arch/bzip2
>=app-text/hunspell-1.2:=
dev-libs/eb
@@ -24,7 +28,7 @@ RDEPEND="
dev-qt/qthelp:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5(+)]
+ dev-qt/qtsingleapplication[qt5(+),X]
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
@@ -41,19 +45,18 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-qtsingleapplication-unbundle.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" )
src_prepare() {
default
+ # disable git
+ sed -i -e '/git describe/s/^/#/' ${PN}.pro || die
+
# fix installation path
- sed -i \
- -e '/PREFIX = /s:/usr/local:/usr:' \
- ${PN}.pro || die
+ sed -i -e '/PREFIX = /s:/usr/local:/usr:' ${PN}.pro || die
# add trailing semicolon
sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
@@ -61,10 +64,7 @@ src_prepare() {
src_configure() {
local myconf=()
-
- if ! use ffmpeg && ! use libav ; then
- myconf+=( DISABLE_INTERNAL_PLAYER=1 )
- fi
+ use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 )
eqmake5 "${myconf[@]}"
}
[gentoo-commits] proj/qt:master commit in: app-text/goldendict/files/, app-text/goldendict/
commit: 1ea676d637f96fbf715e19c30e3dc8b4deb5f474
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Oct 28 17:14:36 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 28 17:14:52 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1ea676d6
app-text/goldendict: switch to Qt 5
Based on work by Gleb.
Gentoo-bug: 574464
Package-Manager: portage-2.3.2
...endict--qtsingleapplication-unbundle.patch} | 14 ++---
app-text/goldendict/goldendict-.ebuild | 68 --
2 files changed, 44 insertions(+), 38 deletions(-)
diff --git
a/app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch
b/app-text/goldendict/files/goldendict--qtsingleapplication-unbundle.patch
similarity index 55%
rename from
app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch
rename to
app-text/goldendict/files/goldendict--qtsingleapplication-unbundle.patch
index 407b261..01fdb3b 100644
---
a/app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch
+++
b/app-text/goldendict/files/goldendict--qtsingleapplication-unbundle.patch
@@ -1,16 +1,16 @@
goldendict.pro.orig2014-11-02 12:42:07.845942253 +0800
-+++ goldendict.pro 2014-11-02 12:44:22.965590774 +0800
-@@ -24,7 +24,8 @@
+--- a/goldendict.pro
b/goldendict.pro
+@@ -36,7 +36,8 @@
+ QT += sql
CONFIG += exceptions \
rtti \
- stl \
--help
-+help \
+-stl
++stl \
+qtsingleapplication
OBJECTS_DIR = build
UI_DIR = build
MOC_DIR = build
-@@ -548,5 +549,3 @@
+@@ -632,5 +633,3 @@
TS_OUT ~= s/.ts/.qm/g
PRE_TARGETDEPS += $$TS_OUT
diff --git a/app-text/goldendict/goldendict-.ebuild
b/app-text/goldendict/goldendict-.ebuild
index 94b2722..b52d986 100644
--- a/app-text/goldendict/goldendict-.ebuild
+++ b/app-text/goldendict/goldendict-.ebuild
@@ -2,10 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-LANGSLONG="ar_SA bg_BG cs_CZ de_DE el_GR lt_LT ru_RU zh_CN"
+EAPI=6
-inherit qt4-r2 git-r3
+inherit eutils git-r3 qmake-utils
DESCRIPTION="Feature-rich dictionary lookup program"
HOMEPAGE="http://goldendict.org/";
@@ -14,43 +13,40 @@ EGIT_REPO_URI="https://github.com/goldendict/goldendict.git";
LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="debug kde"
+IUSE="debug ffmpeg libav"
RDEPEND="
>=app-text/hunspell-1.2
dev-libs/eb
- dev-qt/qtcore:4[exceptions]
- dev-qt/qtgui:4[exceptions]
- dev-qt/qthelp:4[exceptions]
- dev-qt/qtsingleapplication[qt4]
- dev-qt/qtsvg:4[exceptions]
- dev-qt/qtwebkit:4[exceptions]
- media-libs/libao
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtsingleapplication[qt5]
+ dev-qt/qtsvg:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
media-libs/libogg
media-libs/libvorbis
sys-libs/zlib
x11-libs/libXtst
- !kde? ( || (
- >=dev-qt/qtphonon-4.5:4[exceptions]
- media-libs/phonon[qt4]
- ) )
- kde? ( media-libs/phonon[qt4] )
+ ffmpeg? (
+ media-libs/libao
+ libav? ( media-video/libav:0= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"
-PATCHES=(
-"${FILESDIR}/${PN}-36a761108-qtsingleapplication-unbundle.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-qtsingleapplication-unbundle.patch" )
src_prepare() {
- qt4-r2_src_prepare
+ default
- # don't install duplicated stuff and fix installation path
+ # fix installation path
sed -i \
- -e '/desktops2/d' \
- -e '/icons2/d' \
-e '/PREFIX = /s:/usr/local:/usr:' \
${PN}.pro || die
@@ -58,14 +54,24 @@ src_prepare() {
sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
}
+src_configure() {
+ local myconf=()
+
+ if ! use ffmpeg && ! use libav ; then
+ myconf+=("DISABLE_INTERNAL_PLAYER=1")
+ fi
+
+ eqmake5 "${myconf[@]}"
+}
+
src_install() {
- qt4-r2_src_install
+ dobin ${PN}
+ domenu redist/${PN}.desktop
+ doicon redist/icons/${PN}.png
+
+ insinto /use/share/apps/${PN}/locale
+ doins locale/*.qm
- # install translations
- insinto /usr/share/apps/${PN}/locale
- for lang in ${LANGSLONG}; do
- if use linguas_${lang%_*}; then
- doins locale/${lang}.qm
- fi
- done
+ insinto /usr/share/${PN}/help
+ doins help/*.qch
}
[gentoo-commits] proj/qt:master commit in: app-text/goldendict/files/, app-text/goldendict/
commit: 9e844940c0fe6048fd6c470adb9d08d31afef23f
Author: Ben de Groot gentoo org>
AuthorDate: Sun Nov 2 04:56:18 2014 +
Commit: Ben de Groot gentoo org>
CommitDate: Sun Nov 2 04:56:18 2014 +
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-.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..000
--- 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
-
-+#if defined(Q_OS_UNIX)
-+#include
-+#endif
-+
- #ifdef Q_OS_WIN32
-
- #include
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.orig2013-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.orig2014-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-.ebuild
b/app-text/goldendict/goldendict-.ebuild
index ae0840a..ace856c 100644
--- a/app-text/goldendict/goldendict-.ebuild
+++ b/app-text/goldendict/goldendict-.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() {
