<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/74c9f020260d72d319e479574b3c15016d916c3c">https://github.com/macports/macports-ports/commit/74c9f020260d72d319e479574b3c15016d916c3c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 74c9f020260d72d319e479574b3c15016d916c3c
</span>Author: QwertyChouskie <qwertychouskie@users.noreply.github.com>
AuthorDate: Tue Apr 23 13:28:22 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> libxfce4ui: Update to 4.18.6
</span>---
xfce/libxfce4ui/Portfile | 14 +++---
.../files/remove-intltool-perl-hack.diff | 56 ++++++++++++----------
2 files changed, 38 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/libxfce4ui/Portfile b/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e2ffc19196..832566f4cb5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,11 @@
</span> PortSystem 1.0
name libxfce4ui
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.16.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.18.6
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 76e6e681c70ab8cfcf0c300487535f50dafc73b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 785811
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 77dd99206cc8c6c7f69c269c83c7ee6a037bca9d4a89b1a6d9765e5a09ce30cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2c39d90ea51931590b74e361cc923b9b8e94e6be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 906477
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories xfce
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,17 +24,17 @@ depends_build port:intltool \
</span> port:pkgconfig \
bin:perl:perl5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span> port:libxfce4util \
port:xfconf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libglade2 \
</span> port:startup-notification
patchfiles remove-intltool-perl-hack.diff
configure.args --disable-gladeui
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -std=c99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
configure.args-append --disable-visibility
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/libxfce4ui/files/remove-intltool-perl-hack.diff b/xfce/libxfce4ui/files/remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 781a166646e..6d56462aa6d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/libxfce4ui/files/remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/libxfce4ui/files/remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,18 @@
</span> --- configure.orig 2015-03-16 05:14:47.000000000 +1100
+++ configure 2021-11-29 23:51:03.000000000 +1100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6517,69 +6517,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7286,75 +7286,7 @@ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
</span> as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
fi
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
<span style='display:block; white-space:pre;background:#ffe0e0;'>--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for $ac_word... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case $INTLTOOL_PERL in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf %s "checking for $ac_word... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test ${ac_cv_path_INTLTOOL_PERL+y}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf %s "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else case e in #(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- e) case $INTLTOOL_PERL in
</span> - [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
- ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,53 +21,58 @@
</span> -for as_dir in $PATH
-do
- IFS=$as_save_IFS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- test -z "$as_dir" && as_dir=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- case $as_dir in #(((
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '') as_dir=./ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */) ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *) as_dir=$as_dir/ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- esac
</span> - for ac_exec_ext in '' $ac_executable_extensions; do
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $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;'>+- 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;'>+- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
</span> - break 2
- fi
-done
- done
-IFS=$as_save_IFS
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - ;;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-esac ;;
</span> -esac
-fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "$INTLTOOL_PERL" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf "%s\n" "$INTLTOOL_PERL" >&6; }
</span> -else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf "%s\n" "no" >&6; }
</span> -fi
-
-
-if test -z "$INTLTOOL_PERL"; then
- as_fn_error $? "perl not found" "$LINENO" 5
-fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for perl >= 5.8.1... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf %s "checking for perl >= 5.8.1... " >&6; }
</span> -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
-else
- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "$IT_PERL_VERSION" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf "%s\n" "$IT_PERL_VERSION" >&6; }
</span> -fi
-if test "x" != "xno-xml"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for XML::Parser... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf %s "checking for XML::Parser... " >&6; }
</span> - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "ok" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf "%s\n" "ok" >&6; }
</span> - else
- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
- fi
-fi
# Substitute ALL_LINGUAS so we can use it in po/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>