Re: Update graphics/geeqie to 1.5.1

2019-11-29 Thread clematis 
On Fri, Nov 29, 2019 at 02:19:06PM +0300, Kirill Bychkov wrote:
> 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.

Hi Kirill, 
Thanks for that - I didn't have a chance to look at this earlier. 
Just tested your patch and everything worked as expected.
Thank you.
-- 
clematis (0x7e96fd2400fe7b59)

Re: Update graphics/geeqie to 1.5.1

2019-11-29 Thread Landry Breuil 
On Fri, Nov 29, 2019 at 02:19:06PM +0300, Kirill Bychkov wrote:
> On 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.

Right, those were added post-1.5.1, so something to keep in mind for
future releases.

> Works fine for me on amd64.

ok with me; thanks !

Re: Update graphics/geeqie to 1.5.1

2019-11-29 Thread Kirill Bychkov 
On 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.
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 -	1.22
+++ Makefile	29 Nov 2019 11:12:16 -
@@ -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 -	1.6
+++ distinfo	29 Nov 2019 11:12:16 -
@@ -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 -	1.1
+++ patches/patch-Makefile_am	29 Nov 2019 11:12:16 -
@@ -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 -	1.2
+++ patches/patch-src_window_c	29 Nov 2019 11:12:16 -
@@ -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 -	1.8
+++ pkg/PLIST	29 Nov 2019 11:12:16 -
@@ -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

Re: Update graphics/geeqie to 1.5.1

2019-11-28 Thread Landry Breuil 
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

Re: Update graphics/geeqie to 1.5.1

2019-11-28 Thread clematis 
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.

-- 
clematis (0x7e96fd2400fe7b59)
? diff_geeqie
Index: Makefile
===
RCS file: /cvs/ports/graphics/geeqie/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile12 Jul 2019 20:46:59 -  1.22
+++ Makefile28 Nov 2019 15:04:57 -
@@ -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/
 
@@ -50,7 +49,7 @@
--with-readmedir=${PREFIX}/share/doc/geeqie
 
 AUTOCONF_VERSION=  2.69
-AUTOMAKE_VERSION=  1.14
+AUTOMAKE_VERSION=  1.16
 AUTORECONF=./autogen.sh
 MAKE_ENV=  MKDIR_P='mkdir -p'
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/geeqie/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo22 Jan 2018 07:45:37 -  1.6
+++ distinfo28 Nov 2019 15:04:57 -
@@ -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 -r1.1 patch-Makefile_am
--- patches/patch-Makefile_am   22 Jan 2018 07:45:37 -  1.1
+++ patches/patch-Makefile_am   28 Nov 2019 15:04:57 -
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_am,v 1.1 2018/01/22 07:45:37 kirby Exp $
+$OpenBSD$
 
 Index: Makefile.am
 --- Makefile.am.orig
@@ -16,9 +16,9 @@
  
  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: pkg/PLIST
===
RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST   27 Jun 2018 21:03:53 -  1.8
+++ pkg/PLIST   28 Nov 2019 15:04:57 -
@@ -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/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/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/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

Re: Update graphics/geeqie to 1.5.1

2019-11-28 Thread Landry Breuil 
On Thu, Nov 28, 2019 at 11:05:04AM +0100, clematis wrote:
> On Thu, Nov 28, 2019 at 08:36:18AM +0100, Landry Breuil wrote:
> > You shouldnt remove EPOCH, ever :)
> > And im not sure its wise to remove @conflict/@pkgpath either, even if
> > the gqview->geeqie rename was some years ago.. make update-plist is
> > smart, use it instead of creating the PLIST from scratch.
> 
> Hi Landry,
> Thanks for the feedback - appreciated. I will make sure to only use
> update-plist moving forward. 
> 
> Please find attached a new diff taking this into account.

> ? diff_graphics_geeqie-1.5.1v0
> ? patches

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..) ?

Landry

Re: Update graphics/geeqie to 1.5.1

2019-11-28 Thread clematis 
On Thu, Nov 28, 2019 at 08:36:18AM +0100, Landry Breuil wrote:
> You shouldnt remove EPOCH, ever :)
> And im not sure its wise to remove @conflict/@pkgpath either, even if
> the gqview->geeqie rename was some years ago.. make update-plist is
> smart, use it instead of creating the PLIST from scratch.

Hi Landry,
Thanks for the feedback - appreciated. I will make sure to only use
update-plist moving forward. 

Please find attached a new diff taking this into account.

