gentoo auto-resync : 19:09:2024 - 12:11:50

4 files changed, 213 insertions, 0 deletions

diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 213dac88f8fa..aec27eb5e643 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,5 +1,8 @@
+AUX denemo-2.6.0-fix-c99.patch 1134 BLAKE2B 6d385480782909c3a927f5c9bd1dfa539f331ac3ad923d5b82e63e58f4f52817a0ab5f51e9a6be4d86f5a5630cb4d1692465647f67e4cd515f4901590c8d8ffd SHA512 a598386ecac69307c5ae26431c38d9977d77ca2c5c1a8bce2a0601dd95b86416c89496c94b17b28534585a3e85b81f377bbf693a9a64d6a5597f77e94ef01dcd
+AUX denemo-2.6.0-incompatible-pointers.patch 1986 BLAKE2B fde324075064ce06d2e3cf13990472727eac34ed31bbd3305e6f96224d4d20d5aa1631ac7202fbc9e01498d226f0501e4b6c24319c9d72e7f2677641d2cf4d4d SHA512 ad5ebc22e96759b2d4d01c49101ee56a71fa6831fd5cdaf0252039d5c4a14c53aeb9eab1de0ee6402076317663e90d15c8c11556eeb2d11e700757adffe5b09c
 AUX denemo-2.6.0-respect-user-CFLAGS.patch 797 BLAKE2B 9ef79afe9fdda59e80e0a01e200408f97bf126ce2288807ae0f6e15ff80e31f2dee9bb973a0b1e8530df12acb1bedbe87b2fb1115b5920954f6144b880e1b1b8 SHA512 ae83ef7376618e411717b924247e907da4618b1b7cb56172ed17db1087b89295c4717c9dacc38fd3a9c482c2de9b54d8a54e9f6cb562a86296b8310ba6d56f01
 DIST denemo-2.6.0.tar.gz 17620623 BLAKE2B 55d142954834332a4bd5ca89125411181521d53f1a552b1397b16bbc51803cac3bc4eb0ffb309ababe2ad1b554e293d23102383aba95cde1cbb18cc96f9c6203 SHA512 9069c973624f05b53c62e5d8a9db5c2b4835ce3465402544d6a9f2a7d3bd617d79ac35c83940b37842a7a147bc2ee44ef33202bf7c107e739bfa303ffcf19738
+EBUILD denemo-2.6.0-r100.ebuild 3410 BLAKE2B 24e01cd7c8cf8d741de93a06f1345761a1f41c1f647fbc1fee7776b14a89d3a7955dc139b1d94dcee88b7c08e717dd4f0cf4eec80b6135c0b7ef51b89dcde22b SHA512 21e141b042777d51aa02c346d8cec0c61d65cb23580aa6110c8dc20b932dde81885d093c0df8318286109bb0b52d9df9588c722ee39a32071460817c2478e14b
 EBUILD denemo-2.6.0-r2.ebuild 3161 BLAKE2B 94ec6a21d7447a22e1476d4ecadb67746765a728e6ad1ab40d11247140b8da91eb3c3f79793d68d4290a3e66ce89c0d9eb8476a65faef2462c780e1c5e8a1d23 SHA512 abde1643178582f7644dd423363f2f56f03c7b167e6d8c709281f400a4babb4ef3abf3f600e1b64e8f850bc03144c752fd6dec62611fce56466c9452c4fa6ef7
 EBUILD denemo-2.6.0-r3.ebuild 3212 BLAKE2B 9e6bb848259e46fcc7d43dc0b036a237f2e112539a96fe39584971573369b030ee25fd11a487644373371d8074563037d009ddfc2d39ec086274e6632369e86e SHA512 c09f9246a3e39587d04d47fd5cfbb83fe9c1a33e915a9bc448a74362785ad4342dcd401cb08225f7cb858f6f9833f6fab54e406454b92a198fa62c74c1214748
 MISC metadata.xml 1331 BLAKE2B a6a5a632746ef42c5dd74c118aa78d602b20e476fc1ac3b432ddea1f4cd611c2874466786b2cae755a03cd9ac8bc4b0c24eb56a81473a8dd04cdb25fa9ce9d80 SHA512 394384a789b4c972d45785af5e5c28c0dc41b1e4af8de087ea4d4ff43e37cd44f96509157fb8172d1e8a849fcdf45366597101784b1264e4271565da0a1695df
