Re: Update graphics/geeqie to 1.5.1

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/geeqie/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile 12 Jul 2019 20:46:59 -0000 1.22
+++ Makefile 29 Nov 2019 11:12:16 -0000
@@ -2,11 +2,10 @@

COMMENT= lightweight Gtk+3 based image viewer

-DISTNAME= geeqie-1.4
+DISTNAME= geeqie-1.5.1
EXTRACT_SUFX= .tar.xz
CATEGORIES= graphics
EPOCH= 0
-REVISION= 1

HOMEPAGE= http://geeqie.org/

@@ -45,6 +44,7 @@ CONFIGURE_ARGS= --disable-doxygen-doc \
--disable-lua \
--disable-ffmpegthumbnailer \
--disable-gpu-accel \
+ --disable-pdf \
--enable-gtk3 \
--with-htmldir=${PREFIX}/share/doc/geeqie \
--with-readmedir=${PREFIX}/share/doc/geeqie
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/geeqie/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 22 Jan 2018 07:45:37 -0000 1.6
+++ distinfo 29 Nov 2019 11:12:16 -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.1.tar.xz) = SFTV0yPDH49AaP1zqyxFT/kegmxMpNN7IsJGrRTeoQo=
+SIZE (geeqie-1.5.1.tar.xz) = 1587116
Index: patches/patch-Makefile_am
===================================================================
RCS file: /cvs/ports/graphics/geeqie/patches/patch-Makefile_am,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Makefile_am
--- patches/patch-Makefile_am 22 Jan 2018 07:45:37 -0000 1.1
+++ patches/patch-Makefile_am 29 Nov 2019 11:12:16 -0000
@@ -16,9 +16,9 @@ Index: Makefile.am

desktopdir = $(datadir)/applications
@@ -36,10 +36,6 @@ dist-hook: geeqie.spec
- cp $(top_builddir)/geeqie.spec $(distdir)

DISTCLEANFILES = config.report
+ CLEANFILES = $(desktop_DATA) ChangeLog.html
-
-.PHONY: ChangeLog
-ChangeLog.html:
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 -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 29 Nov 2019 11:12:16 -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/PLIST
===================================================================
RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST 27 Jun 2018 21:03:53 -0000 1.8
+++ pkg/PLIST 29 Nov 2019 11:12:16 -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
@@ -33,6 +39,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 +62,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 +85,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 +141,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 +160,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.moOn Thu, November 28, 2019 18:56, Landry Breuil wrote:
> On Thu, Nov 28, 2019 at 04:10:11PM +0100, clematis wrote:
>> On Thu, Nov 28, 2019 at 03:38:23PM +0100, Landry Breuil wrote:
>> > Feels wrong here, if you want to remove patches you should cvs rm them
>> > so that they show up as removed in your cvs diff. Right now, the patches
>> > arent removed, so make patch fails.
>> >
>> > I see that patch-src_window_c & patch-src_layout_util_c apply fine and
>> > patch-Makefile_am fails on a chunk. Were you planning to remove those
>> > patches ? Why ? Are they not useful anymore (unsure for the src/window.c
>> > one..) ?
>>
>> Argh, sorry I might have generate the previous diff from a working dir
>> or don't know how I skipped diffing patches/
>>
>> Here's a new one attached which I double checked so that should be the
>> last one ! Sorry about that.
>
> I have it building here, but it seems configure checks for poppler-glib
> and links with it if found, thus port-lib-depends-check complains about
> it:
>
> geeqie-1.5.1v0(graphics/geeqie):
> Missing lib: poppler-glib.19 (/usr/local/bin/geeqie) (NOT REACHABLE)
>
> looking at upstream repository on
> http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=history;f=configure.ac
> it looks like they added support for webp, pdf, lua, djvu, openjp2, etc - you
> might want to add those are dependencies, or explicitely disable them.
>
> Landry
>
>

Hi!
Tweaked diff attached with pdf disabled. djvu and lua are already disabled.
Can't find any knobs about webp and openjp2.
Works fine for me on amd64.