| 1 |
commit: b9e9604f46b5a0a3410a5572da8b8c5c7fcf0ce6 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 15 20:33:12 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 19 23:51:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e9604f |
| 7 |
|
| 8 |
net-im/qtox: Prepare for dev-qt/qtgui[xcb -> X] |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../qtox/{qtox-9999.ebuild => qtox-1.16.3-r1.ebuild} | 19 ++++++++++++++----- |
| 14 |
net-im/qtox/qtox-9999.ebuild | 7 +++++-- |
| 15 |
2 files changed, 19 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-1.16.3-r1.ebuild |
| 18 |
similarity index 76% |
| 19 |
copy from net-im/qtox/qtox-9999.ebuild |
| 20 |
copy to net-im/qtox/qtox-1.16.3-r1.ebuild |
| 21 |
index c2f80f279d6..d29e70e3f7b 100644 |
| 22 |
--- a/net-im/qtox/qtox-9999.ebuild |
| 23 |
+++ b/net-im/qtox/qtox-1.16.3-r1.ebuild |
| 24 |
@@ -1,21 +1,24 @@ |
| 25 |
-# Copyright 1999-2019 Gentoo Authors |
| 26 |
+# Copyright 1999-2020 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
|
| 31 |
-inherit cmake git-r3 xdg |
| 32 |
+MY_P="qTox-${PV}" |
| 33 |
+inherit cmake xdg |
| 34 |
|
| 35 |
DESCRIPTION="Most feature-rich GUI for net-libs/tox using Qt5" |
| 36 |
HOMEPAGE="https://github.com/qTox/qTox" |
| 37 |
-EGIT_REPO_URI="https://github.com/qTox/qTox.git" |
| 38 |
+SRC_URI="https://github.com/qTox/qTox/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" |
| 39 |
|
| 40 |
LICENSE="GPL-3+" |
| 41 |
SLOT="0" |
| 42 |
-KEYWORDS="" |
| 43 |
+KEYWORDS="~amd64 ~x86" |
| 44 |
IUSE="notification test X" |
| 45 |
|
| 46 |
RESTRICT="!test? ( test )" |
| 47 |
|
| 48 |
+S="${WORKDIR}/${MY_P}" |
| 49 |
+ |
| 50 |
BDEPEND=" |
| 51 |
dev-qt/linguist-tools:5 |
| 52 |
virtual/pkgconfig |
| 53 |
@@ -25,7 +28,10 @@ RDEPEND=" |
| 54 |
dev-libs/libsodium:= |
| 55 |
dev-qt/qtconcurrent:5 |
| 56 |
dev-qt/qtcore:5 |
| 57 |
- dev-qt/qtgui:5[gif,jpeg,png,xcb] |
| 58 |
+ || ( |
| 59 |
+ dev-qt/qtgui:5[gif,jpeg,png,X(-)] |
| 60 |
+ dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] |
| 61 |
+ ) |
| 62 |
dev-qt/qtnetwork:5 |
| 63 |
dev-qt/qtopengl:5 |
| 64 |
dev-qt/qtsql:5 |
| 65 |
@@ -45,6 +51,8 @@ DEPEND="${RDEPEND} |
| 66 |
test? ( dev-qt/qttest:5 ) |
| 67 |
" |
| 68 |
|
| 69 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.13.patch" ) # bug #699152 |
| 70 |
+ |
| 71 |
src_prepare() { |
| 72 |
cmake_src_prepare |
| 73 |
|
| 74 |
@@ -61,6 +69,7 @@ src_configure() { |
| 75 |
-DENABLE_GTK_SYSTRAY=$(usex notification) |
| 76 |
-DPLATFORM_EXTENSIONS=$(usex X) |
| 77 |
-DUSE_FILTERAUDIO=OFF |
| 78 |
+ -DGIT_DESCRIBE="${PV}" |
| 79 |
) |
| 80 |
|
| 81 |
cmake_src_configure |
| 82 |
|
| 83 |
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild |
| 84 |
index c2f80f279d6..8e6526263d3 100644 |
| 85 |
--- a/net-im/qtox/qtox-9999.ebuild |
| 86 |
+++ b/net-im/qtox/qtox-9999.ebuild |
| 87 |
@@ -1,4 +1,4 @@ |
| 88 |
-# Copyright 1999-2019 Gentoo Authors |
| 89 |
+# Copyright 1999-2020 Gentoo Authors |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
|
| 92 |
EAPI=7 |
| 93 |
@@ -25,7 +25,10 @@ RDEPEND=" |
| 94 |
dev-libs/libsodium:= |
| 95 |
dev-qt/qtconcurrent:5 |
| 96 |
dev-qt/qtcore:5 |
| 97 |
- dev-qt/qtgui:5[gif,jpeg,png,xcb] |
| 98 |
+ || ( |
| 99 |
+ dev-qt/qtgui:5[gif,jpeg,png,X(-)] |
| 100 |
+ dev-qt/qtgui:5[gif,jpeg,png,xcb(-)] |
| 101 |
+ ) |
| 102 |
dev-qt/qtnetwork:5 |
| 103 |
dev-qt/qtopengl:5 |
| 104 |
dev-qt/qtsql:5 |
Archives