From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1703185-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A29381580FD
for <garchives@archives.gentoo.org>; Thu, 26 Dec 2024 17:50:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CF5AAE07D8;
Thu, 26 Dec 2024 17:50:20 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B7FC1E07D8
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Dec 2024 17:50:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0AEB833BE26
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Dec 2024 17:50:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 311C2190F
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Dec 2024 17:50:17 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org>
Message-ID: <1735235312.89e3b5173c542d83854cc5999e6a431cb2d8a7e8.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mup/, media-sound/mup/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/mup/files/mup-6.9-fltk1.4.patch media-sound/mup/mup-6.9-r1.ebuild media-sound/mup/mup-6.9.ebuild
X-VCS-Directories: media-sound/mup/files/ media-sound/mup/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: 89e3b5173c542d83854cc5999e6a431cb2d8a7e8
X-VCS-Branch: master
Date: Thu, 26 Dec 2024 17:50:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 68a179f9-ef19-4667-9a10-2f255c4e9837
X-Archives-Hash: ccfb0f9248a58f46e0c47854b2260fa4
commit: 89e3b5173c542d83854cc5999e6a431cb2d8a7e8
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 07:25:41 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 17:48:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e3b517
media-sound/mup: add binding := to fltk & fix build with 1.4
1.4.x seems to have dropped some transitive includes, and this needs
to include what it uses.
:= due to new soname
Also cleanup lower bound, <1.3.0 is long gone.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-sound/mup/files/mup-6.9-fltk1.4.patch | 11 +++++++++++
media-sound/mup/{mup-6.9.ebuild => mup-6.9-r1.ebuild} | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/media-sound/mup/files/mup-6.9-fltk1.4.patch b/media-sound/mup/files/mup-6.9-fltk1.4.patch
new file mode 100644
index 000000000000..f01ebc012e5b
--- /dev/null
+++ b/media-sound/mup/files/mup-6.9-fltk1.4.patch
@@ -0,0 +1,11 @@
+Main.C:751:9: error: 'fl_register_images' was not declared ...
+--- a/src/mupmate/Main.C
++++ b/src/mupmate/Main.C
+@@ -68,6 +68,7 @@
+
+ #include <FL/Fl.H>
+ #include <FL/fl_ask.H>
++#include <FL/Fl_Shared_Image.H>
+ #include <FL/Fl_Tooltip.H>
+
+ #include "globals.H"
diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9-r1.ebuild
similarity index 94%
rename from media-sound/mup/mup-6.9.ebuild
rename to media-sound/mup/mup-6.9-r1.ebuild
index 64e1202d55d3..2f88bd35ad21 100644
--- a/media-sound/mup/mup-6.9.ebuild
+++ b/media-sound/mup/mup-6.9-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
media-libs/libpng:=
x11-libs/libX11
x11-libs/libXext
- >=x11-libs/fltk-1.3:1
+ x11-libs/fltk:1=
x11-libs/libXpm
"
DEPEND="
@@ -35,6 +35,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-6.9-build-system.patch
+ "${FILESDIR}"/${PN}-6.9-fltk1.4.patch
)
src_prepare() {