<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/76ea6aac13ca903be4fcc6a724ebda21be1054f6">https://github.com/macports/macports-ports/commit/76ea6aac13ca903be4fcc6a724ebda21be1054f6</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 76ea6aac13c geeqie: update to 2.1
</span>76ea6aac13c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 76ea6aac13ca903be4fcc6a724ebda21be1054f6
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Mon Jan 15 15:40:17 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> geeqie: update to 2.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> patches removed as fixed by upstream
</span><span style='display:block; white-space:pre;color:#404040;'> webp support requires a package not in MacPorts currently
</span>---
graphics/geeqie/Portfile | 26 +++++----------
.../geeqie/files/disable-gen_changelog.sh.patch | 15 ---------
.../files/patch-detect_libtiff_properly.diff | 15 ---------
graphics/geeqie/files/patch-strvercompare.diff | 39 ----------------------
4 files changed, 8 insertions(+), 87 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/Portfile b/graphics/geeqie/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1983e4b914..c4b3b962ed0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/geeqie/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,12 +6,11 @@ PortGroup app 1.0
</span> PortGroup github 1.0
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup BestImageViewer geeqie 2.0.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup BestImageViewer geeqie 2.1 v
</span> github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c96957ece6f6ef5b91bfb5195ecd706d10844ce3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 89c1a7574cfe3888972d10723f4cf3a277249bea494fd9c630aa8d0df944555d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1666600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 01eb58fdf77dd8600b20a688856e660611ad3893 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d0511b7840169d37e457880d1ab2a787c52b609a0ab8fa1a8a391e841fdd2dde \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1800612
</span>
categories graphics x11
# Check: dependencies may not build on 10.6 and earlier
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +49,10 @@ depends_lib port:clutter-gtk \
</span> path:include/turbojpeg.h:libjpeg-turbo \
port:openjpeg \
path:lib/pkgconfig/poppler.pc:poppler \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:webp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:adwaita-icon-theme \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:evince
</span> # dependencies needed by plugins (not checked by configure) -
depends_run-append port:ImageMagick \
port:exiftran \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,15 +62,6 @@ depends_run-append port:ImageMagick \
</span>
require_active_variants lib:libgtk-3:gtk3 x11 quartz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append disable-gen_changelog.sh.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-strvercompare.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-detect_libtiff_properly.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|@@VERSION@@|${version}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/doc/create-doxygen-lua-api.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args -Dlua=disabled
post-activate {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +69,7 @@ post-activate {
</span> }
app.name Geeqie
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon src/icons/svg/gqview_icon.svg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon src/icons/svg/geeqie.svg
</span> app.hide_dock_icon yes
# app.retina yes
app.privacy_photo "Geeqie can display photos in your photo library"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/disable-gen_changelog.sh.patch b/graphics/geeqie/files/disable-gen_changelog.sh.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 06ac65ba272..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/disable-gen_changelog.sh.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Make gen_changelog.sh not do anything since it doesn't work unless it's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-run in a git clone.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/BestImageViewer/geeqie/issues/568
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gen_changelog.sh.orig 2017-12-31 06:31:21.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gen_changelog.sh 2019-06-23 02:56:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ChangeLog.html is also created
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+touch ../build/ChangeLog ../build/ChangeLog.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+exit 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ ! -e "ChangeLog.gqview" ] && exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ ! -x "$(command -v git)" ] && exit 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/patch-detect_libtiff_properly.diff b/graphics/geeqie/files/patch-detect_libtiff_properly.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8d0e7729b2b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/patch-detect_libtiff_properly.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=meson.build;h=083a8f80431ce2a97ce1e7f3afcd368e983c99e6;hp=38aaa627b4936abe0c724957ce0e43fa718b58ce;hb=ab73ca7933a80ee86c50f2fd8e38307144fb413a;hpb=c5d75369a5643cc06ba7d48bafc43c5076c74132
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 38aaa627..083a8f80 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -401,7 +401,7 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tiff_dep = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option = get_option('tiff')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not option.disabled()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tiff_dep = cc.find_library('libtiff', required: get_option('tiff'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tiff_dep = dependency('libtiff-4', required: get_option('tiff'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if tiff_dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if cc.has_function('TIFFClientOpen', dependencies : tiff_dep)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf_data.set('HAVE_TIFF', 1)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/geeqie/files/patch-strvercompare.diff b/graphics/geeqie/files/patch-strvercompare.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8439e37badf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/geeqie/files/patch-strvercompare.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 87042fa51da7c14a7600bbf8420105dd91675757 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Dmitry Marakasov <amdmi3@amdmi3.ru>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 31 Aug 2022 19:14:36 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Detect strverscmp support properly
</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;'>- config.h.in | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- meson.build | 5 +++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 6 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/config.h.in b/config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 67e68216..ab5e2825 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAVE_STRING_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the `strverscmp' function. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define HAVE_STRVERSCMP 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#mesondefine HAVE_STRVERSCMP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define to 1 if you have the <sys/stat.h> header file. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAVE_SYS_STAT_H 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/meson.build b/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e44cf8c3..38aaa627 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,6 +446,11 @@ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- summary({'nl_langinfo' : ['nl_langinfo not found - first weekday depends on locale:', false, 'first weekday defaults to Monday']}, section : 'Documentation', bool_yn : true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+result = cc.has_function('strverscmp', prefix : '#include <string.h>')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if result
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ conf_data.set('HAVE_STRVERSCMP', 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf_data.set_quoted('GQ_APPDIR', gq_appdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conf_data.set_quoted('GQ_BINDIR', gq_bindir)
</span></pre><pre style='margin:0'>
</pre>