From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- media-sound/denemo/Manifest | 3 + media-sound/denemo/denemo-2.3.0.ebuild | 122 +++++++++++++++++++++ ...0001-configure.ac-patch-to-find-guile-2.2.patch | 80 ++++++++++++++ 3 files changed, 205 insertions(+) create mode 100644 media-sound/denemo/denemo-2.3.0.ebuild create mode 100644 media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch (limited to 'media-sound/denemo') diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest index 6f0e7c8530f3..00bd8d08018e 100644 --- a/media-sound/denemo/Manifest +++ b/media-sound/denemo/Manifest @@ -1,5 +1,8 @@ AUX denemo-2.2.0-find-guile-2.2.patch 1667 BLAKE2B e8a3de848748888c2534d5515ad08945489d482365690b346568b79c1553f04eaf12990bcc32e1c6a955fe342bcd7dec6bd00b906448f1cb8d18c59c2f69bd22 SHA512 09f999ccd4b0729029ba95644c7c9070cbf94dde87b6c85d8c96e5db5f37d248936b9f0d682cf6bd0479b8b869d45ef5b2b91e83203fedc66f4896dc389cccd6 AUX denemo-2.2.0-no-portaudio-fix.patch 842 BLAKE2B f832666fe59970efee9e8fee090ec8e4d7be20c17d83a6c5143d5e0153b2eb458d7467e4d41b29fb0681480b9261e6cfae62bbaa870c15e1988de00e5bb1c484 SHA512 5327119813e734308e874392297fdf6d9b462be13d34df01f4e97c529c0c4140c3b3ae7ee06c53c2adadf307d4c60e14417a154226176b664fc26bba12028c4c +AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d29bf9a7792a4b212124985367c8cf1c6ae5d71682e4474a3ebe1c8c9602565ba4b908156d4bdd4db2b2745c627903034a5f7f74cdecfad4b106b4685e8bddef SHA512 6fc4ece49940d0f4beaecd0c2f218516e0bac14979fbce1ad25454b5075fc5eb29873c93ff3930c7e6214643a47bbe55408ad258859f973a0b5717b67456340f DIST denemo-2.2.0.tar.gz 17032009 BLAKE2B 66732fcdaa5d5119ca2a45e5a8c6829e05092a4f0e18e3c8a991bddaaf863ea05889654af47150650d2c67397afa957de0fc3ce0ada86a22be00ae91d4add993 SHA512 74bef7b888abd86db42cee7ecb404e1b9211f9965207366c99980137194acd2afa6ec8b1c18da8a12fe4c6951d8a1bb873b313f5749ea629bb7eaeedf12368ef +DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f EBUILD denemo-2.2.0.ebuild 2930 BLAKE2B 65c16eb446dbeb906ce8fa5f3190bf3f62c0e4b8647a76937720fb5251028d66d34399cb6b759742895f6979e46ec97703eaedc5d6ee027469886b4487b7b39a SHA512 73ac587a3c715b27bbe04ad2ee6e66c538ec08f6a64c860adb9a102d6fc3627a22184fae20453530b2ea8e5c9a191a97bcdc6a403ad8ca6f5b82280d6b6bc172 +EBUILD denemo-2.3.0.ebuild 2923 BLAKE2B 2a4f7562ad164b6035a168f57371163465b77222d834bb7822ec1f9e172817793c717d9e6413d5640303f6b871c6aa9f5199095bdf721d6d863db812006cefb1 SHA512 b45cfd04366e27a88811b17665269168988c28d98fa4cae6563abfd75547f84d8a3a4bb76714e28f871958d47c3459d7cf39c944999965508f164e96b7194719 MISC metadata.xml 1587 BLAKE2B b20d6c43ea998e867ac1fbb84faab58cf3901b40700b36485d9de57336b8616117bae28e712b061dc49a80c9b27637b43a6b08d01535597ad7cf4d5a935dc72d SHA512 f14e3e591bc4824b8a9a872e3574a2e5e73a70451a02d85c021ff77eddc9034c6eac1238c968ee637fa5bb9fc4f98d71486be379faede67b462818534b392ecd 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 000000000000..6bc0a16e9940 --- /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 000000000000..982ccfade868 --- /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 +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 +--- + 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 + -- cgit v1.2.3