* [gentoo-commits] repo/proj/guru:dev commit in: net-client/kristall/
@ 2022-05-30 21:02 Anna Vyalkova
0 siblings, 0 replies; 4+ messages in thread
From: Anna Vyalkova @ 2022-05-30 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 1a8688ed4869113de4b53791c2196709f774859e
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon May 30 20:53:53 2022 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Mon May 30 20:53:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a8688ed
net-client/kristall: fix build
Closes: https://bugs.gentoo.org/840490
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
...kristall-0.3-r1.ebuild => kristall-0.3-r2.ebuild} | 20 ++++++++++++++------
net-client/kristall/kristall-9999.ebuild | 20 +++++++++++++++-----
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/net-client/kristall/kristall-0.3-r1.ebuild b/net-client/kristall/kristall-0.3-r2.ebuild
similarity index 62%
rename from net-client/kristall/kristall-0.3-r1.ebuild
rename to net-client/kristall/kristall-0.3-r2.ebuild
index 0d5efcd77..9664da960 100644
--- a/net-client/kristall/kristall-0.3-r1.ebuild
+++ b/net-client/kristall/kristall-0.3-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit xdg
+inherit out-of-source qmake-utils xdg
DESCRIPTION="Visual cross-platform gemini browser"
HOMEPAGE="https://github.com/MasterQ32/kristall"
@@ -14,22 +14,30 @@ if [ "${PV}" == "9999" ]; then
else
SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
+ PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" )
fi
LICENSE="GPL-3"
SLOT="0"
RDEPEND="
+ dev-libs/openssl:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtsvg:5
dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
"
DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/qtcore" # qmake
-PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" )
+my_src_compile() {
+ eqmake5 "${S}"/src/kristall.pro
+ emake
+}
src_install() {
- emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
+ cp "${BUILD_DIR}"/kristall . || die
+ emake -o kristall DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
einstalldocs
}
diff --git a/net-client/kristall/kristall-9999.ebuild b/net-client/kristall/kristall-9999.ebuild
index e255fe2b1..9664da960 100644
--- a/net-client/kristall/kristall-9999.ebuild
+++ b/net-client/kristall/kristall-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit xdg
+inherit out-of-source qmake-utils xdg
DESCRIPTION="Visual cross-platform gemini browser"
HOMEPAGE="https://github.com/MasterQ32/kristall"
@@ -14,20 +14,30 @@ if [ "${PV}" == "9999" ]; then
else
SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
+ PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" )
fi
LICENSE="GPL-3"
SLOT="0"
RDEPEND="
+ dev-libs/openssl:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
dev-qt/qtmultimedia:5[widgets]
- dev-qt/qtsvg:5
dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
"
DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/qtcore" # qmake
+
+my_src_compile() {
+ eqmake5 "${S}"/src/kristall.pro
+ emake
+}
src_install() {
- emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
+ cp "${BUILD_DIR}"/kristall . || die
+ emake -o kristall DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
einstalldocs
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-client/kristall/
@ 2022-10-10 17:38 Anna Vyalkova
0 siblings, 0 replies; 4+ messages in thread
From: Anna Vyalkova @ 2022-10-10 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 798a59c407a8472f936f49482f7fbcf48968d8d2
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Oct 10 17:35:28 2022 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Mon Oct 10 17:35:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=798a59c4
net-client/kristall: add 0.4, drop 9999
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-client/kristall/Manifest | 1 +
.../{kristall-9999.ebuild => kristall-0.4.ebuild} | 36 ++++++++++++++++------
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/net-client/kristall/Manifest b/net-client/kristall/Manifest
index a597b1137..54cc28d75 100644
--- a/net-client/kristall/Manifest
+++ b/net-client/kristall/Manifest
@@ -1 +1,2 @@
DIST kristall-0.3.tar.gz 7535712 BLAKE2B 3e00243cf455ad810e8d51333b63186e637de1c292a116dbb4273825c51b1c1bf1921bfd243acb97e13dc201b3dcce7240f3c66368b66b607e5c207a2d901934 SHA512 21c102e25235f3a7c1a4128d84215a2444603b4b9bc680e94100148d143dc50744bb86450c22b8848453c5e183ae4708a1594240486951614d4e4af2706cd2e8
+DIST kristall-0.4.tar.gz 22015746 BLAKE2B 262742ae96829773883337e258f52e89d102fc2cb543438b964a0e59fef91f5316a8a586e447657fd472a2346bf7b1490c1d913d47528272d3c04bd6da113b88 SHA512 f0355db2dfee4e40b532835fc4d511ac19d88751a42e7cf5d8a21b6c8a9468274613d717a83fa9aef230180fe9314e3bc8ef4482fb1aff8867f8d1d24caa6e6b
diff --git a/net-client/kristall/kristall-9999.ebuild b/net-client/kristall/kristall-0.4.ebuild
similarity index 50%
rename from net-client/kristall/kristall-9999.ebuild
rename to net-client/kristall/kristall-0.4.ebuild
index 9664da960..98748ddb1 100644
--- a/net-client/kristall/kristall-9999.ebuild
+++ b/net-client/kristall/kristall-0.4.ebuild
@@ -1,43 +1,61 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit out-of-source qmake-utils xdg
+inherit edo out-of-source qmake-utils xdg
DESCRIPTION="Visual cross-platform gemini browser"
HOMEPAGE="https://github.com/MasterQ32/kristall"
+
if [ "${PV}" == "9999" ]; then
inherit git-r3
-
- EGIT_REPO_URI="https://github.com/MasterQ32/kristall.git"
+ EGIT_REPO_URI="https://github.com/MasterQ32/${PN}.git"
else
SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
- PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" )
fi
LICENSE="GPL-3"
SLOT="0"
RDEPEND="
+ app-text/cmark:=
+ dev-libs/gumbo
dev-libs/openssl:=
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5[widgets]
dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsvg:5
dev-qt/qtwidgets:5
+ media-libs/libglvnd
"
DEPEND="${RDEPEND}"
+src_prepare() {
+ default
+
+ sed 's/$(shell cd $$PWD; git describe --tags)/'${PV}'/' \
+ -i src/kristall.pro || die
+}
+
+my_src_configure() {
+ eqmake5 "${S}"/src/kristall.pro CONFIG+="external-cmark external-gumbo-parser"
+}
+
my_src_compile() {
- eqmake5 "${S}"/src/kristall.pro
emake
+ cp kristall "${S}" || die
+}
+
+src_compile() {
+ out-of-source_src_compile
+
+ cd doc || die
+ edo sh gen-man.sh
}
src_install() {
- cp "${BUILD_DIR}"/kristall . || die
- emake -o kristall DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install
+ emake -o kristall DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
einstalldocs
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-client/kristall/
@ 2022-10-12 7:28 Anna Vyalkova
0 siblings, 0 replies; 4+ messages in thread
From: Anna Vyalkova @ 2022-10-12 7:28 UTC (permalink / raw
To: gentoo-commits
commit: f90767ad33cd6de8fcd7f9cdcc1b5363e874afd2
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Oct 12 07:28:10 2022 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Wed Oct 12 07:28:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f90767ad
net-client/kristall: fix deps
Closes: https://bugs.gentoo.org/876829
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-client/kristall/kristall-0.4.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net-client/kristall/kristall-0.4.ebuild b/net-client/kristall/kristall-0.4.ebuild
index 98748ddb1..e40cb59f8 100644
--- a/net-client/kristall/kristall-0.4.ebuild
+++ b/net-client/kristall/kristall-0.4.ebuild
@@ -30,7 +30,9 @@ RDEPEND="
dev-qt/qtwidgets:5
media-libs/libglvnd
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ dev-qt/qtsvg:5
+"
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-client/kristall/
@ 2022-10-19 1:43 Anna Vyalkova
0 siblings, 0 replies; 4+ messages in thread
From: Anna Vyalkova @ 2022-10-19 1:43 UTC (permalink / raw
To: gentoo-commits
commit: 569b89fae38536e9b20482a7ed7acb6c30c0ec5e
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Oct 19 01:34:37 2022 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Wed Oct 19 01:34:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=569b89fa
net-client/kristall: missing build dep
Closes: https://bugs.gentoo.org/877445
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-client/kristall/kristall-0.4.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-client/kristall/kristall-0.4.ebuild b/net-client/kristall/kristall-0.4.ebuild
index e40cb59f8..0dab9ee4f 100644
--- a/net-client/kristall/kristall-0.4.ebuild
+++ b/net-client/kristall/kristall-0.4.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-qt/qtsvg:5
"
+BDEPEND="dev-qt/linguist-tools:5"
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-19 1:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-30 21:02 [gentoo-commits] repo/proj/guru:dev commit in: net-client/kristall/ Anna Vyalkova
-- strict thread matches above, loose matches on Subject: below --
2022-10-10 17:38 Anna Vyalkova
2022-10-12 7:28 Anna Vyalkova
2022-10-19 1:43 Anna Vyalkova
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox