| 1 |
commit: 1a8688ed4869113de4b53791c2196709f774859e |
| 2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Mon May 30 20:53:53 2022 +0000 |
| 4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 5 |
CommitDate: Mon May 30 20:53:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a8688ed |
| 7 |
|
| 8 |
net-client/kristall: fix build |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/840490 |
| 11 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 12 |
|
| 13 |
...kristall-0.3-r1.ebuild => kristall-0.3-r2.ebuild} | 20 ++++++++++++++------ |
| 14 |
net-client/kristall/kristall-9999.ebuild | 20 +++++++++++++++----- |
| 15 |
2 files changed, 29 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-client/kristall/kristall-0.3-r1.ebuild b/net-client/kristall/kristall-0.3-r2.ebuild |
| 18 |
similarity index 62% |
| 19 |
rename from net-client/kristall/kristall-0.3-r1.ebuild |
| 20 |
rename to net-client/kristall/kristall-0.3-r2.ebuild |
| 21 |
index 0d5efcd77..9664da960 100644 |
| 22 |
--- a/net-client/kristall/kristall-0.3-r1.ebuild |
| 23 |
+++ b/net-client/kristall/kristall-0.3-r2.ebuild |
| 24 |
@@ -1,9 +1,9 @@ |
| 25 |
# Copyright 2020-2021 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=7 |
| 29 |
+EAPI=8 |
| 30 |
|
| 31 |
-inherit xdg |
| 32 |
+inherit out-of-source qmake-utils xdg |
| 33 |
|
| 34 |
DESCRIPTION="Visual cross-platform gemini browser" |
| 35 |
HOMEPAGE="https://github.com/MasterQ32/kristall" |
| 36 |
@@ -14,22 +14,30 @@ if [ "${PV}" == "9999" ]; then |
| 37 |
else |
| 38 |
SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" |
| 39 |
KEYWORDS="~amd64" |
| 40 |
+ PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) |
| 41 |
fi |
| 42 |
|
| 43 |
LICENSE="GPL-3" |
| 44 |
SLOT="0" |
| 45 |
|
| 46 |
RDEPEND=" |
| 47 |
+ dev-libs/openssl:= |
| 48 |
+ dev-qt/qtcore:5 |
| 49 |
+ dev-qt/qtgui:5 |
| 50 |
dev-qt/qtmultimedia:5[widgets] |
| 51 |
- dev-qt/qtsvg:5 |
| 52 |
dev-qt/qtnetwork:5[ssl] |
| 53 |
+ dev-qt/qtsvg:5 |
| 54 |
+ dev-qt/qtwidgets:5 |
| 55 |
" |
| 56 |
DEPEND="${RDEPEND}" |
| 57 |
-BDEPEND="dev-qt/qtcore" # qmake |
| 58 |
|
| 59 |
-PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) |
| 60 |
+my_src_compile() { |
| 61 |
+ eqmake5 "${S}"/src/kristall.pro |
| 62 |
+ emake |
| 63 |
+} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
- emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install |
| 67 |
+ cp "${BUILD_DIR}"/kristall . || die |
| 68 |
+ emake -o kristall DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install |
| 69 |
einstalldocs |
| 70 |
} |
| 71 |
|
| 72 |
diff --git a/net-client/kristall/kristall-9999.ebuild b/net-client/kristall/kristall-9999.ebuild |
| 73 |
index e255fe2b1..9664da960 100644 |
| 74 |
--- a/net-client/kristall/kristall-9999.ebuild |
| 75 |
+++ b/net-client/kristall/kristall-9999.ebuild |
| 76 |
@@ -1,9 +1,9 @@ |
| 77 |
# Copyright 2020-2021 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
-EAPI=7 |
| 81 |
+EAPI=8 |
| 82 |
|
| 83 |
-inherit xdg |
| 84 |
+inherit out-of-source qmake-utils xdg |
| 85 |
|
| 86 |
DESCRIPTION="Visual cross-platform gemini browser" |
| 87 |
HOMEPAGE="https://github.com/MasterQ32/kristall" |
| 88 |
@@ -14,20 +14,30 @@ if [ "${PV}" == "9999" ]; then |
| 89 |
else |
| 90 |
SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" |
| 91 |
KEYWORDS="~amd64" |
| 92 |
+ PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) |
| 93 |
fi |
| 94 |
|
| 95 |
LICENSE="GPL-3" |
| 96 |
SLOT="0" |
| 97 |
|
| 98 |
RDEPEND=" |
| 99 |
+ dev-libs/openssl:= |
| 100 |
+ dev-qt/qtcore:5 |
| 101 |
+ dev-qt/qtgui:5 |
| 102 |
dev-qt/qtmultimedia:5[widgets] |
| 103 |
- dev-qt/qtsvg:5 |
| 104 |
dev-qt/qtnetwork:5[ssl] |
| 105 |
+ dev-qt/qtsvg:5 |
| 106 |
+ dev-qt/qtwidgets:5 |
| 107 |
" |
| 108 |
DEPEND="${RDEPEND}" |
| 109 |
-BDEPEND="dev-qt/qtcore" # qmake |
| 110 |
+ |
| 111 |
+my_src_compile() { |
| 112 |
+ eqmake5 "${S}"/src/kristall.pro |
| 113 |
+ emake |
| 114 |
+} |
| 115 |
|
| 116 |
src_install() { |
| 117 |
- emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install |
| 118 |
+ cp "${BUILD_DIR}"/kristall . || die |
| 119 |
+ emake -o kristall DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install |
| 120 |
einstalldocs |
| 121 |
} |
Archives