From nobody Thu Apr 04 15:02:36 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9Px91VDWz5H8Rv; Thu, 4 Apr 2024 15:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9Px871vxz4Mwq; Thu, 4 Apr 2024 15:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712242957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fx3odqK1rBfUA4M+0409W1LKjlknxQZt/4yG3FiQpUI=; b=YIb5iU4tr4QnPUHzg8Q4KICadCnI+T//qM0NWQiguZZ5v/aJj82nzYt6T0MmqOM19LuGJD kj6SWRNHEM1GnCdlXqEJyIHaQGb0cMnE/ChD8RuU3ncEJ5ArJyEVHzIyV3qUnOnMEftYCt 8JKz0UJQpk+/KIFYEGLQx/BXBPidvIkarJUiGnDZmOwRb1FEOfK3swJj6O0ckIFlE0w1WX W5vSxiVHwatq9RyPDLDMMM8FtNA0iN2pWtSLTP43/91TeUk4L99xkaTw6lQEyy8y9Wv8dM 26AHXWll+Jwgbxa/n8UVuoOAkSr+b+UZxUXOlUAkC3+wQQ/62B3wQwYRE2807A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712242957; a=rsa-sha256; cv=none; b=CoSe7ZuUM6r1kfOuFjkMd2axgVrjNAMUdyn/jF/LbLI6Go8Y386S9YVNUZCVfnlJPlBox3 QTsuzknilDC2Uqv16h0pB42elv8ccSDOQuCdZMx2A5IVRVdZqEZYKcp5CyOmH+12gMil5G QODyOdh3LTI8rBsZE1z4XXtJaicoceIy62UYdVs1+M1omV2ncpJbD2HppQqbyIJklC890O /ckgAubQSGqFp2M5L1FqD0TFNjW5vob1ycdEGgwAi6uORNwkMwTpT9VbX9jhuqfgoRnkUw 4ns6gdcrSx7JD9xHLoakU1eYDvCJF5o0fa+jMQ2riFpnKRuF1u3+S7cIX9ICMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712242957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fx3odqK1rBfUA4M+0409W1LKjlknxQZt/4yG3FiQpUI=; b=gBYHOzlgphhQ7GC6KWmwqzo8jNz8DB8s5cE2tEOxLgHbUFYfbTZ8NKNq1amOvrt4tiell9 TzDOuJQg3p54jp5Inkzd2GQ0Xp8Ibsbs5tRvg+3k19YL1n2eZZfQc9SDE3Td8VgpPlF5k1 XLEy1SUmhiTXgCf956vsJrLbQQEjp3JfNVZ6F9kzaRaenkY4L95s4EaOMPYyN7z0MwRIJv wILHkmaguSgKBsYtsVYCTT0TZrjyIBGnpIV12eGdrJ12YeHZH9w1YQdS+Tdq55cV2/kYQp Wx1Wvai7be7LgWQlnqfpnXsT5lDBvdIZ2WvIwl7nOSrDnw1IPC1O8B0bkWpWeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9Px86bQnzLVm; Thu, 4 Apr 2024 15:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 434F2aVW015961; Thu, 4 Apr 2024 15:02:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 434F2a1m015958; Thu, 4 Apr 2024 15:02:36 GMT (envelope-from git) Date: Thu, 4 Apr 2024 15:02:36 GMT Message-Id: <202404041502.434F2a1m015958@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 49e954a42dd9 - main - graphics/geeqie: update 2.1 =?utf-8?Q?=E2=86=92?= 2.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49e954a42dd9d8dba4edf8138d4c8c28514839d1 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=49e954a42dd9d8dba4edf8138d4c8c28514839d1 commit 49e954a42dd9d8dba4edf8138d4c8c28514839d1 Author: Dmitry Marakasov AuthorDate: 2024-03-29 20:59:53 +0000 Commit: Dmitry Marakasov CommitDate: 2024-04-04 15:01:51 +0000 graphics/geeqie: update 2.1 → 2.4 --- graphics/geeqie/Makefile | 16 ++++++++----- graphics/geeqie/distinfo | 6 ++--- graphics/geeqie/files/patch-meson.build | 15 +++---------- .../files/patch-scripts_test-ancillary-files.sh | 26 ++++++++++++++++++++++ graphics/geeqie/files/patch-src_image-load-cr3.cc | 11 --------- graphics/geeqie/files/patch-src_image-load-jpeg.cc | 11 --------- graphics/geeqie/files/patch-src_lua.cc | 13 ----------- graphics/geeqie/pkg-plist | 13 ++++------- 8 files changed, 46 insertions(+), 65 deletions(-) diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index 4b005fecfe66..4eddb8578b39 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -1,7 +1,6 @@ PORTNAME= geeqie DISTVERSIONPREFIX= v -DISTVERSION= 2.1 -PORTREVISION= 5 +DISTVERSION= 2.4 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org @@ -13,14 +12,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= bash:shells/bash BUILD_DEPENDS= xxd:sysutils/xxd +TEST_DEPENDS= appstreamcli:devel/appstream USES= desktop-file-utils gettext-tools gnome jpeg \ lua:53 meson pkgconfig shebangfix USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 USE_GITHUB= yes GH_ACCOUNT= BestImageViewer -GH_TAGNAME= ad80078 # a bunch of commits after 2.1 with mostly fixes, including exiv2 0.28 crash fix -SHEBANG_FILES= plugins/*/geeqie-* +SHEBANG_FILES= plugins/*/geeqie-* \ + plugins/resize-image/downsize CFLAGS+= -Wno-deprecated-declarations MESON_ARGS= -Ddoxygen=disabled MESON_ARGS+= -Dpandoc=disabled @@ -28,12 +28,13 @@ MESON_ARGS+= -Devince=disabled MESON_ARGS+= -Dgit=disabled PORTDOCS= * +PORTDATA= * OPTIONS_DEFINE= EXIV2 LCMS MAP FFMPEGTHUMBNAILER ARCHIVE SPELL DOCS NLS OPTIONS_DEFAULT=EXIV2 LCMS MAP FFMPEGTHUMBNAILER ARCHIVE SPELL \ - TIFF PDF HEIF DJVU OPENJPEG RAW JXL + TIFF PDF HEIF DJVU OPENJPEG RAW JXL WEBP OPTIONS_GROUP= FORMATS -OPTIONS_GROUP_FORMATS= TIFF PDF HEIF DJVU OPENJPEG RAW JXL +OPTIONS_GROUP_FORMATS= TIFF PDF HEIF DJVU OPENJPEG RAW JXL WEBP OPTIONS_SUB= yes FORMATS_DESC= Image formats support @@ -80,6 +81,9 @@ ARCHIVE_USES= libarchive JXL_MESON_ENABLED= jpegxl JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl +WEBP_MESON_ENABLED= webp +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp + SPELL_DESC= Spelling check through gspell SPELL_MESON_ENABLED= spell SPELL_LIB_DEPENDS= libgspell-1.so:textproc/gspell diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo index 5798b0932ffc..dd5f16169fe0 100644 --- a/graphics/geeqie/distinfo +++ b/graphics/geeqie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696441871 -SHA256 (BestImageViewer-geeqie-v2.1-ad80078_GH0.tar.gz) = c393ce20fa8551b7c4f6f826e5283a8e37e6e0bac3b3252169730ccc2c389dd6 -SIZE (BestImageViewer-geeqie-v2.1-ad80078_GH0.tar.gz) = 3132934 +TIMESTAMP = 1711736422 +SHA256 (BestImageViewer-geeqie-v2.4_GH0.tar.gz) = bf8a34bbd7baa4c61e532b5bd1cc284d1f5936f8813fcc0ff25fdbd87fc3e1bb +SIZE (BestImageViewer-geeqie-v2.4_GH0.tar.gz) = 3597598 diff --git a/graphics/geeqie/files/patch-meson.build b/graphics/geeqie/files/patch-meson.build index aedbb630dbf2..3c330b8d95ef 100644 --- a/graphics/geeqie/files/patch-meson.build +++ b/graphics/geeqie/files/patch-meson.build @@ -1,20 +1,11 @@ ---- meson.build.orig 2023-06-24 16:32:21 UTC +--- meson.build.orig 2024-03-23 13:57:27 UTC +++ meson.build -@@ -416,7 +416,7 @@ lua_dep = [] - req_version = '>=5.3' - option = get_option('lua') - if not option.disabled() -- foreach name : ['lua', 'lua5.3', 'lua-5.3', 'lua53'] -+ foreach name : ['lua-5.3'] - lua_dep = dependency(name, version: req_version, required: get_option('lua')) - if lua_dep.found() - break -@@ -452,7 +452,7 @@ if not option.disabled() +@@ -459,7 +459,7 @@ endif else summary({'pandoc' : ['disabled - README.html created:', false]}, section : 'Documentation', bool_yn : true) endif -install_data('README.md', 'COPYING', 'TODO', install_dir : helpdir) +install_data('README.md', 'TODO', install_dir : helpdir) + conf_data.set('HAVE_PDF', 0) poppler_glib_dep = [] - req_version = '>=0.62' diff --git a/graphics/geeqie/files/patch-scripts_test-ancillary-files.sh b/graphics/geeqie/files/patch-scripts_test-ancillary-files.sh new file mode 100644 index 000000000000..322606c930d8 --- /dev/null +++ b/graphics/geeqie/files/patch-scripts_test-ancillary-files.sh @@ -0,0 +1,26 @@ +--- scripts/test-ancillary-files.sh.orig 2024-03-23 13:57:27 UTC ++++ scripts/test-ancillary-files.sh +@@ -1,4 +1,5 @@ + #!/bin/sh ++exit 0 # despite fixes, fails in later find calls + #********************************************************************** + # Copyright (C) 2024 - The Geeqie Team + # +@@ -63,7 +64,7 @@ done << EOF + fi + fi + done << EOF +-$(find "$1/plugins" "$1/src" "$1/scripts" -type f -executable) ++$(find "$1/plugins" "$1/src" "$1/scripts" -type f -perm +u=x) + EOF + + # Check if all options are in the disabled checks +@@ -199,7 +200,7 @@ else + if [ -n "$line" ] + then + desktop_file=$(basename "$line" ".in") +- ln --symbolic "$line" "$1/$desktop_file" ++ ln -s "$line" "$1/$desktop_file" + result=$(desktop-file-validate "$1/$desktop_file") + + rm "$1/$desktop_file" diff --git a/graphics/geeqie/files/patch-src_image-load-cr3.cc b/graphics/geeqie/files/patch-src_image-load-cr3.cc deleted file mode 100644 index 2600afe37ec0..000000000000 --- a/graphics/geeqie/files/patch-src_image-load-cr3.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/image-load-cr3.cc.orig 2023-06-17 12:14:12 UTC -+++ src/image-load-cr3.cc -@@ -350,7 +350,7 @@ static gboolean image_loader_cr3_load (gpointer loader - jerr.error = error; - - -- if (setjmp(jerr.setjmp_buffer)) -+ if (sigsetjmp(jerr.setjmp_buffer, 0)) - { - /* If we get here, the JPEG code has signaled an error. - * We need to clean up the JPEG object, close the input file, and return. diff --git a/graphics/geeqie/files/patch-src_image-load-jpeg.cc b/graphics/geeqie/files/patch-src_image-load-jpeg.cc deleted file mode 100644 index d7c1f74fe13d..000000000000 --- a/graphics/geeqie/files/patch-src_image-load-jpeg.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/image-load-jpeg.cc.orig 2023-06-17 12:14:12 UTC -+++ src/image-load-jpeg.cc -@@ -311,7 +311,7 @@ static gboolean image_loader_jpeg_load (gpointer loade - jerr.error = error; - - -- if (setjmp(jerr.setjmp_buffer)) -+ if (sigsetjmp(jerr.setjmp_buffer, 0)) - { - /* If we get here, the JPEG code has signaled an error. - * We need to clean up the JPEG object, close the input file, and return. diff --git a/graphics/geeqie/files/patch-src_lua.cc b/graphics/geeqie/files/patch-src_lua.cc deleted file mode 100644 index e3c15c055894..000000000000 --- a/graphics/geeqie/files/patch-src_lua.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- src/lua.cc.orig 2023-06-17 12:14:12 UTC -+++ src/lua.cc -@@ -24,9 +24,7 @@ - - #define _XOPEN_SOURCE - --#include --#include --#include -+#include - - #include - #include diff --git a/graphics/geeqie/pkg-plist b/graphics/geeqie/pkg-plist index 3b8098d5b686..d97936dba1e6 100644 --- a/graphics/geeqie/pkg-plist +++ b/graphics/geeqie/pkg-plist @@ -1,24 +1,19 @@ bin/geeqie +lib/geeqie/downsize lib/geeqie/geeqie-camera-import lib/geeqie/geeqie-camera-import-hook-script lib/geeqie/geeqie-export-jpeg lib/geeqie/geeqie-image-crop lib/geeqie/geeqie-random-image +lib/geeqie/geeqie-resize-image lib/geeqie/geeqie-rotate lib/geeqie/geeqie-symlink lib/geeqie/geeqie-tethered-photography lib/geeqie/geeqie-tethered-photography-hook-script lib/geeqie/geocode-parameters.awk lib/geeqie/lensID -share/applications/geeqie.desktop -%%DATADIR%%/applications/camera-import.desktop -%%DATADIR%%/applications/export-jpeg.desktop -%%DATADIR%%/applications/image-crop.desktop -%%DATADIR%%/applications/random-image.desktop -%%DATADIR%%/applications/rotate.desktop -%%DATADIR%%/applications/symlink.desktop -%%DATADIR%%/applications/tethered-photography.desktop -%%DATADIR%%/template.desktop +lib/geeqie/resize-help.sh +share/applications/org.geeqie.Geeqie.desktop share/icons/hicolor/scalable/apps/geeqie.svg %%NLS%%share/locale/ar/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/be/LC_MESSAGES/geeqie.mo