From e3696b0c6edfd8b2b2eb19799f7c10d43f0610f2 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 9 Apr 2021 20:44:03 +0200 Subject: [PATCH] net-misc/kristall: Make it respect *FLAGS. The project uses make which then calls qmake, so we can't use qmake-utils unless we want to make ourselves a lot of work. Instead we initialize the QMAKE_*FLAGS variables ourselves. Closes: https://bugs.gentoo.org/781692 Signed-off-by: Ronny (tastytea) Gutbrod --- .../files/kristall-0.3_add_flags.patch | 27 ++++++++++++++ net-misc/kristall/kristall-0.3-r1.ebuild | 35 +++++++++++++++++++ net-misc/kristall/kristall-9999.ebuild | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 net-misc/kristall/files/kristall-0.3_add_flags.patch create mode 100644 net-misc/kristall/kristall-0.3-r1.ebuild diff --git a/net-misc/kristall/files/kristall-0.3_add_flags.patch b/net-misc/kristall/files/kristall-0.3_add_flags.patch new file mode 100644 index 0000000000..2fa9d2ce80 --- /dev/null +++ b/net-misc/kristall/files/kristall-0.3_add_flags.patch @@ -0,0 +1,27 @@ +From 9cec33fdbd7c7bb983d4562ccbb08adf5d7194ec Mon Sep 17 00:00:00 2001 +From: tastytea +Date: Fri, 9 Apr 2021 19:54:34 +0200 +Subject: [PATCH] Add *FLAGS. + +--- + src/kristall.pro | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/kristall.pro b/src/kristall.pro +index 2a8b21e..4193c57 100644 +--- a/src/kristall.pro ++++ b/src/kristall.pro +@@ -19,6 +19,10 @@ LIBS += -lcrypto + # We need iconv on non-linux platforms + !linux: LIBS += -liconv + ++QMAKE_CFLAGS = $$(CFLAGS) ++QMAKE_CXXFLAGS = $$(CXXFLAGS) ++QMAKE_LFLAGS = $$(LDFLAGS) ++ + QMAKE_CFLAGS += -Wno-unused-parameter -Werror=return-type + QMAKE_CXXFLAGS += -Wno-unused-parameter -Werror=return-type + +-- +2.26.3 + diff --git a/net-misc/kristall/kristall-0.3-r1.ebuild b/net-misc/kristall/kristall-0.3-r1.ebuild new file mode 100644 index 0000000000..0d5efcd772 --- /dev/null +++ b/net-misc/kristall/kristall-0.3-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit 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" +else + SRC_URI="https://github.com/MasterQ32/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND=" + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtsvg:5 + dev-qt/qtnetwork:5[ssl] +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/qtcore" # qmake + +PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) + +src_install() { + emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install + einstalldocs +} diff --git a/net-misc/kristall/kristall-9999.ebuild b/net-misc/kristall/kristall-9999.ebuild index 2d6f83cf1b..3854bc55fa 100644 --- a/net-misc/kristall/kristall-9999.ebuild +++ b/net-misc/kristall/kristall-9999.ebuild @@ -27,6 +27,8 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="dev-qt/qtcore" # qmake +PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) + src_install() { emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install einstalldocs