Cheers,
-- 
clematis (0x7e96fd2400fe7b59)
? diff_graphics_geeqie-1.5.1v0
? patches
Index: Makefile
===
RCS file: /cvs/ports/graphics/geeqie/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile12 Jul 2019 20:46:59 -  1.22
+++ Makefile28 Nov 2019 10:01:46 -
@@ -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/
 
@@ -50,7 +49,7 @@
--with-readmedir=${PREFIX}/share/doc/geeqie
 
 AUTOCONF_VERSION=  2.69
-AUTOMAKE_VERSION=  1.14
+AUTOMAKE_VERSION=  1.16
 AUTORECONF=./autogen.sh
 MAKE_ENV=  MKDIR_P='mkdir -p'
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/geeqie/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo22 Jan 2018 07:45:37 -  1.6
+++ distinfo28 Nov 2019 10:01:46 -
@@ -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: pkg/PLIST
===
RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST   27 Jun 2018 21:03:53 -  1.8
+++ pkg/PLIST   28 Nov 2019 10:01:46 -
@@ -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/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/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/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-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

Re: Update graphics/geeqie to 1.5.1

2019-11-27 Thread Landry Breuil 
On Thu, Nov 28, 2019 at 08:27:19AM +0100, clematis wrote:
> On Fri, Oct 04, 2019 at 11:26:33PM +0200, clematis wrote:
> > Hello,
> > 
> > See the diff attached for an update of graphics/geeqie to the latest
> > 1.5.1. I check the patches were still making sense so no changes there.
> > (even so to build only the src/layout_util patch is mandatory)
> > 
> > test reported some deprecation on textproc/intltool:
> > srcdir=. /usr/local/bin/intltool-update -m
> > Unescaped left brace in regex is deprecated here (and will be fatal in
> > Perl 5.30), passed through in regex; marked by <-- HERE in m/\${ <--
> > HERE ?PACKAGE}?/ at /usr/local/bin/intltool-update line 1071, 
> > line 714.
> > 
> > I did bump the automake_version, I guess it make sense to keep this
> > going forward.
> > 
> > It does build, package, install, deinstall ALL OK on amd64.
> > I didn't hit any error or issue while running it. 
> > 
> > Comments? Feedback? OK?
> 
> Hi Team,
> Re-sending diff -u below, there was no upstream update since October but this
> wasn't commited. Any comments? OK?

You shouldnt remove EPOCH, ever :)
And im not sure its wise to remove @conflict/@pkgpath either, even if
the gqview->geeqie rename was some years ago.. make update-plist is
smart, use it instead of creating the PLIST from scratch.

Re: Update graphics/geeqie to 1.5.1

2019-11-27 Thread clematis 
On Fri, Oct 04, 2019 at 11:26:33PM +0200, clematis wrote:
> Hello,
> 
> See the diff attached for an update of graphics/geeqie to the latest
> 1.5.1. I check the patches were still making sense so no changes there.
> (even so to build only the src/layout_util patch is mandatory)
> 
> test reported some deprecation on textproc/intltool:
> srcdir=. /usr/local/bin/intltool-update -m
> Unescaped left brace in regex is deprecated here (and will be fatal in
> Perl 5.30), passed through in regex; marked by <-- HERE in m/\${ <--
> HERE ?PACKAGE}?/ at /usr/local/bin/intltool-update line 1071, 
> line 714.
> 
> I did bump the automake_version, I guess it make sense to keep this
> going forward.
> 
> It does build, package, install, deinstall ALL OK on amd64.
> I didn't hit any error or issue while running it. 
> 
> Comments? Feedback? OK?

Hi Team,
Re-sending diff -u below, there was no upstream update since October but this
wasn't commited. Any comments? OK?

Cheers,
-- 
clematis (0x7e96fd2400fe7b59)
? diff_geeqie-1.5.1
? patches
Index: Makefile
===
RCS file: /cvs/ports/graphics/geeqie/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile12 Jul 2019 20:46:59 -  1.22
+++ Makefile28 Nov 2019 07:23:28 -
@@ -2,11 +2,9 @@
 
 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/
 
@@ -50,7 +48,7 @@
--with-readmedir=${PREFIX}/share/doc/geeqie
 
 AUTOCONF_VERSION=  2.69
-AUTOMAKE_VERSION=  1.14
+AUTOMAKE_VERSION=  1.16
 AUTORECONF=./autogen.sh
 MAKE_ENV=  MKDIR_P='mkdir -p'
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/geeqie/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo22 Jan 2018 07:45:37 -  1.6
+++ distinfo28 Nov 2019 07:23:28 -
@@ -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: pkg/PLIST
===
RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST   27 Jun 2018 21:03:53 -  1.8
+++ pkg/PLIST   28 Nov 2019 07:23:28 -
@@ -1,12 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.8 2018/06/27 21:03:53 espie Exp $
-@conflict gqview-*
-@pkgpath graphics/gqview
+@comment $OpenBSD: PLIST,v$
 @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
-@comment lib/geeqie/geeqie-ufraw
+lib/geeqie/geeqie-tethered-photography
+lib/geeqie/geeqie-tethered-photography-hook-script
+lib/geeqie/geeqie-ufraw
 lib/geeqie/geocode-parameters.awk
 @man man/man1/geeqie.1
 share/applications/geeqie.desktop
@@ -14,7 +18,6 @@
 share/doc/geeqie/AUTHORS
 share/doc/geeqie/COPYING
 share/doc/geeqie/Cancelbutton.html
-@comment share/doc/geeqie/ChangeLog
 share/doc/geeqie/Commandline.html
 share/doc/geeqie/ExifRotation.html
 share/doc/geeqie/Features.html
@@ -33,6 +36,7 @@
 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 +59,11 @@
 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 +82,13 @@
 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

Update graphics/geeqie to 1.5.1

2019-10-04 Thread clematis 
Hello,

See the diff attached for an update of graphics/geeqie to the latest
1.5.1. I check the patches were still making sense so no changes there.
(even so to build only the src/layout_util patch is mandatory)

test reported some deprecation on textproc/intltool:
srcdir=. /usr/local/bin/intltool-update -m
Unescaped left brace in regex is deprecated here (and will be fatal in
Perl 5.30), passed through in regex; marked by <-- HERE in m/\${ <--
HERE ?PACKAGE}?/ at /usr/local/bin/intltool-update line 1071, 
line 714.

I did bump the automake_version, I guess it make sense to keep this
going forward.

It does build, package, install, deinstall ALL OK on amd64.
I didn't hit any error or issue while running it. 

Comments? Feedback? OK?

Cheers,
-- 
clematis (0x7e96fd2400fe7b59)
? diff_graphics_geeqie
? patches
Index: Makefile
===
RCS file: /cvs/ports/graphics/geeqie/Makefile,v
retrieving revision 1.22
diff -r1.22 Makefile
5c5
< DISTNAME= geeqie-1.4
---
> DISTNAME= geeqie-1.5.1
8,9d7
< EPOCH=0
< REVISION= 1
53c51
< AUTOMAKE_VERSION= 1.14
---
> AUTOMAKE_VERSION= 1.16
Index: distinfo
===
RCS file: /cvs/ports/graphics/geeqie/distinfo,v
retrieving revision 1.6
diff -r1.6 distinfo
1,2c1,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: pkg/PLIST
===
RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v
retrieving revision 1.8
diff -r1.8 PLIST
1,3c1
< @comment $OpenBSD: PLIST,v 1.8 2018/06/27 21:03:53 espie Exp $
< @conflict gqview-*
< @pkgpath graphics/gqview
---
> @comment $OpenBSD: PLIST,v$
6c4,8
< 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
9c11,13
< @comment lib/geeqie/geeqie-ufraw
---
> lib/geeqie/geeqie-tethered-photography
> lib/geeqie/geeqie-tethered-photography-hook-script
> lib/geeqie/geeqie-ufraw
17d20
< @comment share/doc/geeqie/ChangeLog
35a39
> share/doc/geeqie/GuideImageSearchCache.html
57a62
> share/doc/geeqie/GuideOptionsKeywords.html
60a66
> share/doc/geeqie/GuideOptionsOSD.html
78a85
> share/doc/geeqie/GuideReferencePCRE.html
79a87
> share/doc/geeqie/GuideReferenceStandardPlugins.html
82a91
> share/doc/geeqie/GuideReferenceUTC.html
94c103
< @comment share/doc/geeqie/README.lirc
---
> share/doc/geeqie/README.lirc
97c106
< @comment share/doc/geeqie/TODO
---
> share/doc/geeqie/TODO
132,133c141,142
< 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
135,136c144,147
< @comment share/geeqie/applications/geeqie-ufraw-recursive.desktop
< @comment share/geeqie/applications/geeqie-ufraw.desktop
---
> share/geeqie/applications/geeqie-ufraw-recursive.desktop
> share/geeqie/applications/geeqie-ufraw.desktop
> share/geeqie/applications/image-crop.desktop
> share/geeqie/applications/random-image.desktop
138a150
> share/geeqie/applications/tethered-photography.desktop
147a160
> share/locale/en_GB/LC_MESSAGES/geeqie.mo