git: cda50e41acad - main - graphics/geeqie: update 1.7.1 → 1.7.2

The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cda50e41acadae24c4a0dbbb8d9f97a709e168c2

commit cda50e41acadae24c4a0dbbb8d9f97a709e168c2
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-03-09 11:34:08 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-03-09 13:57:10 +0000

    graphics/geeqie: update 1.7.1 → 1.7.2
---
 graphics/geeqie/Makefile                 |  2 +-
 graphics/geeqie/distinfo                 |  6 +++---
 graphics/geeqie/files/patch-configure.ac | 15 +++++----------
 graphics/geeqie/files/patch-version.sh   |  8 ++++++++
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index d2318f6b8b7e..3eda66334e5f 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	geeqie
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.7.1
+DISTVERSION=	1.7.2
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index bf2d0ed789a4..5a59e0ad8268 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642440876
-SHA256 (BestImageViewer-geeqie-v1.7.1_GH0.tar.gz) = 6625f174abfda86883fd94f4cbd1054528db0f90915ae5d00f4a080dcb80411d
-SIZE (BestImageViewer-geeqie-v1.7.1_GH0.tar.gz) = 37803488
+TIMESTAMP = 1646821439
+SHA256 (BestImageViewer-geeqie-v1.7.2_GH0.tar.gz) = 217d5c066a3bb8da13cd35266fd689d6311f00135f90b76b74630bafa509ea05
+SIZE (BestImageViewer-geeqie-v1.7.2_GH0.tar.gz) = 2813997
diff --git a/graphics/geeqie/files/patch-configure.ac b/graphics/geeqie/files/patch-configure.ac
index 264be8190014..42880d607a16 100644
--- a/graphics/geeqie/files/patch-configure.ac
+++ b/graphics/geeqie/files/patch-configure.ac
@@ -1,19 +1,14 @@
---- configure.ac.orig	2022-01-16 14:23:16 UTC
+--- configure.ac.orig	2022-01-25 13:04:14 UTC
 +++ configure.ac
-@@ -15,10 +15,10 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOS
- dnl GNU General Public License for more details.
- 
- AC_PREREQ(2.57)
--AC_INIT([geeqie], m4_translit(m4_esyscmd([if [ $(git tag --list 'v[1-9]*' --points-at HEAD | wc -c) -gt 0 ]; then git tag --list v[1-9]* --points-at HEAD | tail -n 1 | tr -d 'v' ; else git tag --list v[1-9]* | tail -n 1 | tr -d 'v' && echo "+git" && git log --max-count=1 --date=format:"%Y%m%d" --format="%ad" && echo "-" && git rev-parse --quiet --verify --short HEAD; fi ]), m4_newline), [geeqie@freelists.org], [], [http://www.geeqie.org/])
-+AC_INIT([geeqie], 0, [geeqie@freelists.org], [], [http://www.geeqie.org/])
+@@ -18,7 +18,6 @@ AC_PREREQ(2.57)
+ AC_INIT([geeqie], m4_translit(m4_esyscmd([./version.sh]), m4_newline), [geeqie@freelists.org], [], [http://www.geeqie.org/])
  
  # Add -Werror to the default CFLAGS
 -CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
-+#CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
  
  # Check for rightly dirs
  AC_CONFIG_SRCDIR([src/main.c])
-@@ -550,7 +550,7 @@ AC_ARG_ENABLE([lua],
+@@ -550,7 +549,7 @@ AC_ARG_ENABLE([lua],
      [liblua=$enableval], [liblua=auto])
  
  if test "x${liblua}" != "xno"; then
@@ -22,7 +17,7 @@
      [
        HAVE_LUA=yes
        AC_DEFINE(HAVE_LUA, 1, [define to enable lua support])
-@@ -763,7 +763,7 @@ AC_SUBST(JPEGXL_LIBS)
+@@ -763,7 +762,7 @@ AC_SUBST(JPEGXL_LIBS)
  #  Markdown support
  # ----------------------------------------------------------------------
  
diff --git a/graphics/geeqie/files/patch-version.sh b/graphics/geeqie/files/patch-version.sh
new file mode 100644
index 000000000000..c0731c59d255
--- /dev/null
+++ b/graphics/geeqie/files/patch-version.sh
@@ -0,0 +1,8 @@
+--- version.sh.orig	2022-01-25 13:04:14 UTC
++++ version.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ ## @file
+ ## @brief Generate the Geeqie version number