<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fc3e779f36043c88932ce33b2a7040de96f37282">https://github.com/macports/macports-ports/commit/fc3e779f36043c88932ce33b2a7040de96f37282</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 fc3e779f360 Thunar: patch INTLTOOL_PERL bug
</span>fc3e779f360 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fc3e779f36043c88932ce33b2a7040de96f37282
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Oct 5 00:02:50 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> Thunar: patch INTLTOOL_PERL bug
</span>---
xfce/Thunar/Portfile | 9 ++---
xfce/Thunar/files/INTLTOOL_PERL.patch | 75 +++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/Thunar/Portfile b/xfce/Thunar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df1da7be1d0..be11bf02adc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/Thunar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/Thunar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,18 +21,15 @@ checksums rmd160 2af84abd40c210478b7626860f94b25b7de8218c \
</span> sha256 cb9fc2a8005494124a8d412eff7d7cb8032f7ff91b3d254fcff2d0a0d2790d20 \
size 1977562
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Needed for intltool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl ${prefix}/bin/perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles INTLTOOL_PERL.patch
</span>
configure.args --enable-dbus \
--enable-startup-notification \
--enable-pcre \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-exif \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INTLTOOL_PERL=${configure.perl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-exif
</span>
depends_build port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:perl5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib port:desktop-file-utils \
port:exo \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/Thunar/files/INTLTOOL_PERL.patch b/xfce/Thunar/files/INTLTOOL_PERL.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..15b5093ce2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/Thunar/files/INTLTOOL_PERL.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,75 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.launchpad.net/intltool/+bug/1197875
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2019-01-25 08:51:03.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-10-05 00:00:07.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6479,70 +6479,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Extract the first word of "perl", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set dummy perl; ac_word=$2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo_n "checking for $ac_word... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case $INTLTOOL_PERL in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [\\/]* | ?:[\\/]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
</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;'>+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-for as_dir in $PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test -z "$as_dir" && as_dir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for ac_exec_ext in '' $ac_executable_extensions; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IFS=$as_save_IFS
</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;'>+-esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test -n "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "$INTLTOOL_PERL" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</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;'>+-if test -z "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "perl not found" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test $? -ne 0; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "$IT_PERL_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "x" != "xno-xml"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo_n "checking for XML::Parser... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "ok" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>