commit: fd87064a2a88cc9b1f538db8669b3be45b72d52b Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Tue Nov 2 19:55:35 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Fri Nov 12 13:03:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd87064a
media-sound/denemo: drop old 2.3.0 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/22799 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> media-sound/denemo/Manifest | 1 - media-sound/denemo/denemo-2.3.0-r1.ebuild | 118 --------------------- ...0001-configure.ac-patch-to-find-guile-2.2.patch | 80 -------------- ...002-Fix-issues-with-gcc10-fno-common-flag.patch | 62 ----------- 4 files changed, 261 deletions(-) diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest index da88503c97c..e7896553c53 100644 --- a/media-sound/denemo/Manifest +++ b/media-sound/denemo/Manifest @@ -1,2 +1 @@ -DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e diff --git a/media-sound/denemo/denemo-2.3.0-r1.ebuild b/media-sound/denemo/denemo-2.3.0-r1.ebuild deleted file mode 100644 index 8c30d94ce54..00000000000 --- a/media-sound/denemo/denemo-2.3.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools 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 -IUSE="alsa +aubio debug jack +fluidsynth gtk-doc nls +portaudio +portmidi - +rubberband test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-text/evince-3.22.1-r1:= - dev-libs/libxml2:2 - >=dev-scheme/guile-2:12= - gnome-base/librsvg:2 - media-libs/fontconfig:1.0 - >=media-libs/libsmf-1.3 - >=media-libs/libsndfile-1.0.28-r1 - >=media-sound/lilypond-2.19.54[guile2(+)] - x11-libs/gtk+:3 - x11-libs/gtksourceview:3.0= - alsa? ( >=media-libs/alsa-lib-1.1.2 ) - aubio? ( >=media-libs/aubio-0.4.1-r1:= ) - fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= ) - jack? ( virtual/jack ) - portaudio? ( - >=media-libs/portaudio-19_pre20140130 - sci-libs/fftw:3.0= - ) - portmidi? ( >=media-libs/portmidi-217-r1 ) - rubberband? ( >=media-libs/rubberband-1.8.1-r1 ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - >=dev-util/gtk-doc-am-1.25-r1 - >=dev-util/intltool-0.51.0-r1 - >=sys-devel/flex-2.6.1 - virtual/pkgconfig - virtual/yacc - gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 ) - nls? ( >=sys-devel/gettext-0.19.8.1 ) -" - -DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS ) - -PATCHES=( - "${FILESDIR}/${P}-0001-configure.ac-patch-to-find-guile-2.2.patch" - "${FILESDIR}/${P}-0002-Fix-issues-with-gcc10-fno-common-flag.patch" -) - -src_prepare() { - sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die - sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \ - -i Makefile.am || die - default - eautoreconf -} - -src_configure() { - myeconfargs=( - --disable-gtk-doc-pdf - --disable-gtk2 - --disable-installed-tests - --disable-mem - --disable-rpath - --disable-static - --enable-evince - --enable-gtk3 - --enable-x11 - $(use_enable alsa) - $(use_enable aubio) - # --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 fluidsynth) - $(use_enable jack) - $(use_enable nls) - $(use_enable portaudio) - $(use_enable portmidi) - $(use_enable rubberband) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # make check fails if used with parallel builds - emake -j1 check -} - -src_install() { - default - - # 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 ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}" - done -} diff --git a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch deleted file mode 100644 index 982ccfade86..00000000000 --- a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 9a515060df9024ef64bce2055fd3f2ceada5efa8 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <[email protected]> -Date: Wed, 14 Aug 2019 13:51:32 +0200 -Subject: [PATCH] configure.ac: patch to find guile-2.2 - -The patch uses the GUILE_PKG command to find any installed -version of guile instead of explicitly checking for guile-1.8 -and guile-2.0 but missing guile-2.2. -This patch was already provided to upstream with denemo-2.2, but -didn't yet get accepted due to not being able to compile the -Windows version with this patch (cf. http://savannah.gnu.org/bugs/?54821) - -Signed-off-by: Bernd Waibel <[email protected]> ---- - configure.ac | 41 +++-------------------------------------- - 1 file changed, 3 insertions(+), 38 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f85b74e..1fc0af0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,10 @@ AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_YACC - AM_PROG_LEX -+GUILE_PKG - GUILE_FLAGS -+CFLAGS="$CFLAGS $GUILE_CFLAGS" -+LIBS="$LIBS $GUILE_LIBS" - - AC_PROG_LIBTOOL - -@@ -63,44 +66,6 @@ AS_COMPILER_FLAG([-fdiagnostics-color=auto], - - AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"]) - --AC_ARG_ENABLE( -- guile_1_8, -- AS_HELP_STRING([--enable-guile_1_8], [use GUILE_1_8 @<:@default=no@:>@]), -- [ -- if test "x$enableval" != "xno"; then -- useguile_1_8=yes -- PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8) -- LIBS="$LIBS $GUILE_1_8_LIBS" -- CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS" -- fi -- ], [ useguile_1_8=no ]) -- --AC_ARG_ENABLE( -- guile_2_0, -- AS_HELP_STRING([--enable-guile_2_0], [use GUILE_2_0 @<:@default=no@:>@]), -- [ -- if test "x$enableval" != "xno"; then -- useguile_2_0=yes -- PKG_CHECK_MODULES(GUILE_2, guile-2.0 >= 2.0) -- LIBS="$LIBS $GUILE_2_LIBS" -- CFLAGS="$CFLAGS $GUILE_2_CFLAGS" -- fi -- ], [ useguile_2_0=no ]) -- --if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"]; then -- PKG_CHECK_MODULES([GUILE_2], [guile-2.0], useguile_2_0=yes, useguile_2_0=no) -- LIBS="$LIBS $GUILE_2_LIBS" -- CFLAGS="$CFLAGS $GUILE_2_CFLAGS" -- if test "x$useguile_2_0" = "xno"; then -- PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8) -- LIBS="$LIBS $GUILE_1_8_LIBS" -- CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS" -- useguile_1_8=yes -- else -- useguile_2_0=yes -- fi --fi -- - PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30]) - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" --- -2.22.0 - diff --git a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch b/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch deleted file mode 100644 index 425662e042c..00000000000 --- a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 54075086a5b7acceef6dff41e19148778e285475 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <[email protected]> -Date: Fri, 20 Mar 2020 21:03:02 +0100 -Subject: [PATCH] Fix issues with gcc10 -fno-common flag - -Signed-off-by: Bernd Waibel <[email protected]> ---- - include/denemo/denemo_types.h | 7 ++++--- - src/export/print.h | 6 +++--- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/include/denemo/denemo_types.h b/include/denemo/denemo_types.h -index 1d67827..936892b 100644 ---- a/include/denemo/denemo_types.h -+++ b/include/denemo/denemo_types.h -@@ -430,7 +430,7 @@ typedef enum{ - } SCRIPT_TYPE; - - //index of columns in the keymap command list store FIXME if you add columns you must add them in allocate_keymap !!!! --enum -+typedef enum - { - COL_TYPE = 0, - COL_NAME, -@@ -1167,7 +1167,7 @@ struct cs_callback - * The (singleton) root object for the program - * - */ --struct DenemoRoot -+typedef struct DenemoRoot - { - gboolean non_interactive; /* if TRUE denemo should not display project, receive or send sounds etc*/ - gchar *scheme_file;/* filename for scheme code to run on startup */ -@@ -1258,6 +1258,7 @@ struct DenemoRoot - gboolean *silent; /** Don't log any message */ - gboolean *verbose; /** Display every messages */ - guint pending_layout_id;//Non zero when the current layout being created will be renamed to have this id --} Denemo; /**< The root object. */ -+}; -+extern struct DenemoRoot Denemo; /**< The root object. */ - - #endif -diff --git a/src/export/print.h b/src/export/print.h -index db0c8f1..64a3a8d 100644 ---- a/src/export/print.h -+++ b/src/export/print.h -@@ -108,9 +108,9 @@ typedef struct WysiwygInfo - GtkWidget *dialog; //an info dialog to tell the user what to do next... - } WysiwygInfo; - --gint LilyPond_stderr; //A file descriptor to pipe for LilyPond's stderr --GError *lily_err; --GPid previewerpid; -+extern gint LilyPond_stderr; //A file descriptor to pipe for LilyPond's stderr -+extern GError *lily_err; -+extern GPid previewerpid; - - WysiwygInfo* get_wysiwyg_info(); - void initialize_print_status (void); --- -2.25.1 -