diff --git a/media-sound/denemo/denemo-2.6.0-r100.ebuild b/media-sound/denemo/denemo-2.6.0-r100.ebuild
new file mode 100644
index 000000000000..5b89d259294e
--- /dev/null
+++ b/media-sound/denemo/denemo-2.6.0-r100.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 )
+inherit autotools font guile-single xdg
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# configure options currently not used:
+# --enable-mem(no) memory debugging: needs Electric fence (efence), which
+#		is not available in portage. See https://github.com/boundarydevices/efence
+# --enable-gtk-doc-pdf(no) doesn't work
+# fluidsynth currently broken. See https://savannah.gnu.org/bugs/index.php?62202
+IUSE="alsa +aubio debug jack gtk-doc nls +portaudio +portmidi
+	+rubberband test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${GUILE_REQUIRED_USE}"
+
+RDEPEND="
+	${GUILE_DEPS}
+	>=app-text/evince-3.22.1-r1:=
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	>=media-libs/libsndfile-1.0.28-r1
+	>=media-sound/fluidsynth-1.1.6-r1:=
+	>=media-sound/lilypond-2.24.4-r100
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0=
+	x11-libs/pango
+	alsa? ( >=media-libs/alsa-lib-1.1.2 )
+	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
+	jack? ( virtual/jack )
+	portaudio? (
+		>=media-libs/portaudio-19_pre20140130
+		sci-libs/fftw:3.0=
+	)
+	portmidi? ( media-libs/portmidi )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-build/gtk-doc-am-1.25-r1
+	>=dev-util/intltool-0.51.0-r1
+	app-alternatives/lex
+	virtual/pkgconfig
+	app-alternatives/yacc
+	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	nls? ( >=sys-devel/gettext-0.19.8.1 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.0-respect-user-CFLAGS.patch
+	"${FILESDIR}"/${PN}-2.6.0-fix-c99.patch
+	"${FILESDIR}"/${PN}-2.6.0-incompatible-pointers.patch
+)
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/org.denemo.Denemo.desktop || die
+	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
+		-i Makefile.am || die
+	guile-single_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--disable-gtk-doc-pdf
+		--disable-gtk2
+		--disable-installed-tests
+		--disable-mem
+		--disable-rpath
+		--disable-static
+		--enable-evince
+		--enable-fluidsynth
+		--enable-gtk3
+		--enable-x11
+		$(use_enable alsa)
+		$(use_enable aubio)
+		$(use_enable debug)
+		# --enable-doc does nothing for itself
+		# basic html documentation is always being installed in the
+		# /usr/share/denemo/manual directory
+		$(use_enable gtk-doc doc)
+		$(use_enable gtk-doc gtk-doc)
+		$(use_enable gtk-doc gtk-doc-html)
+		$(use_enable jack)
+		$(use_enable nls)
+		$(use_enable portaudio)
+		$(use_enable portmidi)
+		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# make check fails if used with parallel builds
+	emake -j1 check
+}
+
+src_install() {
+	guile-single_src_install
+
+	# link html documentation installed in /usr/share/denemo/manual
+	dodir /usr/share/doc/${PF}/html
+	local f
+	for f in denemo-manual.html denemo.css images; do
+		dosym -r /usr/share/denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+	done
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/media-sound/denemo/files/denemo-2.6.0-fix-c99.patch b/media-sound/denemo/files/denemo-2.6.0-fix-c99.patch
new file mode 100644
index 000000000000..8d1c30c895f2
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.6.0-fix-c99.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/927336
+https://savannah.gnu.org/bugs/?63720
+
+From 509906e7cc4669b525cbcb05022e7e10c6663627 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Fri, 27 Jan 2023 12:13:10 +0100
+Subject: [PATCH] Fix C99 support in sffile.c
+
+This fixes one -Wimplicit-function-declaration and one
+-Wimplicit-int warning, which will become errors in future
+compiler versions.
+
+Related to:
+
+  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
+  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
+--- a/libs/libsffile/sffile.c
++++ b/libs/libsffile/sffile.c
+@@ -20,6 +20,7 @@
+  *================================================================*/
+ //Interface to Denemo License:  FSF GPL version 3 or later
+ 
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -51,7 +52,7 @@ static void ConvertIllegalChar(char *name){
+ int  ParseSoundfont(char *soundfont, int index, char **name, int *preset, int *bank) {
+   FILE *fp;
+   static SFInfo sf;
+-  static initialized = FALSE;
++  static int initialized = FALSE;
+   int i;
+   int number = 0;
+   if(soundfont) {
+-- 
+2.39.1
+
diff --git a/media-sound/denemo/files/denemo-2.6.0-incompatible-pointers.patch b/media-sound/denemo/files/denemo-2.6.0-incompatible-pointers.patch
new file mode 100644
index 000000000000..28274e810eb9
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.6.0-incompatible-pointers.patch
@@ -0,0 +1,36 @@
+diff --git a/src/source/proof.c b/src/source/proof.c
+index f9a02bf0e..3b8f5fc82 100644
+--- a/src/source/proof.c
++++ b/src/source/proof.c
+@@ -280,7 +280,7 @@ press (EvView * view,  GdkEventButton  *event, EvDocumentModel *model)
+         infodialog (help_text);
+     nearest_annotation_text = NULL;
+     extern EvMappingList * ev_document_annotations_get_annotations();
+-    EvMappingList *mapping_list = ev_document_annotations_get_annotations (doc, ev_document_get_page(doc, i));
++    EvMappingList *mapping_list = ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS (doc), ev_document_get_page(doc, i));
+     if(mapping_list)
+     {
+     gdouble nearest = G_MAXDOUBLE;
+@@ -313,7 +313,7 @@ find_annotated_pages (EvDocumentModel *model)
+     for (i=0; i< ev_document_get_n_pages(doc);i++)
+         {
+             extern EvMappingList * ev_document_annotations_get_annotations();
+-            EvMappingList *mapping_list = ev_document_annotations_get_annotations (doc, ev_document_get_page(doc, i));
++            EvMappingList *mapping_list = ev_document_annotations_get_annotations (EV_DOCUMENT_ANNOTATIONS (doc), ev_document_get_page(doc, i));
+             if(mapping_list)
+             {
+              annotated_pages = g_list_append (annotated_pages, GINT_TO_POINTER(i));
+diff --git a/tests/integration.c b/tests/integration.c
+index f3aad7a1f..5910425e6 100644
+--- a/tests/integration.c
++++ b/tests/integration.c
+@@ -248,7 +248,7 @@ parse_dir_and_run_complex_test(gchar* path, const gchar* extension)
+   while(files){
+     filename = g_build_filename(path, files->data, NULL);
+     gchar* test_case_path = g_strdup_printf("%s-%d", test_case_path_fragment, test_case_path_counter);
+-    g_test_add (test_case_path, gchar*, filename, setup, test_open_save_complex_file, teardown);
++    g_test_add (test_case_path, void, filename, setup, test_open_save_complex_file, teardown);
+     g_free(test_case_path);
+     test_case_path_counter ++;
+     files = g_list_next(files);
+