<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/802c66f9609ede139b0c0b6f38eaaafad68564a8">https://github.com/macports/macports-ports/commit/802c66f9609ede139b0c0b6f38eaaafad68564a8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 802c66f9609ede139b0c0b6f38eaaafad68564a8
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Aug 4 11:36:38 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> tumbler: fix libopenraw support; add build dep gettext
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/63721
</span>---
xfce/tumbler/Portfile | 6 +++-
xfce/tumbler/files/patch-libopenraw.diff | 55 ++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/tumbler/Portfile b/xfce/tumbler/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 505350ffd28..51673c18527 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/tumbler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/tumbler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name tumbler
version 0.2.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories xfce
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,11 @@ checksums rmd160 ca7970421a8008489c3906e5b8f8e9a50ebce311 \
</span> sha256 6508906f03e5a6ae3f6503b71b056df47d336d5504f39df6ce0bb9c5248007b6 \
size 557794
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch configure script, to support our version of libopenraw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libopenraw.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span> port:gtk-doc \
port:intltool \
port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/tumbler/files/patch-libopenraw.diff b/xfce/tumbler/files/patch-libopenraw.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ae561535458
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/tumbler/files/patch-libopenraw.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-08-04 11:24:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-08-04 11:24:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17605,19 +17605,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_failed=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libopenraw-gnome-0.1 >= 0.0.4" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo_n "checking for libopenraw-gnome-0.1 >= 0.0.4... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libopenraw-gnome-0.3 >= 0.3.0" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo_n "checking for libopenraw-gnome-0.3 >= 0.3.0... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$LIBOPENRAW_GNOME_CFLAGS"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_cv_LIBOPENRAW_GNOME_CFLAGS="$LIBOPENRAW_GNOME_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif test -n "$PKG_CONFIG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$PKG_CONFIG" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenraw-gnome-0.1 >= 0.0.4\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($PKG_CONFIG --exists --print-errors "libopenraw-gnome-0.1 >= 0.0.4") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenraw-gnome-0.3 >= 0.3.0\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($PKG_CONFIG --exists --print-errors "libopenraw-gnome-0.3 >= 0.3.0") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $ac_status = 0; }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pkg_cv_LIBOPENRAW_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libopenraw-gnome-0.1 >= 0.0.4" 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_cv_LIBOPENRAW_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libopenraw-gnome-0.3 >= 0.3.0" 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "x$?" != "x0" && pkg_failed=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_failed=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17629,12 +17629,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_cv_LIBOPENRAW_GNOME_LIBS="$LIBOPENRAW_GNOME_LIBS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif test -n "$PKG_CONFIG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -n "$PKG_CONFIG" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenraw-gnome-0.1 >= 0.0.4\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ($PKG_CONFIG --exists --print-errors "libopenraw-gnome-0.1 >= 0.0.4") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenraw-gnome-0.3 >= 0.3.0\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ($PKG_CONFIG --exists --print-errors "libopenraw-gnome-0.3 >= 0.3.0") 2>&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test $ac_status = 0; }; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pkg_cv_LIBOPENRAW_GNOME_LIBS=`$PKG_CONFIG --libs "libopenraw-gnome-0.1 >= 0.0.4" 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_cv_LIBOPENRAW_GNOME_LIBS=`$PKG_CONFIG --libs "libopenraw-gnome-0.3 >= 0.3.0" 2>/dev/null`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "x$?" != "x0" && pkg_failed=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_failed=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17655,9 +17655,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pkg_short_errors_supported=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $_pkg_short_errors_supported = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBOPENRAW_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libopenraw-gnome-0.1 >= 0.0.4" 2>&1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBOPENRAW_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libopenraw-gnome-0.3 >= 0.3.0" 2>&1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBOPENRAW_GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libopenraw-gnome-0.1 >= 0.0.4" 2>&1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBOPENRAW_GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libopenraw-gnome-0.3 >= 0.3.0" 2>&1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Put the nasty error message in config.log where it belongs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$LIBOPENRAW_GNOME_PKG_ERRORS" >&5
</span></pre><pre style='margin:0'>
</pre>