| 1 |
commit: e3696b0c6edfd8b2b2eb19799f7c10d43f0610f2 |
| 2 |
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> |
| 3 |
AuthorDate: Fri Apr 9 18:44:03 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Fri Apr 9 18:48:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3696b0c |
| 7 |
|
| 8 |
net-misc/kristall: Make it respect *FLAGS. |
| 9 |
|
| 10 |
The project uses make which then calls qmake, so we can't use |
| 11 |
qmake-utils unless we want to make ourselves a lot of work. Instead we |
| 12 |
initialize the QMAKE_*FLAGS variables ourselves. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/781692 |
| 15 |
|
| 16 |
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de> |
| 17 |
|
| 18 |
.../kristall/files/kristall-0.3_add_flags.patch | 27 ++++++++++++++++++++++ |
| 19 |
...kristall-9999.ebuild => kristall-0.3-r1.ebuild} | 4 +++- |
| 20 |
net-misc/kristall/kristall-9999.ebuild | 2 ++ |
| 21 |
3 files changed, 32 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/net-misc/kristall/files/kristall-0.3_add_flags.patch b/net-misc/kristall/files/kristall-0.3_add_flags.patch |
| 24 |
new file mode 100644 |
| 25 |
index 000000000..2fa9d2ce8 |
| 26 |
--- /dev/null |
| 27 |
+++ b/net-misc/kristall/files/kristall-0.3_add_flags.patch |
| 28 |
@@ -0,0 +1,27 @@ |
| 29 |
+From 9cec33fdbd7c7bb983d4562ccbb08adf5d7194ec Mon Sep 17 00:00:00 2001 |
| 30 |
+From: tastytea <tastytea@××××××××.de> |
| 31 |
+Date: Fri, 9 Apr 2021 19:54:34 +0200 |
| 32 |
+Subject: [PATCH] Add *FLAGS. |
| 33 |
+ |
| 34 |
+--- |
| 35 |
+ src/kristall.pro | 4 ++++ |
| 36 |
+ 1 file changed, 4 insertions(+) |
| 37 |
+ |
| 38 |
+diff --git a/src/kristall.pro b/src/kristall.pro |
| 39 |
+index 2a8b21e..4193c57 100644 |
| 40 |
+--- a/src/kristall.pro |
| 41 |
++++ b/src/kristall.pro |
| 42 |
+@@ -19,6 +19,10 @@ LIBS += -lcrypto |
| 43 |
+ # We need iconv on non-linux platforms |
| 44 |
+ !linux: LIBS += -liconv |
| 45 |
+ |
| 46 |
++QMAKE_CFLAGS = $$(CFLAGS) |
| 47 |
++QMAKE_CXXFLAGS = $$(CXXFLAGS) |
| 48 |
++QMAKE_LFLAGS = $$(LDFLAGS) |
| 49 |
++ |
| 50 |
+ QMAKE_CFLAGS += -Wno-unused-parameter -Werror=return-type |
| 51 |
+ QMAKE_CXXFLAGS += -Wno-unused-parameter -Werror=return-type |
| 52 |
+ |
| 53 |
+-- |
| 54 |
+2.26.3 |
| 55 |
+ |
| 56 |
|
| 57 |
diff --git a/net-misc/kristall/kristall-9999.ebuild b/net-misc/kristall/kristall-0.3-r1.ebuild |
| 58 |
similarity index 88% |
| 59 |
copy from net-misc/kristall/kristall-9999.ebuild |
| 60 |
copy to net-misc/kristall/kristall-0.3-r1.ebuild |
| 61 |
index 2d6f83cf1..0d5efcd77 100644 |
| 62 |
--- a/net-misc/kristall/kristall-9999.ebuild |
| 63 |
+++ b/net-misc/kristall/kristall-0.3-r1.ebuild |
| 64 |
@@ -1,4 +1,4 @@ |
| 65 |
-# Copyright 2020 Gentoo Authors |
| 66 |
+# Copyright 2020-2021 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
EAPI=7 |
| 70 |
@@ -27,6 +27,8 @@ RDEPEND=" |
| 71 |
DEPEND="${RDEPEND}" |
| 72 |
BDEPEND="dev-qt/qtcore" # qmake |
| 73 |
|
| 74 |
+PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) |
| 75 |
+ |
| 76 |
src_install() { |
| 77 |
emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install |
| 78 |
einstalldocs |
| 79 |
|
| 80 |
diff --git a/net-misc/kristall/kristall-9999.ebuild b/net-misc/kristall/kristall-9999.ebuild |
| 81 |
index 2d6f83cf1..3854bc55f 100644 |
| 82 |
--- a/net-misc/kristall/kristall-9999.ebuild |
| 83 |
+++ b/net-misc/kristall/kristall-9999.ebuild |
| 84 |
@@ -27,6 +27,8 @@ RDEPEND=" |
| 85 |
DEPEND="${RDEPEND}" |
| 86 |
BDEPEND="dev-qt/qtcore" # qmake |
| 87 |
|
| 88 |
+PATCHES=( "${FILESDIR}/${PN}-0.3_add_flags.patch" ) |
| 89 |
+ |
| 90 |
src_install() { |
| 91 |
emake DESTDIR="${D}" INSTALL="install -D" PREFIX="${EPREFIX}/usr" install |
| 92 |
einstalldocs |
Archives