On Tue, Jan 16, 2018 at 10:33:07AM +0300, Kirill Bychkov wrote: > Hi, > Here is an update to geeqie-1.4. > Notable port changes: > - update license marker > - actually switch it to gtk3 and tweak COMMENT > (gtk3 as a dependency was introduced some time ago [1], but > geeqie was still building against gtk2) > > Works fine on macppc and amd64. OK to commit?
I think your mailer mangled the diff: patch: **** malformed patch at line 84: README.html ChangeLog.html It builds and updates fine, runtime seems ok but there's a weird behaviour on the left side of the app, it's as if there was an inactive scrollbar, and not all the content of the sidebar is visible - see screenshot. I've attached an unmangled version of the diff too.
Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/geeqie/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- Makefile 26 Jul 2017 22:45:23 -0000 1.16 +++ Makefile 16 Jan 2018 08:26:34 -0000 @@ -1,16 +1,15 @@ # $OpenBSD: Makefile,v 1.16 2017/07/26 22:45:23 sthen Exp $ -COMMENT= lightweight Gtk+2 based image viewer +COMMENT= lightweight Gtk+3 based image viewer -DISTNAME= geeqie-1.3 +DISTNAME= geeqie-1.4 EXTRACT_SUFX= .tar.xz CATEGORIES= graphics EPOCH= 0 -REVISION= 0 HOMEPAGE= http://geeqie.org/ -# GPLv2 +# GPLv2+ PERMIT_PACKAGE_CDROM= Yes WANTLIB += atk-1.0 c cairo cairo-gobject exiv2 gdk-3 gdk_pixbuf-2.0 @@ -41,12 +40,13 @@ CONFIGURE_ARGS= --disable-doxygen-doc \ --disable-lirc \ --disable-lua \ - --disable-gps \ + --disable-ffmpegthumbnailer \ + --enable-gtk3 \ --with-htmldir=${PREFIX}/share/doc/geeqie \ --with-readmedir=${PREFIX}/share/doc/geeqie -AUTOCONF_VERSION= 2.61 -AUTOMAKE_VERSION= 1.9 +AUTOCONF_VERSION= 2.69 +AUTOMAKE_VERSION= 1.14 BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} \ devel/libtool Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/geeqie/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 28 May 2016 13:59:51 -0000 1.5 +++ distinfo 16 Jan 2018 08:26:34 -0000 @@ -1,2 +1,2 @@ -SHA256 (geeqie-1.3.tar.xz) = S29WbdGoutrGjENTx90PTeF/hie4Wnpw1esa47VA7D8= -SIZE (geeqie-1.3.tar.xz) = 1141820 +SHA256 (geeqie-1.4.tar.xz) = XFg6FlVz7DeHTCePncV+c981azDgmpzKwxed1dl+PjI= +SIZE (geeqie-1.4.tar.xz) = 35881152 Index: patches/patch-Makefile_am =================================================================== RCS file: patches/patch-Makefile_am diff -N patches/patch-Makefile_am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_am 16 Jan 2018 08:26:34 -0000 @@ -0,0 +1,28 @@ +$OpenBSD$ + +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-src_layout_util_c =================================================================== RCS file: patches/patch-src_layout_util_c diff -N patches/patch-src_layout_util_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_layout_util_c 16 Jan 2018 08:26:34 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ + +Index: src/layout_util.c +--- src/layout_util.c.orig ++++ src/layout_util.c +@@ -19,6 +19,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#include <sys/wait.h> + #include "main.h" + #include "layout_util.h" + Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/geeqie/pkg/PLIST,v retrieving revision 1.6 diff -u -r1.6 PLIST --- pkg/PLIST 28 May 2016 13:59:51 -0000 1.6 +++ pkg/PLIST 16 Jan 2018 08:26:34 -0000 @@ -7,26 +7,28 @@ lib/geeqie/geeqie-rotate lib/geeqie/geeqie-symlink @comment lib/geeqie/geeqie-ufraw +lib/geeqie/geocode-parameters.awk @man man/man1/geeqie.1 share/applications/geeqie.desktop share/doc/geeqie/ -share/doc/geeqie/AdvancedFeatures.html -share/doc/geeqie/Authors.html -share/doc/geeqie/BasicFeatures.html +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/Copyright.html +share/doc/geeqie/ExifRotation.html +share/doc/geeqie/Features.html share/doc/geeqie/GuideCollections.html +share/doc/geeqie/GuideColorManagement.html share/doc/geeqie/GuideCredits.html share/doc/geeqie/GuideFaq.html share/doc/geeqie/GuideGnuFdl.html share/doc/geeqie/GuideImageManagement.html share/doc/geeqie/GuideImageManagementCopyMove.html share/doc/geeqie/GuideImageManagementDelete.html -share/doc/geeqie/GuideImageManagementExternalEditing.html +share/doc/geeqie/GuideImageManagementPlugins.html share/doc/geeqie/GuideImageManagementRename.html +share/doc/geeqie/GuideImageMarks.html share/doc/geeqie/GuideImagePresentation.html share/doc/geeqie/GuideImagePresentationFullscreen.html share/doc/geeqie/GuideImagePresentationSlideshow.html @@ -36,6 +38,7 @@ share/doc/geeqie/GuideIndex-info.html share/doc/geeqie/GuideIndex.html share/doc/geeqie/GuideIntroduction.html +share/doc/geeqie/GuideLicence.html share/doc/geeqie/GuideMainWindow.html share/doc/geeqie/GuideMainWindowFilePane.html share/doc/geeqie/GuideMainWindowFolderPane.html @@ -44,7 +47,7 @@ share/doc/geeqie/GuideMainWindowMenus.html share/doc/geeqie/GuideMainWindowNavigation.html share/doc/geeqie/GuideMainWindowStatusBar.html -share/doc/geeqie/GuideOptions.html +share/doc/geeqie/GuideOptionsAdditional.html share/doc/geeqie/GuideOptionsBehavior.html share/doc/geeqie/GuideOptionsColor.html share/doc/geeqie/GuideOptionsFiltering.html @@ -53,39 +56,77 @@ share/doc/geeqie/GuideOptionsImage.html share/doc/geeqie/GuideOptionsKeyboard.html share/doc/geeqie/GuideOptionsLayout.html +share/doc/geeqie/GuideOptionsMain.html share/doc/geeqie/GuideOptionsMetadata.html +share/doc/geeqie/GuideOptionsStereo.html +share/doc/geeqie/GuideOptionsToolbar.html share/doc/geeqie/GuideOptionsWindow.html share/doc/geeqie/GuideOtherWindows.html -share/doc/geeqie/GuideOtherWindowsImageProperties.html +share/doc/geeqie/GuideOtherWindowsExif.html share/doc/geeqie/GuideOtherWindowsImageWindow.html share/doc/geeqie/GuideOtherWindowsPanView.html +share/doc/geeqie/GuidePluginsConfig.html share/doc/geeqie/GuidePrinting.html share/doc/geeqie/GuideReference.html share/doc/geeqie/GuideReferenceCommandLine.html +share/doc/geeqie/GuideReferenceConfig.html +share/doc/geeqie/GuideReferenceDecodeLatLong.html share/doc/geeqie/GuideReferenceKeyboardShortcuts.html +share/doc/geeqie/GuideReferenceLIRC.html share/doc/geeqie/GuideReferenceLua.html share/doc/geeqie/GuideReferenceManagement.html +share/doc/geeqie/GuideReferenceMetadata.html +share/doc/geeqie/GuideReferencePixbufLoaders.html +share/doc/geeqie/GuideReferenceStandards.html +share/doc/geeqie/GuideReferenceSupportedFormats.html share/doc/geeqie/GuideReferenceThumbnails.html -share/doc/geeqie/GuideReferenceToolbar.html +share/doc/geeqie/GuideReferenceXmpExif.html share/doc/geeqie/GuideSidebars.html share/doc/geeqie/GuideSidebarsInfo.html share/doc/geeqie/GuideSidebarsSortManager.html share/doc/geeqie/Imageviewing.html share/doc/geeqie/Layouttab.html -share/doc/geeqie/LegalNotice.html -share/doc/geeqie/License.html share/doc/geeqie/Miscellaneous.html share/doc/geeqie/Papertab.html share/doc/geeqie/Preview.html share/doc/geeqie/Printbutton.html share/doc/geeqie/Printertab.html -share/doc/geeqie/README @comment share/doc/geeqie/README.lirc +share/doc/geeqie/README.md share/doc/geeqie/Rememberprintsettings.html @comment share/doc/geeqie/TODO share/doc/geeqie/Texttab.html -share/doc/geeqie/Thecollectionwindow.html +share/doc/geeqie/dialog-ok-apply.png +share/doc/geeqie/document-new.png +share/doc/geeqie/document-print.png +share/doc/geeqie/document-save.png +share/doc/geeqie/edit-delete.png +share/doc/geeqie/edit-find.png +share/doc/geeqie/go-down.png +share/doc/geeqie/go-previous.png +share/doc/geeqie/go-up.png +share/doc/geeqie/gtk-color-picker.png +share/doc/geeqie/gtk-edit.png +share/doc/geeqie/gtk-select-color.png +share/doc/geeqie/help-contents.png +share/doc/geeqie/icon_float.png +share/doc/geeqie/icon_thumb.png share/doc/geeqie/index.html +share/doc/geeqie/list-add.png +share/doc/geeqie/list-remove.png +share/doc/geeqie/media-playback-pause.png +share/doc/geeqie/preferences-desktop-font.png +share/doc/geeqie/preferences-desktop.png +share/doc/geeqie/process-stop.png +share/doc/geeqie/stock_convert_24.png +share/doc/geeqie/user-home.png +share/doc/geeqie/view-fullscreen.png +share/doc/geeqie/view-refresh.png +share/doc/geeqie/window-close.png +share/doc/geeqie/zoom-fit-best.png +share/doc/geeqie/zoom-in.png +share/doc/geeqie/zoom-original.png +share/doc/geeqie/zoom-out.png share/geeqie/ share/geeqie/applications/ share/geeqie/applications/geeqie-import-geeqie.desktop
