From 721e451ec418e1712f6962404e111f0ebd487389 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 27 Dec 2024 06:30:35 +0000
Subject: gentoo auto-resync : 27:12:2024 - 06:30:34

---
 media-sound/mup/Manifest                    |  3 +-
 media-sound/mup/files/mup-6.9-fltk1.4.patch | 11 ++++++
 media-sound/mup/mup-6.9-r1.ebuild           | 55 +++++++++++++++++++++++++++++
 media-sound/mup/mup-6.9.ebuild              | 54 ----------------------------
 4 files changed, 68 insertions(+), 55 deletions(-)
 create mode 100644 media-sound/mup/files/mup-6.9-fltk1.4.patch
 create mode 100644 media-sound/mup/mup-6.9-r1.ebuild
 delete mode 100644 media-sound/mup/mup-6.9.ebuild

(limited to 'media-sound/mup')

diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 6b713ba88e84..e8a3dde3635b 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,4 +1,5 @@
 AUX mup-6.9-build-system.patch 6205 BLAKE2B f944b6dab3d206dc5fae2c5f08c36bc24310094c5cf9f7ab15098a2ace87d2bb5863eb08f254d0c2e34d0ec2e1c3eaf18f7e6e0161f6829b74fd56d1edbfd7bd SHA512 3a26e09748e89857a8f30c7b3d0fc567e46cb7494148467cac491cc0ccea4aaef25bc7364fe808931000321489a09101d357d996daa24b477c693b4e4b20a329
+AUX mup-6.9-fltk1.4.patch 262 BLAKE2B c7dd775ed69eba1893f80778384dc292974a9eebe59a10f0335bbaea8a774bd9f4bed03ea67ce34f3c770ad8c46a25d63d75150d88249e5ee752aefb62ac66cf SHA512 db567d76bd9f654b6e7226df0ac3701d228dcdaf126e8b3bc4886ed40b976f94bfb2907c8c192bc0b1881c7bfc7b0d88c83f7a88f9f905fbbb5f7a1fba0d8ff8
 DIST mup69src.tar.gz 3062560 BLAKE2B cb7456fe52f85a122106675372a5ffabe9466086e730cbb15dbb590ea2485ecfc34e52d8b8c7c3a583d98e4e8e352be07a203e41da38cd145adf11cdf59bad92 SHA512 b3b49177e12b6a8dbd711e88a327826b60e4141a0720c1be4900af2124ac29592572d866d98f2a5b8318fb008fb035371ad83f152601bf22d98a3e7568ecfe95
-EBUILD mup-6.9.ebuild 956 BLAKE2B 76fdff29409452262ad366b2258f72adcb8abd1b0006cc06f628e19a8ced7822aed1037f5462cfa72bf5d2128310b739496af74ebb82d5721f54b3ed2e06b59a SHA512 a0d701144caa628a17640f40312dec33e7c2e1fb24fd92af3d64afd91d5ddb6fd74ef35d8347295e36bce76d9c8e3e81076e2e602ee318e278bfb52cadaddecd
+EBUILD mup-6.9-r1.ebuild 990 BLAKE2B aedaa4f886de12dd24830c1e1c6797e90a5d9b119e51871fab8bbafe9c4a81436b6738633d01dae5f683d90ab9fc6c44b934445820ca8b6a6fdca61594d773a6 SHA512 7b7407059dffc194506fdba89bce5ac9e1b88267436b10fa1cca9a5e6c000119a74e6a92a798d65fdbbe8f3d20713e74e787b4ebd86367936597e3e70590e480
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
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-r1.ebuild b/media-sound/mup/mup-6.9-r1.ebuild
new file mode 100644
index 000000000000..2f88bd35ad21
--- /dev/null
+++ b/media-sound/mup/mup-6.9-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Program for printing music scores"
+HOMEPAGE="http://www.arkkra.com/"
+SRC_URI="http://www.arkkra.com/ftp/pub/unix/mup${PV//.}src.tar.gz
+	ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
+
+LICENSE="Arkkra"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/fltk:1=
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/ghostscript-gpl
+	media-libs/netpbm
+	sys-apps/groff
+	app-alternatives/yacc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.9-build-system.patch
+	"${FILESDIR}"/${PN}-6.9-fltk1.4.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_compile() {
+	emake -j1 CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc README
+}
diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9.ebuild
deleted file mode 100644
index 64e1202d55d3..000000000000
--- a/media-sound/mup/mup-6.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Program for printing music scores"
-HOMEPAGE="http://www.arkkra.com/"
-SRC_URI="http://www.arkkra.com/ftp/pub/unix/mup${PV//.}src.tar.gz
-	ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
-
-LICENSE="Arkkra"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/fltk-1.3:1
-	x11-libs/libXpm
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	app-text/ghostscript-gpl
-	media-libs/netpbm
-	sys-apps/groff
-	app-alternatives/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.9-build-system.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_compile() {
-	emake -j1 CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc README
-}
-- 
cgit v1.2.3