From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50495138350 for ; Mon, 27 Jan 2020 22:38:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3525E08AB; Mon, 27 Jan 2020 22:38:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85927E08AB for ; Mon, 27 Jan 2020 22:38:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 083DA34E4D6 for ; Mon, 27 Jan 2020 22:38:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51D908F for ; Mon, 27 Jan 2020 22:38:29 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1580164670.1904268464d4b62467b7ab754164b2f7784e031f.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-cdr/isomaster/, app-cdr/isomaster/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch app-cdr/isomaster/isomaster-1.3.14.ebuild X-VCS-Directories: app-cdr/isomaster/files/ app-cdr/isomaster/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 1904268464d4b62467b7ab754164b2f7784e031f X-VCS-Branch: master Date: Mon, 27 Jan 2020 22:38:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: efce5233-75f1-49ff-aa2a-6b6c5d2a780a X-Archives-Hash: 28b892fde0d02384c72c872a0ac54f50 commit: 1904268464d4b62467b7ab754164b2f7784e031f Author: Sebastian Pipping gentoo org> AuthorDate: Mon Jan 27 22:37:33 2020 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon Jan 27 22:37:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19042684 app-cdr/isomaster: Fix compilation + EAPI 7 Closes: https://bugs.gentoo.org/706662 Signed-off-by: Sebastian Pipping gentoo.org> Package-Manager: Portage-2.3.84, Repoman-2.3.20 .../files/isomaster-1.3.14-include-path.patch | 25 ++++++++++++++++++++++ app-cdr/isomaster/isomaster-1.3.14.ebuild | 8 +++++-- 2 files changed, 31 insertions(+), 2 deletions(-) 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 new file mode 100644 index 00000000000..520a355e595 --- /dev/null +++ b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch @@ -0,0 +1,25 @@ +From 50113aa660d2a867f3f8bfd67e1ba601c8b5294a Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Mon, 27 Jan 2020 23:33:49 +0100 +Subject: [PATCH] Add missing (Gentoo specific) include path for iniparser 4 + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8f4f23b..124a035 100644 +--- a/Makefile ++++ b/Makefile +@@ -65,7 +65,7 @@ CPPFLAGS += -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_E + CPPFLAGS += -D_FILE_OFFSET_BITS=64 + + ifdef USE_SYSTEM_INIPARSER +-CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) ++CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) -I/usr/include/iniparser4 + endif + + OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o +-- +2.24.1 + diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild index c30620f0aa1..cbe941cb2b9 100644 --- a/app-cdr/isomaster/isomaster-1.3.14.ebuild +++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs xdg-utils @@ -20,6 +20,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.1 )" # bug 512448 +PATCHES=( + "${FILESDIR}"/${P}-include-path.patch +) + pkg_setup() { myisoconf=( DEFAULT_EDITOR=leafpad