Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 18B5B84D09 for ; Sat, 17 Jun 2023 16:45:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id GPrX-JsyZqbl for ; Sat, 17 Jun 2023 16:45:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 23F9584E79 for ; Sat, 17 Jun 2023 16:45:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1DC29FA89; Sat, 17 Jun 2023 16:45:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1687020344115280" MIME-Version: 1.0 Date: Sat, 17 Jun 2023 16:45:44 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/graphics/geeqie To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230617164544.1DC29FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1687020344115280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jun 17 16:45:44 UTC 2023 Modified Files: pkgsrc/graphics/geeqie: Makefile PLIST distinfo Added Files: pkgsrc/graphics/geeqie/patches: patch-src_exif-common.cc patch-src_misc.cc Removed Files: pkgsrc/graphics/geeqie/patches: patch-config.h.in patch-doc_meson.build patch-meson.build patch-meson__options.txt patch-src_main.c Log Message: geeqie: update to 2.1. Geeqie 2.1 ============ - Additional --selection remote commands - Split view additional 3-image layout - Many bug fixes - Some progress in GTK4 migration - Change source code from c to c++ - Much progress in making source code warning-free - Updated language support To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 pkgsrc/graphics/geeqie/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/geeqie/PLIST cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/geeqie/distinfo cvs rdiff -u -r1.2 -r0 pkgsrc/graphics/geeqie/patches/patch-config.h.in \ pkgsrc/graphics/geeqie/patches/patch-doc_meson.build \ pkgsrc/graphics/geeqie/patches/patch-meson__options.txt cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/geeqie/patches/patch-meson.build \ pkgsrc/graphics/geeqie/patches/patch-src_main.c cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc \ pkgsrc/graphics/geeqie/patches/patch-src_misc.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1687020344115280 Content-Disposition: inline Content-Length: 5684 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/geeqie/Makefile diff -u pkgsrc/graphics/geeqie/Makefile:1.108 pkgsrc/graphics/geeqie/Makefile:1.109 --- pkgsrc/graphics/geeqie/Makefile:1.108 Tue Jun 6 12:41:31 2023 +++ pkgsrc/graphics/geeqie/Makefile Sat Jun 17 16:45:43 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.108 2023/06/06 12:41:31 riastradh Exp $ +# $NetBSD: Makefile,v 1.109 2023/06/17 16:45:43 wiz Exp $ -DISTNAME= geeqie-2.0.1 -PKGREVISION= 7 +DISTNAME= geeqie-2.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=BestImageViewer/} EXTRACT_SUFX= .tar.xz @@ -17,6 +16,9 @@ TOOL_DEPENDS+= gettext-m4-[0-9]*:../../d TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share LDFLAGS.SunOS+= -lm -lsocket -lnsl +# ld: src/geeqie.p/main.cc.o: undefined reference to symbol 'backtrace' +# ld: /usr/lib/libexecinfo.so.0: error adding symbols: DSO missing from command line +LDFLAGS.NetBSD+= -lexecinfo MESON_ARGS+= -Ddoxygen=disabled @@ -38,6 +40,7 @@ post-install: .include "../../devel/meson/build.mk" .include "../../graphics/exiv2/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" .include "../../graphics/libheif/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" Index: pkgsrc/graphics/geeqie/PLIST diff -u pkgsrc/graphics/geeqie/PLIST:1.12 pkgsrc/graphics/geeqie/PLIST:1.13 --- pkgsrc/graphics/geeqie/PLIST:1.12 Mon Nov 21 11:58:47 2022 +++ pkgsrc/graphics/geeqie/PLIST Sat Jun 17 16:45:43 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2022/11/21 11:58:47 wiz Exp $ +@comment $NetBSD: PLIST,v 1.13 2023/06/17 16:45:43 wiz Exp $ bin/geeqie lib/geeqie/geeqie-camera-import lib/geeqie/geeqie-camera-import-hook-script @@ -13,7 +13,6 @@ lib/geeqie/geocode-parameters.awk lib/geeqie/lensID man/man1/geeqie.1 share/applications/geeqie.desktop -share/doc/geeqie/AUTHORS share/doc/geeqie/COPYING share/doc/geeqie/README.md share/doc/geeqie/TODO @@ -25,6 +24,7 @@ share/geeqie/applications/rotate.desktop share/geeqie/applications/symlink.desktop share/geeqie/applications/tethered-photography.desktop share/geeqie/template.desktop +share/icons/hicolor/scalable/apps/geeqie.svg share/locale/ar/LC_MESSAGES/geeqie.mo share/locale/be/LC_MESSAGES/geeqie.mo share/locale/bg/LC_MESSAGES/geeqie.mo Index: pkgsrc/graphics/geeqie/distinfo diff -u pkgsrc/graphics/geeqie/distinfo:1.30 pkgsrc/graphics/geeqie/distinfo:1.31 --- pkgsrc/graphics/geeqie/distinfo:1.30 Tue Nov 22 14:13:23 2022 +++ pkgsrc/graphics/geeqie/distinfo Sat Jun 17 16:45:43 2023 @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.30 2022/11/22 14:13:23 gdt Exp $ +$NetBSD: distinfo,v 1.31 2023/06/17 16:45:43 wiz Exp $ -BLAKE2s (geeqie-2.0.1.tar.xz) = 344660eddf23258c87afb4855c616ba24a6eb0562756c15c554bed30e241ae78 -SHA512 (geeqie-2.0.1.tar.xz) = cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5 -Size (geeqie-2.0.1.tar.xz) = 1666600 bytes -SHA1 (patch-config.h.in) = 301b461a7c3ce8b699f4651363ddf18017eca0df -SHA1 (patch-doc_meson.build) = bfa986b7181355c8f02ffec1af39476a0bc6b491 -SHA1 (patch-meson.build) = c6a0ac55b03d3c78619c55f82feebe66ea0a1e6b -SHA1 (patch-meson__options.txt) = e25acfd12c46337e1a992e5629cf82b5fa8f838d -SHA1 (patch-src_main.c) = 24531eeaf999e26cf0cfd3983a0fbb0eaaaf569f +BLAKE2s (geeqie-2.1.tar.xz) = 179c98a22e51fcc7cbe7f9832f1a0902abbf3c8ef688a809bd24ba2cef82cbc1 +SHA512 (geeqie-2.1.tar.xz) = 1812234d349536626433bbb7670cd45ef5ce328bf58f603af8eb4a01f7d3db2557d5a812714b12a9b49559aa1fe1c186ceddf2f632c2b303d64d36ad746a2d2f +Size (geeqie-2.1.tar.xz) = 1800612 bytes +SHA1 (patch-src_exif-common.cc) = 2752f7c95aff03cf2ff268c4f2cbe09656ca3867 +SHA1 (patch-src_misc.cc) = ccf039c570f04998691d05da891ce18072c08d63 Added files: Index: pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc:1.1 --- /dev/null Sat Jun 17 16:45:44 2023 +++ pkgsrc/graphics/geeqie/patches/patch-src_exif-common.cc Sat Jun 17 16:45:43 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_exif-common.cc,v 1.1 2023/06/17 16:45:43 wiz Exp $ + +../src/exif-common.cc:780:3: error: 'setenv' was not declared in this scope; did you mean 'getenv'? + +--- src/exif-common.cc.orig 2023-06-17 12:12:30.000000000 +0000 ++++ src/exif-common.cc +@@ -19,6 +19,8 @@ + + #include + ++#include ++ + #define _XOPEN_SOURCE + + #include Index: pkgsrc/graphics/geeqie/patches/patch-src_misc.cc diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-src_misc.cc:1.1 --- /dev/null Sat Jun 17 16:45:44 2023 +++ pkgsrc/graphics/geeqie/patches/patch-src_misc.cc Sat Jun 17 16:45:43 2023 @@ -0,0 +1,23 @@ +$NetBSD: patch-src_misc.cc,v 1.1 2023/06/17 16:45:43 wiz Exp $ + +../src/misc.cc: In function 'gint date_get_first_day_of_week()': +../src/misc.cc:262:29: error: 'LC_ALL' was not declared in this scope; did you mean 'P_ALL'? + 262 | current_locale = setlocale(LC_ALL, NULL); + | ^~~~~~ + | P_ALL +../src/misc.cc:262:19: error: 'setlocale' was not declared in this scope; did you mean '_locale'? + 262 | current_locale = setlocale(LC_ALL, NULL); + | ^~~~~~~~~ + | _locale + +--- src/misc.cc.orig 2023-06-17 12:12:30.000000000 +0000 ++++ src/misc.cc +@@ -18,6 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include ++ + #include "main.h" + #include "misc.h" + --_----------=_1687020344115280--