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 --- Makefile 12 Jul 2019 20:46:59 -0000 1.22 +++ Makefile 28 Nov 2019 15:04:57 -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/ @@ -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 --- distinfo 22 Jan 2018 07:45:37 -0000 1.6 +++ distinfo 28 Nov 2019 15:04:57 -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 -r1.1 patch-Makefile_am --- patches/patch-Makefile_am 22 Jan 2018 07:45:37 -0000 1.1 +++ patches/patch-Makefile_am 28 Nov 2019 15:04:57 -0000 @@ -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 -0000 1.8 +++ pkg/PLIST 28 Nov 2019 15:04:57 -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/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 @@ 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
