<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6e31f3f295feadfda6cc0195e21aa45150614243">https://github.com/macports/macports-ports/commit/6e31f3f295feadfda6cc0195e21aa45150614243</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 6e31f3f295f gwyddion: update to 2.62
</span>6e31f3f295f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6e31f3f295feadfda6cc0195e21aa45150614243
</span>Author: Rolf Wuerdemann <rowue@digitalis.org>
AuthorDate: Tue Feb 7 14:03:08 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> gwyddion: update to 2.62
</span>---
science/gwyddion/Portfile | 16 +++++++-------
science/gwyddion/files/dynamic_lookup-11.patch | 25 ----------------------
.../files/patch-gtk-osx-application-gtk2.diff | 22 +++++++++----------
science/gwyddion/files/patch-macintegration_h.diff | 11 ++++++++++
4 files changed, 30 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gwyddion/Portfile b/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eb93b23039c..f4b8304b4d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name gwyddion
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.62
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science x11
platforms darwin
license gpl-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,10 @@ master_sites sourceforge:project/gwyddion/gwyddion/${version}
</span> use_xz yes
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 00f30e25e66dff3a7c26f5e084a6799501512963bfe13543391a24f2a0201019 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5a2cdc6edd4c547d1523fcc21995e40f384c9905 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4903412
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 47d93ec1f233dbb6b0c502e0ab99ab0db5a9b8c1605625717b457709e1341fac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 47347b5ce7419f41ee2574dd8cb9616382cd8f7c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5010676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,8 +35,6 @@ depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span> port:libpng \
port:gtkglext
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args --disable-desktop-file-update \
--disable-silent-rules \
--with-x \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +43,8 @@ configure.args --disable-desktop-file-update \
</span>
variant quartz description { Build gwyddion with quartz gl support } {
depends_lib-append port:gtk-osx-application-gtk2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gtk-osx-application-gtk2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gtk-osx-application-gtk2.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-macintegration_h.diff
</span> }
variant pygwy description { Build gwyddion with python support } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gwyddion/files/dynamic_lookup-11.patch b/science/gwyddion/files/dynamic_lookup-11.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d440ea749ea..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gwyddion/files/dynamic_lookup-11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Recognize macOS 11 and later, remove inaccurate comment, and simplify.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44605
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2021-06-28 08:48:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-07-16 20:12:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9260,16 +9260,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin1.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- darwin*) # darwin 5.x on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # if running on 10.5 or later, the deployment target defaults
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # to the OS version, if on x86, and 10.4, the deployment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # target defaults to 10.4. Don't you love it?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case $MACOSX_DEPLOYMENT_TARGET,$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[012],*|,*powerpc*-darwin[5-8]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff b/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 21afba16dfc..a7c42ef1a68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +1,38 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.old 2015-06-25 21:54:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2015-06-25 21:54:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19616,12 +19616,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.old 2023-02-06 16:00:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-02-06 15:59:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22399,12 +22399,12 @@
</span> pkg_cv_GTK_MAC_CFLAGS="$GTK_MAC_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
</span> - ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration-gtk2\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration-gtk2\""; } >&5
</span> + ($PKG_CONFIG --exists --print-errors "gtk-mac-integration-gtk2") 2>&5
ac_status=$?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span> test $ac_status = 0; }; then
- pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null`
+ pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration-gtk2" 2>/dev/null`
else
pkg_failed=yes
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19634,12 +19634,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22417,12 +22417,12 @@
</span> pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS"
else
if test -n "$PKG_CONFIG" && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
</span> - ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration-gtk2\""; } >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration-gtk2\""; } >&5
</span> + ($PKG_CONFIG --exists --print-errors "gtk-mac-integration-gtk2") 2>&5
ac_status=$?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span> test $ac_status = 0; }; then
- pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null`
+ pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration-gtk2" 2>/dev/null`
else
pkg_failed=yes
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19658,9 +19658,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22441,9 +22441,9 @@
</span> _pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gwyddion/files/patch-macintegration_h.diff b/science/gwyddion/files/patch-macintegration_h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..88864b5a9b9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gwyddion/files/patch-macintegration_h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gwyddion/mac_integration.c.old 2023-02-06 17:15:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gwyddion/mac_integration.c 2023-02-06 17:17:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_GTK_MAC_INTEGRATION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <gtkmacintegration/gtkosxapplication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <gtkmacintegration-gtk2/gtkmacintegration/gtkosxapplication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define USE_MAC_INTEGRATION
</span></pre><pre style='margin:0'>
</pre>