diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index d2318f6b8b7e..3eda66334e5f 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -1,114 +1,114 @@ # Created by: Martin Tournoij PORTNAME= geeqie DISTVERSIONPREFIX= v -DISTVERSION= 1.7.1 +DISTVERSION= 1.7.2 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lightweight image viewer forked from GQview LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png RUN_DEPENDS= bash:shells/bash CONFLICTS= geeqie-devel USES= autoreconf compiler:c++11-lang gmake gnome jpeg \ localbase pkgconfig desktop-file-utils tar:xz lua:53 shebangfix USE_GNOME= cairo gdkpixbuf2 intltool USE_GITHUB= yes GH_ACCOUNT= BestImageViewer GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-readmedir="${DOCSDIR}" SHEBANG_FILES= plugins/*/geeqie-* PORTDOCS= * OPTIONS_DEFINE= EXIV2 LCMS LIRC MAP FFMPEGTHUMBNAILER DOCS NLS ARCHIVE OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER HEIF WEBP DJVU OPENJPEG RAW ARCHIVE JPEGXL OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT=GTK2 GTK3 OPTIONS_GROUP= FORMATS OPTIONS_GROUP_FORMATS= TIFF PDF HEIF WEBP DJVU OPENJPEG RAW JPEGXL OPTIONS_SUB= yes EXIV2_DESC= Metadata editing LCMS_DESC= Color adjusting LIRC_DESC= Remote control (broken) MAP_DESC= GPS map support via libchamplain TOOLKIT_DESC= Graphical user interface toolkit FORMATS_DESC= Image formats support GTK2_DESC= Use GTK 2 GTK3_DESC= Use GTK 3 HEIF_DESC= HEIF image format support EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_CONFIGURE_ENABLE= exiv2 LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS_CONFIGURE_ENABLE= lcms LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_ENABLE= lirc LIRC_CONFIGURE_ON= --with-lirc-prefix="${LOCALBASE}" LIRC_BROKEN= does not build with old lirc from ports MAP_LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libclutter-1.0.so:graphics/clutter \ libcogl.so:graphics/cogl \ libjson-glib-1.0.so:devel/json-glib MAP_CONFIGURE_ENABLE= map gpu-accel MAP_REQUIRES= GTK3 MAP_USES= gl xorg MAP_USE= GL=egl XORG=xrandr,x11,xext,xdamage,xfixes,xcomposite,xi TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_ENABLE= tiff GTK2_USE= GNOME=gtk20 GTK3_USE= GNOME=gtk30 GTK3_CONFIGURE_ENABLE= gtk3 PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib PDF_CONFIGURE_ENABLE= pdf PDF_REQUIRES= GTK3 FFMPEGTHUMBNAILER_DESC= Video file thumbnails generating support FFMPEGTHUMBNAILER_CONFIGURE_ENABLE= ffmpegthumbnailer FFMPEGTHUMBNAILER_LIB_DEPENDS= libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_USES_OFF= gettext-tools HEIF_CONFIGURE_ENABLE= heif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif WEBP_CONFIGURE_ENABLE= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp DJVU_CONFIGURE_ENABLE= djvu DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre OPENJPEG_CONFIGURE_ENABLE= j2k OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg RAW_CONFIGURE_ENABLE= raw RAW_LIB_DEPENDS= libraw.so:graphics/libraw ARCHIVE_CONFIGURE_ENABLE= archive ARCHIVE_USES= libarchive JPEGXL_DESC= JPEG XL support JPEGXL_CONFIGURE_ENABLE=jxl JPEGXL_LIB_DEPENDS= libjxl.so:graphics/libjxl .include 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,33 +1,28 @@ ---- 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 - PKG_CHECK_MODULES(LUA, lua5.3 >= 5.3, + PKG_CHECK_MODULES(LUA, lua-5.3 >= 5.3, [ 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 # ---------------------------------------------------------------------- -AM_CONDITIONAL(HAVE_MARKDOWN, [ "$(command -v markdown)" ]) +AM_CONDITIONAL(HAVE_MARKDOWN, [ "$(false)" ]) # _NL_TIME_FIRST_WEEKDAY support # note that it is an enum and not a define 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