diff options
author | wiz <wiz@pkgsrc.org> | 2022-11-21 11:58:47 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2022-11-21 11:58:47 +0000 |
commit | 7eefdc68aabc314e932ff19809452a6aea717bfe (patch) | |
tree | cae13ce646471ba4a9503dd19639e1e6dd7d5732 /graphics/geeqie | |
parent | ed2c4eb29a1324bed5492f67fb49dc7f7f30c89e (diff) | |
download | pkgsrc-7eefdc68aabc314e932ff19809452a6aea717bfe.tar.gz |
geeqie: update to 2.0.1.
Geeqie 2.0.1
============
- Exclude build directories from release tar
Geeqie 2.0
============
- GTK2 no longer supported
- Configuration system moved from Autotools to Meson
- Spelling checks for metadata
- When navigation folders, on return to a folder select last image viewed
- Search facility in Exif window
- Display keyboard shortcuts in popup menus
- LIRC deleted
- renderer-clutter() deleted
And as usual:
- Many bug fixes
- Updated language support
Diffstat (limited to 'graphics/geeqie')
-rw-r--r-- | graphics/geeqie/Makefile | 21 | ||||
-rw-r--r-- | graphics/geeqie/PLIST | 13 | ||||
-rw-r--r-- | graphics/geeqie/distinfo | 11 | ||||
-rw-r--r-- | graphics/geeqie/options.mk | 16 | ||||
-rw-r--r-- | graphics/geeqie/patches/patch-ac | 12 | ||||
-rw-r--r-- | graphics/geeqie/patches/patch-config.h.in | 15 |
6 files changed, 45 insertions, 43 deletions
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index da2c82270f0..f333918d2ac 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.96 2022/08/11 05:08:41 gutteridge Exp $ +# $NetBSD: Makefile,v 1.97 2022/11/21 11:58:47 wiz Exp $ -DISTNAME= geeqie-1.7.3 -PKGREVISION= 1 +DISTNAME= geeqie-2.0.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=BestImageViewer/} EXTRACT_SUFX= .tar.xz @@ -13,31 +12,33 @@ COMMENT= Image viewer LICENSE= gnu-gpl-v2 BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 - -GNU_CONFIGURE= yes +# .../geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh: xxd: not found +TOOL_DEPENDS+= vim-share-[0-9]*:../../editors/vim-share LDFLAGS.SunOS+= -lm -lsocket -lnsl USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ -USE_TOOLS= bash:run gmake intltool msgfmt pkg-config automake autoconf autoreconf +USE_TOOLS= bash:run intltool msgfmt pkg-config REPLACE_BASH+= plugins/*/* REPLACE_BASH+= doc/*.sh REPLACE_BASH+= g*.sh REPLACE_BASH+= version.sh -pre-configure: replace-interpreter - cd ${WRKSRC} && autoreconf -fiv +INSTALLATION_DIRS= ${PKGMANDIR}/man1 + +post-install: + ${MV} ${DESTDIR}${PREFIX}/share/man/man1/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "options.mk" +.include "../../devel/meson/build.mk" .include "../../graphics/exiv2/buildlink3.mk" .include "../../graphics/lcms2/buildlink3.mk" .include "../../graphics/libheif/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/openjpeg/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -BUILDLINK_API_DEPENDS.gnome-doc-utils+= gnome-doc-utils>=0.20.10nb4 -.include "../../textproc/gnome-doc-utils/buildlink3.mk" +.include "../../devel/gettext-tools/msgfmt-desktop.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/geeqie/PLIST b/graphics/geeqie/PLIST index 5e26b16958e..d62e06640d0 100644 --- a/graphics/geeqie/PLIST +++ b/graphics/geeqie/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2022/05/20 12:03:08 wiz Exp $ +@comment $NetBSD: PLIST,v 1.12 2022/11/21 11:58:47 wiz Exp $ bin/geeqie lib/geeqie/geeqie-camera-import lib/geeqie/geeqie-camera-import-hook-script @@ -13,13 +13,10 @@ lib/geeqie/geocode-parameters.awk lib/geeqie/lensID man/man1/geeqie.1 share/applications/geeqie.desktop -share/doc/${PKGNAME}/AUTHORS -share/doc/${PKGNAME}/COPYING -share/doc/${PKGNAME}/ChangeLog -share/doc/${PKGNAME}/ChangeLog.html -share/doc/${PKGNAME}/README.lirc -share/doc/${PKGNAME}/README.md -share/doc/${PKGNAME}/TODO +share/doc/geeqie/AUTHORS +share/doc/geeqie/COPYING +share/doc/geeqie/README.md +share/doc/geeqie/TODO share/geeqie/applications/camera-import.desktop share/geeqie/applications/export-jpeg.desktop share/geeqie/applications/image-crop.desktop diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo index f4048a4b35c..ad24b33e25f 100644 --- a/graphics/geeqie/distinfo +++ b/graphics/geeqie/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.24 2022/05/20 12:03:08 wiz Exp $ +$NetBSD: distinfo,v 1.25 2022/11/21 11:58:47 wiz Exp $ -BLAKE2s (geeqie-1.7.3.tar.xz) = 81f86e9d23ef3677c70731aed68617e227cb1d3745afd705574166aa6de2ed44 -SHA512 (geeqie-1.7.3.tar.xz) = 5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9 -Size (geeqie-1.7.3.tar.xz) = 1949696 bytes -SHA1 (patch-ac) = df54d39df0ba883759e17e0614a203d6a119f7db +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-ac) = 6cebab3e14ce51c59e70fc902a514d1bbafc3b33 +SHA1 (patch-config.h.in) = 578bc8dc98a7a1879e894755de5c2211ba79e2c9 diff --git a/graphics/geeqie/options.mk b/graphics/geeqie/options.mk index 7cb83f5826a..d1840307991 100644 --- a/graphics/geeqie/options.mk +++ b/graphics/geeqie/options.mk @@ -1,29 +1,17 @@ -# $NetBSD: options.mk,v 1.8 2021/01/11 18:15:13 gdt Exp $ +# $NetBSD: options.mk,v 1.9 2022/11/21 11:58:47 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.geeqie -PKG_OPTIONS_OPTIONAL_GROUPS= gtk -PKG_OPTIONS_GROUP.gtk= gtk2 gtk3 -PKG_SUPPORTED_OPTIONS= libchamplain +PKG_SUPPORTED_OPTIONS= gtk3 libchamplain PKG_SUGGESTED_OPTIONS= gtk3 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mlibchamplain) # While clutter is optional, the map requires it. -CONFIGURE_ARGS+= --enable-clutter .include "../../graphics/clutter/buildlink3.mk" - -CONFIGURE_ARGS+= --enable-map .include "../../geography/libchamplain012/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-map -.endif - -.if !empty(PKG_OPTIONS:Mgtk2) -.include "../../x11/gtk2/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mgtk3) -CONFIGURE_ARGS+= --enable-gtk3 .include "../../x11/gtk3/buildlink3.mk" .endif diff --git a/graphics/geeqie/patches/patch-ac b/graphics/geeqie/patches/patch-ac index e91cc2e7499..d3f5943e513 100644 --- a/graphics/geeqie/patches/patch-ac +++ b/graphics/geeqie/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.7 2022/05/20 12:03:08 wiz Exp $ +$NetBSD: patch-ac,v 1.8 2022/11/21 11:58:47 wiz Exp $ * first hunk @@ -9,17 +9,17 @@ Comment from 2009/07/24: This is not known to be reported upstream. ---- src/main.c.orig 2022-04-12 09:46:17.000000000 +0000 +--- src/main.c.orig 2022-08-12 09:32:26.000000000 +0000 +++ src/main.c -@@ -1223,6 +1223,7 @@ void exit_program(void) +@@ -1026,6 +1026,7 @@ void exit_program(void) */ /** @FIXME this probably needs some better ifdefs. Please report any compilation problems */ +#if 0 #if defined(SIGBUS) && defined(SA_SIGINFO) - static void sigbus_handler_cb(int signum, siginfo_t *info, void *context) + static void sigbus_handler_cb(int UNUSED(signum), siginfo_t *info, void *UNUSED(context)) { -@@ -1231,9 +1232,11 @@ static void sigbus_handler_cb(int signum +@@ -1034,9 +1035,11 @@ static void sigbus_handler_cb(int UNUSED mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); } #endif @@ -31,7 +31,7 @@ This is not known to be reported upstream. #if defined(SIGBUS) && defined(SA_SIGINFO) struct sigaction sigbus_action; sigfillset(&sigbus_action.sa_mask); -@@ -1242,6 +1245,7 @@ static void setup_sigbus_handler(void) +@@ -1045,6 +1048,7 @@ static void setup_sigbus_handler(void) sigaction(SIGBUS, &sigbus_action, NULL); #endif diff --git a/graphics/geeqie/patches/patch-config.h.in b/graphics/geeqie/patches/patch-config.h.in new file mode 100644 index 00000000000..a5515e0e5db --- /dev/null +++ b/graphics/geeqie/patches/patch-config.h.in @@ -0,0 +1,15 @@ +$NetBSD: patch-config.h.in,v 1.1 2022/11/21 11:58:47 wiz Exp $ + +Do not unconditionally assume the existence of the glibc-specific strverscmp(3). + +--- config.h.in.orig 2022-08-12 09:32:25.000000000 +0000 ++++ config.h.in +@@ -161,7 +161,7 @@ + #define HAVE_STRING_H 1 + + /* Define to 1 if you have the `strverscmp' function. */ +-#define HAVE_STRVERSCMP 1 ++#mesondefine HAVE_STRVERSCMP + + /* Define to 1 if you have the <sys/stat.h> header file. */ + #define HAVE_SYS_STAT_H 1 |