graphics/exiv2 0.27.* breakage

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

graphics/exiv2 0.27.* breakage

Heppler, J. Scott
Hi,

exiv2 0.26 -> 0.27 broke many ports earlier in the year.  My ports
search shows it was used by KDE4 and Gnome3 graphics ports.

I'm interested in graphics/geeqie which had a 1.5 release that addressed
the exiv2 upgrade.  The newer geeqie supports gtk2/3 and has a
libgphoto2 plugin that obviates graphics/gtkam.

My sense is that an exiv2 upgrade will depend on the KDE4 packages which
will likely require maintainer patches.  Gnome3/KDE5 upstream will have
patched/released for exiv2 0.27.*

Geeqie 1.5 should build against the older exiv2 and I'm willing to
attempt if it fits into the overall plan for KDE4/exiv2.  Is exiv2
slated for an upgrade in the near future?  Any reason not to use the
gtk3 toolkit for geeqie?

Thanks

--
J. Scott Heppler

Reply | Threaded
Open this post in threaded view
|

geeqie [Re: graphics/exiv2 0.27.* breakage]

Stuart Henderson
On 2019/08/01 07:52, Heppler, J. Scott wrote:
> Hi,
>
> exiv2 0.26 -> 0.27 broke many ports earlier in the year.  My ports
> search shows it was used by KDE4 and Gnome3 graphics ports.
>
> I'm interested in graphics/geeqie which had a 1.5 release that addressed
> the exiv2 upgrade.

Updating geeqie is independent of the exiv2 update, so I've changed the
Subject line of this as that seems the main aim of the mail.

>                     The newer geeqie supports gtk2/3 and has a
> libgphoto2 plugin that obviates graphics/gtkam.

I haven't looked at the gphoto2 plugin (btw it just uses the CLI tool not
the library), but the other plugin scripts are of variable quality and are
obviously only really tested on linux.

> My sense is that an exiv2 upgrade will depend on the KDE4 packages which
> will likely require maintainer patches.  Gnome3/KDE5 upstream will have
> patched/released for exiv2 0.27.*
>
> Geeqie 1.5 should build against the older exiv2 and I'm willing to
> attempt if it fits into the overall plan for KDE4/exiv2.  Is exiv2
> slated for an upgrade in the near future?  Any reason not to use the
> gtk3 toolkit for geeqie?

The geeqie port already uses Gtk+3 (DESCR is outdated).

Here's a start at updating it, though those plugins need a careful look
and properly figuring out what works OK, what can be fixed, and what
should just be @comment'ed out in PLIST (watch out for gnu-specific flags
to commands like find, amongst other things).

Careful testing plugins as I have seen them do things such as calling rm
with bad parameters.

For the other things that were broken by the previous attempt at updating
exiv2, they really just want a test build and see what's involved. I think
many of us are not all that interested in touching the kde things too much
as they have a tendency to break whenever they're touched (and sometimes
even when they're not touched ...)



Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/geeqie/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 12 Jul 2019 20:46:59 -0000 1.22
+++ Makefile 1 Aug 2019 16:16:37 -0000
@@ -2,20 +2,19 @@
 
 COMMENT= lightweight Gtk+3 based image viewer
 
-DISTNAME= geeqie-1.4
+DISTNAME= geeqie-1.5
 EXTRACT_SUFX= .tar.xz
 CATEGORIES= graphics
 EPOCH= 0
-REVISION= 1
 
 HOMEPAGE= http://geeqie.org/
 
 # GPLv2+
 PERMIT_PACKAGE= Yes
 
-WANTLIB += atk-1.0 c cairo cairo-gobject exiv2 gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 intl
-WANTLIB += jpeg lcms2 m pango-1.0 pangocairo-1.0 pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} atk-1.0 c cairo cairo-gobject exiv2
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
+WANTLIB += gtk-3 intl jpeg lcms2 m pango-1.0 pangocairo-1.0 poppler-glib
 WANTLIB += tiff
 
 COMPILER = base-clang ports-gcc base-gcc
@@ -29,15 +28,19 @@ BUILD_DEPENDS= x11/gnome/doc-utils
 RUN_DEPENDS= devel/desktop-file-utils \
  devel/xdg-utils \
  graphics/ImageMagick \
- graphics/exiftran
+ graphics/exiftran \
+ graphics/p5-Image-ExifTool \
+ shells/bash \
+ x11/gnome/zenity
 
 LIB_DEPENDS= graphics/exiv2 \
  graphics/lcms2 \
+ print/poppler,-main \
  x11/gtk+3
 
 USE_GMAKE= Yes
 
-CONFIGURE_STYLE= autoreconf
+CONFIGURE_STYLE= gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
  LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS= --disable-doxygen-doc \
@@ -49,9 +52,9 @@ CONFIGURE_ARGS= --disable-doxygen-doc \
  --with-htmldir=${PREFIX}/share/doc/geeqie \
  --with-readmedir=${PREFIX}/share/doc/geeqie
 
-AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.14
-AUTORECONF= ./autogen.sh
 MAKE_ENV= MKDIR_P='mkdir -p'
+
+post-install:
+ sed -i 's,^#!/bin/bash,#!${LOCALBASE}/bin/bash,' ${PREFIX}/lib/geeqie/*
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/geeqie/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 22 Jan 2018 07:45:37 -0000 1.6
+++ distinfo 1 Aug 2019 16:16:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (geeqie-1.4.tar.xz) = XFg6FlVz7DeHTCePncV+c981azDgmpzKwxed1dl+PjI=
-SIZE (geeqie-1.4.tar.xz) = 35881152
+SHA256 (geeqie-1.5.tar.xz) = lzbIy/Icw50KnHIJNM3TP+J1bckDwqEs/Hi4gi0tG/U=
+SIZE (geeqie-1.5.tar.xz) = 1585780
Index: patches/patch-Makefile_am
===================================================================
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- patches/patch-Makefile_am 22 Jan 2018 07:45:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-Makefile_am,v 1.1 2018/01/22 07:45:37 kirby Exp $
-
-Index: Makefile.am
---- Makefile.am.orig
-+++ Makefile.am
-@@ -10,9 +10,9 @@ man_MANS = geeqie.1
- readmedir = @readmedir@
-
- if HAVE_MARKDOWN
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
-+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
- else
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
-+readme_DATA = README.md COPYING TODO README.lirc AUTHORS
- endif
-
- desktopdir = $(datadir)/applications
-@@ -36,10 +36,6 @@ dist-hook: geeqie.spec
- cp $(top_builddir)/geeqie.spec $(distdir)
-
- DISTCLEANFILES = config.report
--
--.PHONY: ChangeLog
--ChangeLog.html:
-- ./gen_changelog.sh
-
- README.html: README.md
- ./gen_readme.sh
Index: patches/patch-plugins_random-image_geeqie-random-image
===================================================================
RCS file: patches/patch-plugins_random-image_geeqie-random-image
diff -N patches/patch-plugins_random-image_geeqie-random-image
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_random-image_geeqie-random-image 1 Aug 2019 16:16:37 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: plugins/random-image/geeqie-random-image
+--- plugins/random-image/geeqie-random-image.orig
++++ plugins/random-image/geeqie-random-image
+@@ -39,7 +39,7 @@ files_no_blanks=$(echo "$list" | sed -e 's/^[[:blank:]
+ files_no_spaces=$(echo "$files_no_blanks" | sed 's/^[ \t]*//;s/[ \t]*$//')
+
+ # remove duplicate lines and select random line
+-display_image="$(echo "$files_no_spaces" | sort --uniq | shuf -n 1)"
++display_image="$(echo "$files_no_spaces" | sort -uR | head -1)"
+
+ # get image currently displayed
+ current_image_collection=$(geeqie --remote --tell)
+@@ -51,7 +51,7 @@ curent_image=$(echo "$current_image_spaces" | sed 's/^
+ # if the selected random image is currently displayed, try again
+ if [ "$current_image" == "$display_image" ]
+ then
+- display_image="$(echo "$files_no_spaces" | sort --uniq | shuf -n 1)"
++ display_image="$(echo "$files_no_spaces" | sort -uR | head -1)"
+ fi
+
+ geeqie --remote file:"$display_image"
Index: patches/patch-src_misc_c
===================================================================
RCS file: patches/patch-src_misc_c
diff -N patches/patch-src_misc_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_misc_c 1 Aug 2019 16:16:37 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: src/misc.c
+--- src/misc.c.orig
++++ src/misc.c
+@@ -249,7 +249,11 @@ int runcmd(gchar *cmd)
+  */
+ gint date_get_first_day_of_week()
+ {
++#ifdef _NL_TIME_FIRST_WEEKDAY
+ return nl_langinfo(_NL_TIME_FIRST_WEEKDAY)[0];
++#else
++ return 2;
++#endif
+ }
+
+ /**
Index: patches/patch-src_pan-view_pan-util_c
===================================================================
RCS file: patches/patch-src_pan-view_pan-util_c
diff -N patches/patch-src_pan-view_pan-util_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_pan-view_pan-util_c 1 Aug 2019 16:16:37 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: src/pan-view/pan-util.c
+--- src/pan-view/pan-util.c.orig
++++ src/pan-view/pan-util.c
+@@ -99,11 +99,7 @@ gchar *pan_date_value_string(time_t d, PanDateLengthTy
+ format = "%A %e";
+ break;
+ case PAN_DATE_LENGTH_MONTH:
+-#if __GLIBC_PREREQ(2, 27)
+- format = "%OB %Y";
+-#else
+ format = "%B %Y";
+-#endif
+ break;
+ case PAN_DATE_LENGTH_YEAR:
+ return g_strdup_printf("%d", td.tm_year + 1900);
Index: patches/patch-src_window_c
===================================================================
RCS file: /cvs/ports/graphics/geeqie/patches/patch-src_window_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_window_c
--- patches/patch-src_window_c 28 May 2016 13:59:51 -0000 1.2
+++ patches/patch-src_window_c 1 Aug 2019 16:16:37 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src_window_c,v 1.2 2016/05/28 13:59:51 sthen Exp $
---- src/window.c.orig Fri May 27 10:37:56 2016
-+++ src/window.c Sat May 28 14:55:27 2016
-@@ -171,19 +171,11 @@ static gchar *html_browsers[] =
+Index: src/window.c
+--- src/window.c.orig
++++ src/window.c
+@@ -173,19 +173,11 @@ static gchar *html_browsers[] =
  {
  /* Our specific script */
  GQ_APPNAME_LC "_html_browser", NULL,
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/graphics/geeqie/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 9 Mar 2011 09:58:49 -0000 1.1.1.1
+++ pkg/DESCR 1 Aug 2019 16:16:37 -0000
@@ -1,4 +1,4 @@
-Geeqie is a lightweight Gtk+2 based image viewer for Unix like operating
+Geeqie is a lightweight Gtk+3 based image viewer for Unix like operating
 systems.
 Its main features are:
     * EXIF, IPTC and XMP metadata browsing and editing interoperability,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:53 -0000 1.8
+++ pkg/PLIST 1 Aug 2019 16:16:37 -0000
@@ -3,9 +3,15 @@
 @pkgpath graphics/gqview
 @bin bin/geeqie
 lib/geeqie/
-lib/geeqie/geeqie-import
+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-rotate
 lib/geeqie/geeqie-symlink
+lib/geeqie/geeqie-tethered-photography
+lib/geeqie/geeqie-tethered-photography-hook-script
 @comment lib/geeqie/geeqie-ufraw
 lib/geeqie/geocode-parameters.awk
 @man man/man1/geeqie.1
@@ -14,7 +20,8 @@ share/doc/geeqie/
 share/doc/geeqie/AUTHORS
 share/doc/geeqie/COPYING
 share/doc/geeqie/Cancelbutton.html
-@comment share/doc/geeqie/ChangeLog
+share/doc/geeqie/ChangeLog
+share/doc/geeqie/ChangeLog.html
 share/doc/geeqie/Commandline.html
 share/doc/geeqie/ExifRotation.html
 share/doc/geeqie/Features.html
@@ -33,6 +40,7 @@ share/doc/geeqie/GuideImagePresentation.
 share/doc/geeqie/GuideImagePresentationFullscreen.html
 share/doc/geeqie/GuideImagePresentationSlideshow.html
 share/doc/geeqie/GuideImageSearch.html
+share/doc/geeqie/GuideImageSearchCache.html
 share/doc/geeqie/GuideImageSearchFindingDuplicates.html
 share/doc/geeqie/GuideImageSearchSearch.html
 share/doc/geeqie/GuideIndex-info.html
@@ -55,9 +63,11 @@ share/doc/geeqie/GuideOptionsGeneral.htm
 share/doc/geeqie/GuideOptionsHidden.html
 share/doc/geeqie/GuideOptionsImage.html
 share/doc/geeqie/GuideOptionsKeyboard.html
+share/doc/geeqie/GuideOptionsKeywords.html
 share/doc/geeqie/GuideOptionsLayout.html
 share/doc/geeqie/GuideOptionsMain.html
 share/doc/geeqie/GuideOptionsMetadata.html
+share/doc/geeqie/GuideOptionsOSD.html
 share/doc/geeqie/GuideOptionsStereo.html
 share/doc/geeqie/GuideOptionsToolbar.html
 share/doc/geeqie/GuideOptionsWindow.html
@@ -76,10 +86,13 @@ share/doc/geeqie/GuideReferenceLIRC.html
 share/doc/geeqie/GuideReferenceLua.html
 share/doc/geeqie/GuideReferenceManagement.html
 share/doc/geeqie/GuideReferenceMetadata.html
+share/doc/geeqie/GuideReferencePCRE.html
 share/doc/geeqie/GuideReferencePixbufLoaders.html
+share/doc/geeqie/GuideReferenceStandardPlugins.html
 share/doc/geeqie/GuideReferenceStandards.html
 share/doc/geeqie/GuideReferenceSupportedFormats.html
 share/doc/geeqie/GuideReferenceThumbnails.html
+share/doc/geeqie/GuideReferenceUTC.html
 share/doc/geeqie/GuideReferenceXmpExif.html
 share/doc/geeqie/GuideSidebars.html
 share/doc/geeqie/GuideSidebarsInfo.html
@@ -129,13 +142,16 @@ share/doc/geeqie/zoom-original.png
 share/doc/geeqie/zoom-out.png
 share/geeqie/
 share/geeqie/applications/
-share/geeqie/applications/geeqie-import-geeqie.desktop
-share/geeqie/applications/geeqie-import-gqview.desktop
+share/geeqie/applications/camera-import.desktop
+share/geeqie/applications/export-jpeg.desktop
 share/geeqie/applications/geeqie-ufraw-id.desktop
 @comment share/geeqie/applications/geeqie-ufraw-recursive.desktop
 @comment share/geeqie/applications/geeqie-ufraw.desktop
+share/geeqie/applications/image-crop.desktop
+share/geeqie/applications/random-image.desktop
 share/geeqie/applications/rotate.desktop
 share/geeqie/applications/symlink.desktop
+share/geeqie/applications/tethered-photography.desktop
 share/geeqie/template.desktop
 share/locale/ar/LC_MESSAGES/geeqie.mo
 share/locale/be/LC_MESSAGES/geeqie.mo
@@ -145,6 +161,7 @@ share/locale/cs/LC_MESSAGES/geeqie.mo
 share/locale/da/LC_MESSAGES/geeqie.mo
 share/locale/de/LC_MESSAGES/geeqie.mo
 share/locale/el/LC_MESSAGES/geeqie.mo
+share/locale/en_GB/LC_MESSAGES/geeqie.mo
 share/locale/eo/LC_MESSAGES/geeqie.mo
 share/locale/es/LC_MESSAGES/geeqie.mo
 share/locale/et/LC_MESSAGES/geeqie.mo

Reply | Threaded
Open this post in threaded view
|

Re: geeqie [Re: graphics/exiv2 0.27.* breakage]

Heppler, J. Scott
Thanks for the patch.  This weekend, I could not get the patch to apply
cleanly so I tried to regenerate them locally.  The build generated an
error message on ffmpeg/thunbnailer which was disabled in the prior
build.

This raised the question, which of the new plugins are most attractive
to the project and how much effort should be made toward getting them to
build/function?  Another option is to patch geeqie 1.4 for exiv2 0.27.

The gphoto plugin is less attractive since it would mainly be beneficial
in WM's.  I'm not aware that Openbox/Fluxbox are moving toward gtk3.
DE's can use gvfs in their file manager.

Other plugins are

lirc - remote control support
clutter - map display
lua - scripting
libwmf - windows images
poppler - pdf
TimeZone detection
raw images
ImageMagick

All the above could get messy while patching 1.4 should be easy.

Any objections to just patching 1.4?


On Aug 01, 2019: 17:28, Stuart Henderson wrote:

>On 2019/08/01 07:52, Heppler, J. Scott wrote:
>> Hi,
>>
>> exiv2 0.26 -> 0.27 broke many ports earlier in the year.  My ports
>> search shows it was used by KDE4 and Gnome3 graphics ports.
>>
>> I'm interested in graphics/geeqie which had a 1.5 release that addressed
>> the exiv2 upgrade.
>
>Updating geeqie is independent of the exiv2 update, so I've changed the
>Subject line of this as that seems the main aim of the mail.
>
>>                     The newer geeqie supports gtk2/3 and has a
>> libgphoto2 plugin that obviates graphics/gtkam.
>
>I haven't looked at the gphoto2 plugin (btw it just uses the CLI tool not
>the library), but the other plugin scripts are of variable quality and are
>obviously only really tested on linux.
>
>> My sense is that an exiv2 upgrade will depend on the KDE4 packages which
>> will likely require maintainer patches.  Gnome3/KDE5 upstream will have
>> patched/released for exiv2 0.27.*
>>
>> Geeqie 1.5 should build against the older exiv2 and I'm willing to
>> attempt if it fits into the overall plan for KDE4/exiv2.  Is exiv2
>> slated for an upgrade in the near future?  Any reason not to use the
>> gtk3 toolkit for geeqie?
>
>The geeqie port already uses Gtk+3 (DESCR is outdated).
>
>Here's a start at updating it, though those plugins need a careful look
>and properly figuring out what works OK, what can be fixed, and what
>should just be @comment'ed out in PLIST (watch out for gnu-specific flags
>to commands like find, amongst other things).
>
>Careful testing plugins as I have seen them do things such as calling rm
>with bad parameters.
>
>For the other things that were broken by the previous attempt at updating
>exiv2, they really just want a test build and see what's involved. I think
>many of us are not all that interested in touching the kde things too much
>as they have a tendency to break whenever they're touched (and sometimes
>even when they're not touched ...)
>
>
>
>Index: Makefile
>===================================================================
>RCS file: /cvs/ports/graphics/geeqie/Makefile,v
>retrieving revision 1.22
>diff -u -p -r1.22 Makefile
>--- Makefile 12 Jul 2019 20:46:59 -0000 1.22
>+++ Makefile 1 Aug 2019 16:16:37 -0000
>@@ -2,20 +2,19 @@
>
> COMMENT= lightweight Gtk+3 based image viewer
>
>-DISTNAME= geeqie-1.4
>+DISTNAME= geeqie-1.5
> EXTRACT_SUFX= .tar.xz
> CATEGORIES= graphics
> EPOCH= 0
>-REVISION= 1
>
> HOMEPAGE= http://geeqie.org/
>
> # GPLv2+
> PERMIT_PACKAGE= Yes
>
>-WANTLIB += atk-1.0 c cairo cairo-gobject exiv2 gdk-3 gdk_pixbuf-2.0
>-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-3 intl
>-WANTLIB += jpeg lcms2 m pango-1.0 pangocairo-1.0 pthread ${COMPILER_LIBCXX}
>+WANTLIB += ${COMPILER_LIBCXX} atk-1.0 c cairo cairo-gobject exiv2
>+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gthread-2.0
>+WANTLIB += gtk-3 intl jpeg lcms2 m pango-1.0 pangocairo-1.0 poppler-glib
> WANTLIB += tiff
>
> COMPILER = base-clang ports-gcc base-gcc
>@@ -29,15 +28,19 @@ BUILD_DEPENDS= x11/gnome/doc-utils
> RUN_DEPENDS= devel/desktop-file-utils \
> devel/xdg-utils \
> graphics/ImageMagick \
>- graphics/exiftran
>+ graphics/exiftran \
>+ graphics/p5-Image-ExifTool \
>+ shells/bash \
>+ x11/gnome/zenity
>
> LIB_DEPENDS= graphics/exiv2 \
> graphics/lcms2 \
>+ print/poppler,-main \
> x11/gtk+3
>
> USE_GMAKE= Yes
>
>-CONFIGURE_STYLE= autoreconf
>+CONFIGURE_STYLE= gnu
> CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib"
> CONFIGURE_ARGS= --disable-doxygen-doc \
>@@ -49,9 +52,9 @@ CONFIGURE_ARGS= --disable-doxygen-doc \
> --with-htmldir=${PREFIX}/share/doc/geeqie \
> --with-readmedir=${PREFIX}/share/doc/geeqie
>
>-AUTOCONF_VERSION= 2.69
>-AUTOMAKE_VERSION= 1.14
>-AUTORECONF= ./autogen.sh
> MAKE_ENV= MKDIR_P='mkdir -p'
>+
>+post-install:
>+ sed -i 's,^#!/bin/bash,#!${LOCALBASE}/bin/bash,' ${PREFIX}/lib/geeqie/*
>
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /cvs/ports/graphics/geeqie/distinfo,v
>retrieving revision 1.6
>diff -u -p -r1.6 distinfo
>--- distinfo 22 Jan 2018 07:45:37 -0000 1.6
>+++ distinfo 1 Aug 2019 16:16:37 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (geeqie-1.4.tar.xz) = XFg6FlVz7DeHTCePncV+c981azDgmpzKwxed1dl+PjI=
>-SIZE (geeqie-1.4.tar.xz) = 35881152
>+SHA256 (geeqie-1.5.tar.xz) = lzbIy/Icw50KnHIJNM3TP+J1bckDwqEs/Hi4gi0tG/U=
>+SIZE (geeqie-1.5.tar.xz) = 1585780
>Index: patches/patch-Makefile_am
>===================================================================
>RCS file: patches/patch-Makefile_am
>diff -N patches/patch-Makefile_am
>--- patches/patch-Makefile_am 22 Jan 2018 07:45:37 -0000 1.1
>+++ /dev/null 1 Jan 1970 00:00:00 -0000
>@@ -1,28 +0,0 @@
>-$OpenBSD: patch-Makefile_am,v 1.1 2018/01/22 07:45:37 kirby Exp $
>-
>-Index: Makefile.am
>---- Makefile.am.orig
>-+++ Makefile.am
>-@@ -10,9 +10,9 @@ man_MANS = geeqie.1
>- readmedir = @readmedir@
>-
>- if HAVE_MARKDOWN
>--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
>-+readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
>- else
>--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
>-+readme_DATA = README.md COPYING TODO README.lirc AUTHORS
>- endif
>-
>- desktopdir = $(datadir)/applications
>-@@ -36,10 +36,6 @@ dist-hook: geeqie.spec
>- cp $(top_builddir)/geeqie.spec $(distdir)
>-
>- DISTCLEANFILES = config.report
>--
>--.PHONY: ChangeLog
>--ChangeLog.html:
>-- ./gen_changelog.sh
>-
>- README.html: README.md
>- ./gen_readme.sh
>Index: patches/patch-plugins_random-image_geeqie-random-image
>===================================================================
>RCS file: patches/patch-plugins_random-image_geeqie-random-image
>diff -N patches/patch-plugins_random-image_geeqie-random-image
>--- /dev/null 1 Jan 1970 00:00:00 -0000
>+++ patches/patch-plugins_random-image_geeqie-random-image 1 Aug 2019 16:16:37 -0000
>@@ -0,0 +1,23 @@
>+$OpenBSD$
>+
>+Index: plugins/random-image/geeqie-random-image
>+--- plugins/random-image/geeqie-random-image.orig
>++++ plugins/random-image/geeqie-random-image
>+@@ -39,7 +39,7 @@ files_no_blanks=$(echo "$list" | sed -e 's/^[[:blank:]
>+ files_no_spaces=$(echo "$files_no_blanks" | sed 's/^[ \t]*//;s/[ \t]*$//')
>+
>+ # remove duplicate lines and select random line
>+-display_image="$(echo "$files_no_spaces" | sort --uniq | shuf -n 1)"
>++display_image="$(echo "$files_no_spaces" | sort -uR | head -1)"
>+
>+ # get image currently displayed
>+ current_image_collection=$(geeqie --remote --tell)
>+@@ -51,7 +51,7 @@ curent_image=$(echo "$current_image_spaces" | sed 's/^
>+ # if the selected random image is currently displayed, try again
>+ if [ "$current_image" == "$display_image" ]
>+ then
>+- display_image="$(echo "$files_no_spaces" | sort --uniq | shuf -n 1)"
>++ display_image="$(echo "$files_no_spaces" | sort -uR | head -1)"
>+ fi
>+
>+ geeqie --remote file:"$display_image"
>Index: patches/patch-src_misc_c
>===================================================================
>RCS file: patches/patch-src_misc_c
>diff -N patches/patch-src_misc_c
>--- /dev/null 1 Jan 1970 00:00:00 -0000
>+++ patches/patch-src_misc_c 1 Aug 2019 16:16:37 -0000
>@@ -0,0 +1,17 @@
>+$OpenBSD$
>+
>+Index: src/misc.c
>+--- src/misc.c.orig
>++++ src/misc.c
>+@@ -249,7 +249,11 @@ int runcmd(gchar *cmd)
>+  */
>+ gint date_get_first_day_of_week()
>+ {
>++#ifdef _NL_TIME_FIRST_WEEKDAY
>+ return nl_langinfo(_NL_TIME_FIRST_WEEKDAY)[0];
>++#else
>++ return 2;
>++#endif
>+ }
>+
>+ /**
>Index: patches/patch-src_pan-view_pan-util_c
>===================================================================
>RCS file: patches/patch-src_pan-view_pan-util_c
>diff -N patches/patch-src_pan-view_pan-util_c
>--- /dev/null 1 Jan 1970 00:00:00 -0000
>+++ patches/patch-src_pan-view_pan-util_c 1 Aug 2019 16:16:37 -0000
>@@ -0,0 +1,17 @@
>+$OpenBSD$
>+
>+Index: src/pan-view/pan-util.c
>+--- src/pan-view/pan-util.c.orig
>++++ src/pan-view/pan-util.c
>+@@ -99,11 +99,7 @@ gchar *pan_date_value_string(time_t d, PanDateLengthTy
>+ format = "%A %e";
>+ break;
>+ case PAN_DATE_LENGTH_MONTH:
>+-#if __GLIBC_PREREQ(2, 27)
>+- format = "%OB %Y";
>+-#else
>+ format = "%B %Y";
>+-#endif
>+ break;
>+ case PAN_DATE_LENGTH_YEAR:
>+ return g_strdup_printf("%d", td.tm_year + 1900);
>Index: patches/patch-src_window_c
>===================================================================
>RCS file: /cvs/ports/graphics/geeqie/patches/patch-src_window_c,v
>retrieving revision 1.2
>diff -u -p -r1.2 patch-src_window_c
>--- patches/patch-src_window_c 28 May 2016 13:59:51 -0000 1.2
>+++ patches/patch-src_window_c 1 Aug 2019 16:16:37 -0000
>@@ -1,7 +1,8 @@
> $OpenBSD: patch-src_window_c,v 1.2 2016/05/28 13:59:51 sthen Exp $
>---- src/window.c.orig Fri May 27 10:37:56 2016
>-+++ src/window.c Sat May 28 14:55:27 2016
>-@@ -171,19 +171,11 @@ static gchar *html_browsers[] =
>+Index: src/window.c
>+--- src/window.c.orig
>++++ src/window.c
>+@@ -173,19 +173,11 @@ static gchar *html_browsers[] =
>  {
>   /* Our specific script */
>   GQ_APPNAME_LC "_html_browser", NULL,
>Index: pkg/DESCR
>===================================================================
>RCS file: /cvs/ports/graphics/geeqie/pkg/DESCR,v
>retrieving revision 1.1.1.1
>diff -u -p -r1.1.1.1 DESCR
>--- pkg/DESCR 9 Mar 2011 09:58:49 -0000 1.1.1.1
>+++ pkg/DESCR 1 Aug 2019 16:16:37 -0000
>@@ -1,4 +1,4 @@
>-Geeqie is a lightweight Gtk+2 based image viewer for Unix like operating
>+Geeqie is a lightweight Gtk+3 based image viewer for Unix like operating
> systems.
> Its main features are:
>     * EXIF, IPTC and XMP metadata browsing and editing interoperability,
>Index: pkg/PLIST
>===================================================================
>RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v
>retrieving revision 1.8
>diff -u -p -r1.8 PLIST
>--- pkg/PLIST 27 Jun 2018 21:03:53 -0000 1.8
>+++ pkg/PLIST 1 Aug 2019 16:16:37 -0000
>@@ -3,9 +3,15 @@
> @pkgpath graphics/gqview
> @bin bin/geeqie
> lib/geeqie/
>-lib/geeqie/geeqie-import
>+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-rotate
> lib/geeqie/geeqie-symlink
>+lib/geeqie/geeqie-tethered-photography
>+lib/geeqie/geeqie-tethered-photography-hook-script
> @comment lib/geeqie/geeqie-ufraw
> lib/geeqie/geocode-parameters.awk
> @man man/man1/geeqie.1
>@@ -14,7 +20,8 @@ share/doc/geeqie/
> share/doc/geeqie/AUTHORS
> share/doc/geeqie/COPYING
> share/doc/geeqie/Cancelbutton.html
>-@comment share/doc/geeqie/ChangeLog
>+share/doc/geeqie/ChangeLog
>+share/doc/geeqie/ChangeLog.html
> share/doc/geeqie/Commandline.html
> share/doc/geeqie/ExifRotation.html
> share/doc/geeqie/Features.html
>@@ -33,6 +40,7 @@ share/doc/geeqie/GuideImagePresentation.
> share/doc/geeqie/GuideImagePresentationFullscreen.html
> share/doc/geeqie/GuideImagePresentationSlideshow.html
> share/doc/geeqie/GuideImageSearch.html
>+share/doc/geeqie/GuideImageSearchCache.html
> share/doc/geeqie/GuideImageSearchFindingDuplicates.html
> share/doc/geeqie/GuideImageSearchSearch.html
> share/doc/geeqie/GuideIndex-info.html
>@@ -55,9 +63,11 @@ share/doc/geeqie/GuideOptionsGeneral.htm
> share/doc/geeqie/GuideOptionsHidden.html
> share/doc/geeqie/GuideOptionsImage.html
> share/doc/geeqie/GuideOptionsKeyboard.html
>+share/doc/geeqie/GuideOptionsKeywords.html
> share/doc/geeqie/GuideOptionsLayout.html
> share/doc/geeqie/GuideOptionsMain.html
> share/doc/geeqie/GuideOptionsMetadata.html
>+share/doc/geeqie/GuideOptionsOSD.html
> share/doc/geeqie/GuideOptionsStereo.html
> share/doc/geeqie/GuideOptionsToolbar.html
> share/doc/geeqie/GuideOptionsWindow.html
>@@ -76,10 +86,13 @@ share/doc/geeqie/GuideReferenceLIRC.html
> share/doc/geeqie/GuideReferenceLua.html
> share/doc/geeqie/GuideReferenceManagement.html
> share/doc/geeqie/GuideReferenceMetadata.html
>+share/doc/geeqie/GuideReferencePCRE.html
> share/doc/geeqie/GuideReferencePixbufLoaders.html
>+share/doc/geeqie/GuideReferenceStandardPlugins.html
> share/doc/geeqie/GuideReferenceStandards.html
> share/doc/geeqie/GuideReferenceSupportedFormats.html
> share/doc/geeqie/GuideReferenceThumbnails.html
>+share/doc/geeqie/GuideReferenceUTC.html
> share/doc/geeqie/GuideReferenceXmpExif.html
> share/doc/geeqie/GuideSidebars.html
> share/doc/geeqie/GuideSidebarsInfo.html
>@@ -129,13 +142,16 @@ share/doc/geeqie/zoom-original.png
> share/doc/geeqie/zoom-out.png
> share/geeqie/
> share/geeqie/applications/
>-share/geeqie/applications/geeqie-import-geeqie.desktop
>-share/geeqie/applications/geeqie-import-gqview.desktop
>+share/geeqie/applications/camera-import.desktop
>+share/geeqie/applications/export-jpeg.desktop
> share/geeqie/applications/geeqie-ufraw-id.desktop
> @comment share/geeqie/applications/geeqie-ufraw-recursive.desktop
> @comment share/geeqie/applications/geeqie-ufraw.desktop
>+share/geeqie/applications/image-crop.desktop
>+share/geeqie/applications/random-image.desktop
> share/geeqie/applications/rotate.desktop
> share/geeqie/applications/symlink.desktop
>+share/geeqie/applications/tethered-photography.desktop
> share/geeqie/template.desktop
> share/locale/ar/LC_MESSAGES/geeqie.mo
> share/locale/be/LC_MESSAGES/geeqie.mo
>@@ -145,6 +161,7 @@ share/locale/cs/LC_MESSAGES/geeqie.mo
> share/locale/da/LC_MESSAGES/geeqie.mo
> share/locale/de/LC_MESSAGES/geeqie.mo
> share/locale/el/LC_MESSAGES/geeqie.mo
>+share/locale/en_GB/LC_MESSAGES/geeqie.mo
> share/locale/eo/LC_MESSAGES/geeqie.mo
> share/locale/es/LC_MESSAGES/geeqie.mo
> share/locale/et/LC_MESSAGES/geeqie.mo
>

--
J. Scott Heppler