<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6d552787ea8928b6d6d8c89bf0fc3ad046c4e6db">https://github.com/macports/macports-ports/commit/6d552787ea8928b6d6d8c89bf0fc3ad046c4e6db</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6d552787ea8 denemo: Fix implicit int error
</span>6d552787ea8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6d552787ea8928b6d6d8c89bf0fc3ad046c4e6db
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 18 22:38:58 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> denemo: Fix implicit int error
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And remove unnecessary configure.ac patch.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70245
</span>---
print/denemo/Portfile | 18 +++++++++---------
print/denemo/files/implicit.patch | 15 +++++++++++++--
print/denemo/files/patch-configure.ac.diff | 10 ----------
3 files changed, 22 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/denemo/Portfile b/print/denemo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 020684acd12..6ac0a2f3347 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/denemo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/denemo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,6 @@ checksums rmd160 27af270ad5f80485565d0f4d95d99625d770768b \
</span> size 17620623
categories print audio x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,22 +22,24 @@ long_description Denemo is a unique score editor which exports notation \
</span> was created to help edit LilyPond notation and partly \
because of its unique design philosophy.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.denemo.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.denemo.org
</span> master_sites gnu
depends_build port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span> port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib port:aubio \
port:evince \
port:fftw-3 \
port:fluidsynth \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtksourceview3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceview3 \
</span> port:guile \
port:jack \
path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,13 +55,12 @@ depends_run path:bin/lilypond:lilypond
</span> # guile is not universal.
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles implicit.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${filespath}/autogen.sh ${worksrcpath}
</span> reinplace "s|/usr/|${prefix}/|" ${worksrcpath}/autogen.sh
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/denemo/files/implicit.patch b/print/denemo/files/implicit.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c5ad61405bc..e47fd991aa0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/denemo/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/denemo/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,9 @@
</span> Fix:
sffile.c:38:10: error: implicitly declaring library function 'isprint' with type 'int (int)' [-Werror,-Wimplicit-function-declaration]
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- libs/libsffile/sffile.c.orig 2021-02-09 22:01:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libs/libsffile/sffile.c 2021-03-16 02:18:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sffile.c:55:10: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://savannah.gnu.org/bugs/index.php?63720
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libs/libsffile/sffile.c.orig 2022-03-11 06:15:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libs/libsffile/sffile.c 2024-06-18 22:39:49.000000000 -0500
</span> @@ -20,6 +20,7 @@
*================================================================*/
//Interface to Denemo License: FSF GPL version 3 or later
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,3 +12,12 @@ sffile.c:38:10: error: implicitly declaring library function 'isprint' with type
</span> #include <stdio.h>
#include <string.h>
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ParseSoundfont(char *soundfont, int index, char **name, int *preset, int *bank) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *fp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static SFInfo sf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static initialized = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static int initialized = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int number = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(soundfont) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/denemo/files/patch-configure.ac.diff b/print/denemo/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab749f8054a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/denemo/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2014-04-21 05:29:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2014-05-01 23:40:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(GETTEXT_PACKAGE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [The domain to use with gettext])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_GLIB_GNU_GETTEXT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOCALEDIR=[${datadir}/locale]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(LOCALEDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>