* [gentoo-commits] repo/gentoo:master commit in: media-sound/denemo/files/, media-sound/denemo/
@ 2019-08-17 15:35 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2019-08-17 15:35 UTC (permalink / raw
To: gentoo-commits
commit: 46af22f0c24778870b6f2a4f52702c1e9a32fe38
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Wed Aug 14 13:32:05 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 15:34:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46af22f0
media-sound/denemo: bump to version 2.3.0
- bump to EAPI=7
- inherit xdg instead of xdg-utils
- rename doc USE flag to gtk-doc
- add subslot modifier for media-libs/aubio and media-sound/fluidsynth
The bug below blocks this update for multilib machines and needs to be
merged first!
Bug: https://bugs.gentoo.org/691274
Closes: https://bugs.gentoo.org/691920
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12704
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-sound/denemo/Manifest | 1 +
media-sound/denemo/denemo-2.3.0.ebuild | 122 +++++++++++++++++++++
...0001-configure.ac-patch-to-find-guile-2.2.patch | 80 ++++++++++++++
3 files changed, 203 insertions(+)
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index ea8a1e53296..43707e3a159 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1 +1,2 @@
DIST denemo-2.2.0.tar.gz 17032009 BLAKE2B 66732fcdaa5d5119ca2a45e5a8c6829e05092a4f0e18e3c8a991bddaaf863ea05889654af47150650d2c67397afa957de0fc3ce0ada86a22be00ae91d4add993 SHA512 74bef7b888abd86db42cee7ecb404e1b9211f9965207366c99980137194acd2afa6ec8b1c18da8a12fe4c6951d8a1bb873b313f5749ea629bb7eaeedf12368ef
+DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
diff --git a/media-sound/denemo/denemo-2.3.0.ebuild b/media-sound/denemo/denemo-2.3.0.ebuild
new file mode 100644
index 00000000000..6bc0a16e994
--- /dev/null
+++ b/media-sound/denemo/denemo-2.3.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 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 +evince jack +fluidsynth gtk-doc +gtk3 nls +portaudio
+ +portmidi +rubberband static test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ 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]
+ alsa? ( >=media-libs/alsa-lib-1.1.2 )
+ aubio? ( >=media-libs/aubio-0.4.1-r1:= )
+ evince? ( >=app-text/evince-3.22.1-r1:= )
+ fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= )
+ gtk3? (
+ x11-libs/gtk+:3
+ x11-libs/gtksourceview:3.0=
+ )
+ !gtk3? (
+ x11-libs/gtk+:2
+ x11-libs/gtksourceview:2.0
+ )
+ 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/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 )
+"
+
+REQUIRED_USE="
+ evince? ( gtk3 )
+"
+
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+PATCHES=(
+ "${FILESDIR}/${P}-0001-configure.ac-patch-to-find-guile-2.2.patch"
+)
+
+src_prepare() {
+ sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ myeconfargs=(
+ --disable-gtk-doc-pdf
+ --disable-installed-tests
+ --disable-mem
+ --disable-rpath
+ --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 evince)
+ $(use_enable fluidsynth)
+ $(use_enable jack)
+ $(use_enable nls)
+ $(use_enable portaudio)
+ $(use_enable portmidi)
+ $(use_enable rubberband)
+ $(use_enable static)
+ $(usex gtk3 --enable-gtk3 --enable-gtk2)
+ )
+ 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
new file mode 100644
index 00000000000..982ccfade86
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
@@ -0,0 +1,80 @@
+From 9a515060df9024ef64bce2055fd3f2ceada5efa8 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+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 <waebbl@gmail.com>
+---
+ 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
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/denemo/files/, media-sound/denemo/
@ 2020-02-16 14:51 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-02-16 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 068f29aaa499a75e88ae91549ae34895a3cc5f28
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 14:50:41 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 14:51:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068f29aa
media-sound/denemo: Drop 2.2.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/denemo/Manifest | 1 -
media-sound/denemo/denemo-2.2.0.ebuild | 127 ---------------------
.../denemo/files/denemo-2.2.0-find-guile-2.2.patch | 60 ----------
.../files/denemo-2.2.0-no-portaudio-fix.patch | 29 -----
media-sound/denemo/metadata.xml | 3 -
5 files changed, 220 deletions(-)
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 43707e3a159..325037566a5 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,2 +1 @@
-DIST denemo-2.2.0.tar.gz 17032009 BLAKE2B 66732fcdaa5d5119ca2a45e5a8c6829e05092a4f0e18e3c8a991bddaaf863ea05889654af47150650d2c67397afa957de0fc3ce0ada86a22be00ae91d4add993 SHA512 74bef7b888abd86db42cee7ecb404e1b9211f9965207366c99980137194acd2afa6ec8b1c18da8a12fe4c6951d8a1bb873b313f5749ea629bb7eaeedf12368ef
DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
diff --git a/media-sound/denemo/denemo-2.2.0.ebuild b/media-sound/denemo/denemo-2.2.0.ebuild
deleted file mode 100644
index be5092be45e..00000000000
--- a/media-sound/denemo/denemo-2.2.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools xdg-utils
-
-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 +evince doc jack +fluidsynth +gtk3 nls +portaudio
- +portmidi +rubberband static test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- 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]
- alsa? ( >=media-libs/alsa-lib-1.1.2 )
- aubio? ( >=media-libs/aubio-0.4.1-r1 )
- evince? ( >=app-text/evince-3.22.1-r1:= )
- fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1 )
- gtk3? (
- x11-libs/gtk+:3
- x11-libs/gtksourceview:3.0=
- )
- !gtk3? (
- x11-libs/gtk+:2
- x11-libs/gtksourceview:2.0
- )
- 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}
- >=dev-util/intltool-0.51.0-r1
- >=sys-devel/flex-2.6.1
- virtual/pkgconfig
- virtual/yacc
- doc? ( >=dev-util/gtk-doc-1.25-r1 )
- nls? ( >=sys-devel/gettext-0.19.8.1 )"
-
-REQUIRED_USE="
- evince? ( gtk3 )
-"
-
-DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
-
-PATCHES=(
- "${FILESDIR}/${P}-no-portaudio-fix.patch"
- "${FILESDIR}/${P}-find-guile-2.2.patch"
-)
-
-src_prepare() {
- sed -i -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' pixmaps/denemo.desktop || die
- default
- eautoreconf
-}
-
-src_configure() {
- myeconfargs=(
- --disable-gtk-doc-pdf
- --disable-installed-tests
- --disable-mem
- --disable-rpath
- --enable-x11
- $(use_enable alsa)
- $(use_enable aubio)
- # --enable-doc does nothing for itself
- $(use_enable doc)
- $(use_enable doc gtk-doc)
- $(use_enable doc gtk-doc-html)
- $(use_enable evince)
- $(use_enable fluidsynth)
- $(use_enable jack)
- $(use_enable nls)
- $(use_enable portaudio)
- $(use_enable portmidi)
- $(use_enable rubberband)
- $(use_enable static)
- $(usex gtk3 --enable-gtk3 --enable-gtk2)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # make check fails if used with parallel builds
- emake -j1 check
-}
-
-src_install() {
- DESTDIR="${D}" emake install
- einstalldocs
-
- # link html documentation installed in /usr/share/denemo
- 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
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch
deleted file mode 100644
index d69edb0173d..00000000000
--- a/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4bb3afa..9c146ad 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
-
-@@ -40,44 +43,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])
-- 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"
diff --git a/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch b/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch
deleted file mode 100644
index a4aa60909de..00000000000
--- a/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2e3c3b974e3e27873841c0ad9a05537a682e85f5 Mon Sep 17 00:00:00 2001
-From: Richard Shann <richard@rshann.plus.com>
-Date: Sat, 30 Dec 2017 15:32:35 +0000
-Subject: [PATCH 1/2] Fix bug #52741: Can't build with --disable-portaudio
-
----
-src/audio/midi.c | 7 +++++++
-1 file changed, 7 insertions(+)
-
-diff --git a/src/audio/midi.c b/src/audio/midi.c
-index 55683cfe3..71c5df2cd 100644
---- a/src/audio/midi.c
-+++ b/src/audio/midi.c
-@@ -29,6 +29,13 @@
-
- #define SHAVING (0.01) //seconds to shave off a note start time to ensure stopping before noteon is sent, and starting with noteon first note may depend of speed of machine??? FIXME
-
-+#ifndef _HAVE_PORTAUDIO_
-+gdouble get_playback_speed (void)
-+{
-+ return 1.0;
-+}
-+void set_playback_speed (double speed) {}
-+#endif
-
- static volatile gboolean playing = FALSE;
-
---
-2.11.0
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index ef9a91fa02d..b94e07a7736 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -20,9 +20,6 @@
<flag name="aubio">
Enable <pkg>media-libs/aubio</pkg> support
</flag>
- <flag name="doc">
- Use <pkg>dev-util/gtk-doc</pkg> to build documentation in html format
- </flag>
<flag name="evince">
Use <pkg>app-text/evince</pkg> document viewer
</flag>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/denemo/files/, media-sound/denemo/
@ 2020-03-21 18:56 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-03-21 18:56 UTC (permalink / raw
To: gentoo-commits
commit: a263403b279157c6b8e2e5b84904f66372bac05c
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Fri Mar 20 21:35:36 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 18:55:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a263403b
media-sound/denemo: fix build for gcc-10
- add patches to work with gcc-10 -fno-common flag
- install appdata/metainfo into new recommended location
- remove support for gtk2
- make gtk3 non-optional
- remove static USE flag
Closes: https://bugs.gentoo.org/712926
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15029
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/denemo/denemo-2.3.0-r1.ebuild | 118 +++++++++++++++++++++
...002-Fix-issues-with-gcc10-fno-common-flag.patch | 62 +++++++++++
2 files changed, 180 insertions(+)
diff --git a/media-sound/denemo/denemo-2.3.0-r1.ebuild b/media-sound/denemo/denemo-2.3.0-r1.ebuild
new file mode 100644
index 00000000000..4924eed2857
--- /dev/null
+++ b/media-sound/denemo/denemo-2.3.0-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 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-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
new file mode 100644
index 00000000000..425662e042c
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
@@ -0,0 +1,62 @@
+From 54075086a5b7acceef6dff41e19148778e285475 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 20 Mar 2020 21:03:02 +0100
+Subject: [PATCH] Fix issues with gcc10 -fno-common flag
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ 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
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/denemo/files/, media-sound/denemo/
@ 2021-11-12 13:04 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-11-12 13:04 UTC (permalink / raw
To: gentoo-commits
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 <waebbl@gmail.com>
-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 <waebbl@gmail.com>
----
- 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 <waebbl@gmail.com>
-Date: Fri, 20 Mar 2020 21:03:02 +0100
-Subject: [PATCH] Fix issues with gcc10 -fno-common flag
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- 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
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/denemo/files/, media-sound/denemo/
@ 2023-04-10 7:37 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2023-04-10 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 7f48feed4fd344f5258f8a85fa6b21b01e7aed55
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Mar 27 18:08:15 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 07:37:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f48feed
media-sound/denemo: update EAPI 7 -> 8
add patch to respect CFLAGS with USE=debug
Closes: https://bugs.gentoo.org/889464
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30369
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-sound/denemo/denemo-2.6.0-r1.ebuild | 129 +++++++++++++++++++++
.../files/denemo-2.6.0-respect-user-CFLAGS.patch | 22 ++++
2 files changed, 151 insertions(+)
diff --git a/media-sound/denemo/denemo-2.6.0-r1.ebuild b/media-sound/denemo/denemo-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..b7bca75ec19e
--- /dev/null
+++ b/media-sound/denemo/denemo-2.6.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools font 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 )"
+
+RDEPEND="
+ >=app-text/evince-3.22.1-r1:=
+ dev-libs/glib:2
+ 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/fluidsynth-1.1.6-r1:=
+ >=media-sound/lilypond-2.19.54
+ 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-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
+ 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 )
+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
+ default
+ 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() {
+ 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 -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-respect-user-CFLAGS.patch b/media-sound/denemo/files/denemo-2.6.0-respect-user-CFLAGS.patch
new file mode 100644
index 000000000000..e57be9c57bee
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.6.0-respect-user-CFLAGS.patch
@@ -0,0 +1,22 @@
+From c4eff03fb11d7085035892a688ed5d29e2faefe9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 27 Mar 2023 19:44:28 +0200
+Subject: [PATCH] respect user CFLAGS
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,8 +42,8 @@ AC_ARG_ENABLE(
+ [
+ if test "x$enableval" != "xno"; then
+ build_debug=yes
+- CFLAGS="-O0 -DDEBUG -g -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-compare"
+- CXXFLAGS="-O0 -DDEBUG -g -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-compare"
++ CFLAGS="$CFLAGS -DDEBUG -g -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-compare"
++ CXXFLAGS="$CFLAGS -DDEBUG -g -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-compare"
+ fi
+ ])
+
+--
+2.40.0
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-10 7:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-21 18:56 [gentoo-commits] repo/gentoo:master commit in: media-sound/denemo/files/, media-sound/denemo/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-04-10 7:37 Joonas Niilola
2021-11-12 13:04 Joonas Niilola
2020-02-16 14:51 Andreas Sturmlechner
2019-08-17 15:35 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox