commit: e3696b0c6edfd8b2b2eb19799f7c10d43f0610f2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> AuthorDate: Fri Apr 9 18:44:03 2021 +0000 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> CommitDate: Fri Apr 9 18:48:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3696b0c
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 <gentoo <AT> tastytea.de> .../kristall/files/kristall-0.3_add_flags.patch | 27 ++++++++++++++++++++++ ...kristall-9999.ebuild => kristall-0.3-r1.ebuild} | 4 +++- net-misc/kristall/kristall-9999.ebuild | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) 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 000000000..2fa9d2ce8 --- /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 <[email protected]> +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-9999.ebuild b/net-misc/kristall/kristall-0.3-r1.ebuild similarity index 88% copy from net-misc/kristall/kristall-9999.ebuild copy to net-misc/kristall/kristall-0.3-r1.ebuild index 2d6f83cf1..0d5efcd77 100644 --- a/net-misc/kristall/kristall-9999.ebuild +++ b/net-misc/kristall/kristall-0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 diff --git a/net-misc/kristall/kristall-9999.ebuild b/net-misc/kristall/kristall-9999.ebuild index 2d6f83cf1..3854bc55f 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
