* [gentoo-commits] proj/qt:master commit in: app-text/goldendict/, app-text/goldendict/files/
@ 2022-08-03 9:14 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-08-03 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 394f4afe218a3c4585d0eb2acb768cba782803e8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 09:12:53 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 09:13:07 2022 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=394f4afe
app-text/goldendict: treeclean
dev-qt/qtwebkit is long gone from Gentoo.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...endict-1.5.0-qtsingleapplication-unbundle.patch | 18 -----
app-text/goldendict/goldendict-9999.ebuild | 81 ----------------------
app-text/goldendict/metadata.xml | 8 ---
3 files changed, 107 deletions(-)
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
deleted file mode 100644
index 01fdb3b2..00000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/goldendict.pro
-+++ b/goldendict.pro
-@@ -36,7 +36,8 @@
- QT += sql
- CONFIG += exceptions \
- rtti \
-- stl
-+ stl \
-+ qtsingleapplication
- OBJECTS_DIR = build
- UI_DIR = build
- MOC_DIR = build
-@@ -632,5 +633,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
deleted file mode 100644
index e0b7a2f4..00000000
--- a/app-text/goldendict/goldendict-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop git-r3 qmake-utils
-
-DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.org/"
-EGIT_REPO_URI="https://github.com/goldendict/goldendict.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug ffmpeg"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-DEPEND="
- app-arch/bzip2
- >=app-text/hunspell-1.2:=
- dev-libs/eb
- dev-libs/lzo
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5(+),X]
- dev-qt/qtsvg:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- media-libs/libvorbis
- media-libs/tiff:0
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXtst
- ffmpeg? (
- media-libs/libao
- media-video/ffmpeg:0=
- )
-"
-RDEPEND="${DEPEND}"
-
-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
-
- # add trailing semicolon
- sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
-}
-
-src_configure() {
- local myconf=()
- use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 )
-
- eqmake5 "${myconf[@]}"
-}
-
-src_install() {
- dobin ${PN}
- domenu redist/${PN}.desktop
- doicon redist/icons/${PN}.png
-
- insinto /usr/share/apps/${PN}/locale
- doins locale/*.qm
-
- insinto /usr/share/${PN}/help
- doins help/*.qch
-}
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
deleted file mode 100644
index 610d2d8e..00000000
--- a/app-text/goldendict/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/qt:master commit in: app-text/goldendict/, app-text/goldendict/files/
@ 2013-10-20 8:22 Sergey Popov
0 siblings, 0 replies; 2+ messages in thread
From: Sergey Popov @ 2013-10-20 8:22 UTC (permalink / raw
To: gentoo-commits
commit: a4263f310fc0226df89e5c382f371557ea7d7281
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 08:21:08 2013 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 08:21:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a4263f31
goldendict: Migrate to git-r3 eclass,
add patch for gcc 4.7 compatibility(bug #465874),
unbundle qtsingleapplication
Package-Manager: portage-2.2.7
---
.../files/goldendict-2602a03cd-gcc-4.7.patch | 13 +++++++++++++
...endict-2602a03cd-qtsingleapplication-unbundle.patch | 18 ++++++++++++++++++
app-text/goldendict/goldendict-9999.ebuild | 8 +++++++-
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/app-text/goldendict/files/goldendict-2602a03cd-gcc-4.7.patch b/app-text/goldendict/files/goldendict-2602a03cd-gcc-4.7.patch
new file mode 100644
index 0000000..e0fe871
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-2602a03cd-gcc-4.7.patch
@@ -0,0 +1,13 @@
+--- 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-2602a03cd-qtsingleapplication-unbundle.patch
new file mode 100644
index 0000000..e3195c2
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-2602a03cd-qtsingleapplication-unbundle.patch
@@ -0,0 +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
+ CONFIG += exceptions \
+ rtti \
+- stl
++ stl \
++ qtsingleapplication
+ OBJECTS_DIR = build
+ UI_DIR = build
+ MOC_DIR = build
+@@ -322,5 +323,3 @@
+ TS_OUT = $$TRANSLATIONS
+ 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 d86a50f..602869b 100644
--- a/app-text/goldendict/goldendict-9999.ebuild
+++ b/app-text/goldendict/goldendict-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
EGIT_REPO_URI="git://gitorious.org/goldendict/goldendict"
LANGSLONG="ar_SA bg_BG cs_CZ de_DE el_GR lt_LT ru_RU zh_CN"
-inherit qt4-r2 git-2
+inherit qt4-r2 git-r3
DESCRIPTION="Feature-rich dictionary lookup program"
HOMEPAGE="http://goldendict.org/"
@@ -17,6 +17,7 @@ KEYWORDS=""
IUSE="debug kde"
RDEPEND=">=app-text/hunspell-1.2
+ dev-qt/qtsingleapplication
media-libs/libogg
media-libs/libvorbis
sys-libs/zlib
@@ -32,6 +33,11 @@ RDEPEND=">=app-text/hunspell-1.2
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/${PN}-2602a03cd-gcc-4.7.patch"
+ "${FILESDIR}/${PN}-2602a03cd-qtsingleapplication-unbundle.patch"
+)
+
src_prepare() {
qt4-r2_src_prepare
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-03 9:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-03 9:14 [gentoo-commits] proj/qt:master commit in: app-text/goldendict/, app-text/goldendict/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2013-10-20 8:22 Sergey Popov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox