<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/36b75e9ad84e9b0fe82131dcc051739a174c7d0e">https://github.com/macports/macports-ports/commit/36b75e9ad84e9b0fe82131dcc051739a174c7d0e</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 36b75e9ad84 geany: update to 2.0
</span>36b75e9ad84 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 36b75e9ad84e9b0fe82131dcc051739a174c7d0e
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Mon Jan 15 11:49:05 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> geany: update to 2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update to support Python 3.10 and 3.11
</span><span style='display:block; white-space:pre;color:#404040;'> Remove unneeded patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/65660
</span><span style='display:block; white-space:pre;color:#404040;'> Only tested on Intel; does it still flicker on Apple silicone?
</span>---
devel/geany/Portfile | 35 ++++-------
...patch_configure_remove_INTLTOOL_PERL_check.diff | 73 ----------------------
2 files changed, 12 insertions(+), 96 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/geany/Portfile b/devel/geany/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e177f686ea6..d4d9cf6ed8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/geany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/geany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,10 @@ PortSystem 1.0
</span> PortGroup app 1.0
name geany
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f3f7ffffb6183443119ff775a94d02a3b1790850 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6836300
</span> license GPL-2+
categories devel
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,10 +24,6 @@ homepage https://www.geany.org/
</span> master_sites http://download.geany.org/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fa373cb09b33b068a0c47ad7f09ca70721f79979 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4860717
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:autoconf \
port:automake \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,10 +45,6 @@ depends_run port:adwaita-icon-theme
</span> # configure: error: *** A compiler with support for C++17 language features is required.
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Avoid longstanding INTLTOOL_PERL problem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/60155
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch_configure_remove_INTLTOOL_PERL_check.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --disable-silent-rules \
--disable-html-docs \
--disable-pdf-docs \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,26 +52,21 @@ configure.args --disable-silent-rules \
</span> --disable-gtkdoc-header \
--with-vte-module-path=${prefix}/lib/libvte-2.91.0.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Geany-INFO: 13:41:14.833: Could not load libvte.so, embedded terminal support disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# geany can't find libvte, expect update to vte will fix this but need compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# selection support -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/ticket/64746
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # gtk-osx-application-gtk3 includes active_variants check for gtk3 +quartz
# therefore don't repeat it here
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python39 description {Use Python v3.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-python-command=${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python311 description {Use Python v3.10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-python-command=${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:python310
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python38 description {Use Python v3.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-python-command=${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python310 description {Use Python v3.11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-python-command=${prefix}/bin/python3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:python311
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +python311
</span> }
variant quartz conflicts x11 description {Better support Mac interface conventions} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/geany/files/patch_configure_remove_INTLTOOL_PERL_check.diff b/devel/geany/files/patch_configure_remove_INTLTOOL_PERL_check.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0df0ea6111e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/geany/files/patch_configure_remove_INTLTOOL_PERL_check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,73 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-03-01 09:07:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2022-03-01 09:10:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21683,70 +21683,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Extract the first word of "perl", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set dummy perl; ac_word=$2
</span><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:#ffe0e0;'>-- [\\/]* | ?:[\\/]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 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:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for as_dir in $PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test -z "$as_dir" && as_dir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for ac_exec_ext in '' $ac_executable_extensions; do
</span><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:#ffe0e0;'>-- break 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -n "$INTLTOOL_PERL"; then
</span><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:#ffe0e0;'>--else
</span><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:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -z "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "perl not found" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><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:#ffe0e0;'>--$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $? -ne 0; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
</span><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:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x" != "xno-xml"; then
</span><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:#ffe0e0;'>-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
</span><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:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Substitute ALL_LINGUAS so we can use it in po/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>