| 1 |
commit: 1904268464d4b62467b7ab754164b2f7784e031f |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 22:37:33 2020 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 27 22:37:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19042684 |
| 7 |
|
| 8 |
app-cdr/isomaster: Fix compilation + EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706662 |
| 11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 13 |
|
| 14 |
.../files/isomaster-1.3.14-include-path.patch | 25 ++++++++++++++++++++++ |
| 15 |
app-cdr/isomaster/isomaster-1.3.14.ebuild | 8 +++++-- |
| 16 |
2 files changed, 31 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..520a355e595 |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch |
| 23 |
@@ -0,0 +1,25 @@ |
| 24 |
+From 50113aa660d2a867f3f8bfd67e1ba601c8b5294a Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
| 26 |
+Date: Mon, 27 Jan 2020 23:33:49 +0100 |
| 27 |
+Subject: [PATCH] Add missing (Gentoo specific) include path for iniparser 4 |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ Makefile | 2 +- |
| 31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 32 |
+ |
| 33 |
+diff --git a/Makefile b/Makefile |
| 34 |
+index 8f4f23b..124a035 100644 |
| 35 |
+--- a/Makefile |
| 36 |
++++ b/Makefile |
| 37 |
+@@ -65,7 +65,7 @@ CPPFLAGS += -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_E |
| 38 |
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64 |
| 39 |
+ |
| 40 |
+ ifdef USE_SYSTEM_INIPARSER |
| 41 |
+-CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) |
| 42 |
++CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) -I/usr/include/iniparser4 |
| 43 |
+ endif |
| 44 |
+ |
| 45 |
+ OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o |
| 46 |
+-- |
| 47 |
+2.24.1 |
| 48 |
+ |
| 49 |
|
| 50 |
diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild |
| 51 |
index c30620f0aa1..cbe941cb2b9 100644 |
| 52 |
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild |
| 53 |
+++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild |
| 54 |
@@ -1,7 +1,7 @@ |
| 55 |
-# Copyright 1999-2018 Gentoo Foundation |
| 56 |
+# Copyright 1999-2020 Gentoo Authors |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
|
| 59 |
-EAPI=6 |
| 60 |
+EAPI=7 |
| 61 |
|
| 62 |
inherit toolchain-funcs xdg-utils |
| 63 |
|
| 64 |
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND} |
| 65 |
virtual/pkgconfig |
| 66 |
nls? ( >=sys-devel/gettext-0.19.1 )" # bug 512448 |
| 67 |
|
| 68 |
+PATCHES=( |
| 69 |
+ "${FILESDIR}"/${P}-include-path.patch |
| 70 |
+) |
| 71 |
+ |
| 72 |
pkg_setup() { |
| 73 |
myisoconf=( |
| 74 |
DEFAULT_EDITOR=leafpad |
Archives