Received: by mail.netbsd.org (Postfix, from userid 605) id 36CA384D45; Wed, 10 Jan 2018 09:38:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B620F84D3B for ; Wed, 10 Jan 2018 09:38:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id io6krJ4qUJkn for ; Wed, 10 Jan 2018 09:38:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A30EF84C82 for ; Wed, 10 Jan 2018 09:38:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9EE16FBDE; Wed, 10 Jan 2018 09:38:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1515577112157930" MIME-Version: 1.0 Date: Wed, 10 Jan 2018 09:38:32 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/graphics/geeqie To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20180110093832.9EE16FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1515577112157930 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Jan 10 09:38:32 UTC 2018 Modified Files: pkgsrc/graphics/geeqie: Makefile PLIST distinfo pkgsrc/graphics/geeqie/patches: patch-configure.in patch-doc_Makefile.am Added Files: pkgsrc/graphics/geeqie/patches: patch-Makefile.am patch-src_layout__util.c Log Message: geeqie: update to 1.4. Geeqie 1.4 ========== - Improvement of GTK3 implementation - Improved marks workflow - Animate gifs (via context menu or key A) - Compiles with gcc and clang - Rectangular selections (activated by Alt-R) - Folder bookmarks - Search via geo position - Thumbnail preview in dialogues - Customisable tool bar - Slideshow speed customisable while playing - Many usability improvements - Language updates - Many small improvements - Many bugfixes as usual To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 pkgsrc/graphics/geeqie/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/geeqie/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/geeqie/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/geeqie/patches/patch-Makefile.am \ pkgsrc/graphics/geeqie/patches/patch-src_layout__util.c cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/geeqie/patches/patch-configure.in \ pkgsrc/graphics/geeqie/patches/patch-doc_Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1515577112157930 Content-Disposition: inline Content-Length: 14169 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/geeqie/Makefile diff -u pkgsrc/graphics/geeqie/Makefile:1.65 pkgsrc/graphics/geeqie/Makefile:1.66 --- pkgsrc/graphics/geeqie/Makefile:1.65 Thu Nov 30 16:45:26 2017 +++ pkgsrc/graphics/geeqie/Makefile Wed Jan 10 09:38:32 2018 @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.65 2017/11/30 16:45:26 adam Exp $ +# $NetBSD: Makefile,v 1.66 2018/01/10 09:38:32 wiz Exp $ -DISTNAME= geeqie-1.3 -EXTRACT_SUFX= .tar.xz -PKGREVISION= 7 +DISTNAME= geeqie-1.4 CATEGORIES= graphics MASTER_SITES= http://www.geeqie.org/ +EXTRACT_SUFX= .tar.xz MAINTAINER= gdt@NetBSD.org HOMEPAGE= http://www.geeqie.org/ @@ -22,6 +21,7 @@ USE_TOOLS= bash:run gmake intltool msgf REPLACE_BASH= plugins/rotate/geeqie-rotate REPLACE_BASH+= plugins/ufraw/geeqie-ufraw REPLACE_BASH+= plugins/import/geeqie-import +REPLACE_BASH+= gen_changelog.sh pre-configure: cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh Index: pkgsrc/graphics/geeqie/PLIST diff -u pkgsrc/graphics/geeqie/PLIST:1.6 pkgsrc/graphics/geeqie/PLIST:1.7 --- pkgsrc/graphics/geeqie/PLIST:1.6 Sun May 29 20:40:16 2016 +++ pkgsrc/graphics/geeqie/PLIST Wed Jan 10 09:38:32 2018 @@ -1,31 +1,32 @@ -@comment $NetBSD: PLIST,v 1.6 2016/05/29 20:40:16 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2018/01/10 09:38:32 wiz Exp $ bin/geeqie lib/geeqie/geeqie-import lib/geeqie/geeqie-rotate lib/geeqie/geeqie-symlink lib/geeqie/geeqie-ufraw +lib/geeqie/geocode-parameters.awk man/man1/geeqie.1 share/applications/geeqie.desktop +share/doc/${PKGNAME}/AUTHORS share/doc/${PKGNAME}/COPYING -share/doc/${PKGNAME}/ChangeLog -share/doc/${PKGNAME}/README share/doc/${PKGNAME}/README.lirc +share/doc/${PKGNAME}/README.md share/doc/${PKGNAME}/TODO -share/doc/${PKGNAME}/html/AdvancedFeatures.html -share/doc/${PKGNAME}/html/Authors.html -share/doc/${PKGNAME}/html/BasicFeatures.html share/doc/${PKGNAME}/html/Cancelbutton.html share/doc/${PKGNAME}/html/Commandline.html -share/doc/${PKGNAME}/html/Copyright.html +share/doc/${PKGNAME}/html/ExifRotation.html +share/doc/${PKGNAME}/html/Features.html share/doc/${PKGNAME}/html/GuideCollections.html +share/doc/${PKGNAME}/html/GuideColorManagement.html share/doc/${PKGNAME}/html/GuideCredits.html share/doc/${PKGNAME}/html/GuideFaq.html share/doc/${PKGNAME}/html/GuideGnuFdl.html share/doc/${PKGNAME}/html/GuideImageManagement.html share/doc/${PKGNAME}/html/GuideImageManagementCopyMove.html share/doc/${PKGNAME}/html/GuideImageManagementDelete.html -share/doc/${PKGNAME}/html/GuideImageManagementExternalEditing.html +share/doc/${PKGNAME}/html/GuideImageManagementPlugins.html share/doc/${PKGNAME}/html/GuideImageManagementRename.html +share/doc/${PKGNAME}/html/GuideImageMarks.html share/doc/${PKGNAME}/html/GuideImagePresentation.html share/doc/${PKGNAME}/html/GuideImagePresentationFullscreen.html share/doc/${PKGNAME}/html/GuideImagePresentationSlideshow.html @@ -35,6 +36,7 @@ share/doc/${PKGNAME}/html/GuideImageSear share/doc/${PKGNAME}/html/GuideIndex-info.html share/doc/${PKGNAME}/html/GuideIndex.html share/doc/${PKGNAME}/html/GuideIntroduction.html +share/doc/${PKGNAME}/html/GuideLicence.html share/doc/${PKGNAME}/html/GuideMainWindow.html share/doc/${PKGNAME}/html/GuideMainWindowFilePane.html share/doc/${PKGNAME}/html/GuideMainWindowFolderPane.html @@ -43,7 +45,7 @@ share/doc/${PKGNAME}/html/GuideMainWindo share/doc/${PKGNAME}/html/GuideMainWindowMenus.html share/doc/${PKGNAME}/html/GuideMainWindowNavigation.html share/doc/${PKGNAME}/html/GuideMainWindowStatusBar.html -share/doc/${PKGNAME}/html/GuideOptions.html +share/doc/${PKGNAME}/html/GuideOptionsAdditional.html share/doc/${PKGNAME}/html/GuideOptionsBehavior.html share/doc/${PKGNAME}/html/GuideOptionsColor.html share/doc/${PKGNAME}/html/GuideOptionsFiltering.html @@ -52,27 +54,36 @@ share/doc/${PKGNAME}/html/GuideOptionsHi share/doc/${PKGNAME}/html/GuideOptionsImage.html share/doc/${PKGNAME}/html/GuideOptionsKeyboard.html share/doc/${PKGNAME}/html/GuideOptionsLayout.html +share/doc/${PKGNAME}/html/GuideOptionsMain.html share/doc/${PKGNAME}/html/GuideOptionsMetadata.html +share/doc/${PKGNAME}/html/GuideOptionsStereo.html +share/doc/${PKGNAME}/html/GuideOptionsToolbar.html share/doc/${PKGNAME}/html/GuideOptionsWindow.html share/doc/${PKGNAME}/html/GuideOtherWindows.html -share/doc/${PKGNAME}/html/GuideOtherWindowsImageProperties.html +share/doc/${PKGNAME}/html/GuideOtherWindowsExif.html share/doc/${PKGNAME}/html/GuideOtherWindowsImageWindow.html share/doc/${PKGNAME}/html/GuideOtherWindowsPanView.html +share/doc/${PKGNAME}/html/GuidePluginsConfig.html share/doc/${PKGNAME}/html/GuidePrinting.html share/doc/${PKGNAME}/html/GuideReference.html share/doc/${PKGNAME}/html/GuideReferenceCommandLine.html +share/doc/${PKGNAME}/html/GuideReferenceConfig.html +share/doc/${PKGNAME}/html/GuideReferenceDecodeLatLong.html share/doc/${PKGNAME}/html/GuideReferenceKeyboardShortcuts.html +share/doc/${PKGNAME}/html/GuideReferenceLIRC.html share/doc/${PKGNAME}/html/GuideReferenceLua.html share/doc/${PKGNAME}/html/GuideReferenceManagement.html +share/doc/${PKGNAME}/html/GuideReferenceMetadata.html +share/doc/${PKGNAME}/html/GuideReferencePixbufLoaders.html +share/doc/${PKGNAME}/html/GuideReferenceStandards.html +share/doc/${PKGNAME}/html/GuideReferenceSupportedFormats.html share/doc/${PKGNAME}/html/GuideReferenceThumbnails.html -share/doc/${PKGNAME}/html/GuideReferenceToolbar.html +share/doc/${PKGNAME}/html/GuideReferenceXmpExif.html share/doc/${PKGNAME}/html/GuideSidebars.html share/doc/${PKGNAME}/html/GuideSidebarsInfo.html share/doc/${PKGNAME}/html/GuideSidebarsSortManager.html share/doc/${PKGNAME}/html/Imageviewing.html share/doc/${PKGNAME}/html/Layouttab.html -share/doc/${PKGNAME}/html/LegalNotice.html -share/doc/${PKGNAME}/html/License.html share/doc/${PKGNAME}/html/Miscellaneous.html share/doc/${PKGNAME}/html/Papertab.html share/doc/${PKGNAME}/html/Preview.html @@ -80,8 +91,37 @@ share/doc/${PKGNAME}/html/Printbutton.ht share/doc/${PKGNAME}/html/Printertab.html share/doc/${PKGNAME}/html/Rememberprintsettings.html share/doc/${PKGNAME}/html/Texttab.html -share/doc/${PKGNAME}/html/Thecollectionwindow.html +share/doc/${PKGNAME}/html/dialog-ok-apply.png +share/doc/${PKGNAME}/html/document-new.png +share/doc/${PKGNAME}/html/document-print.png +share/doc/${PKGNAME}/html/document-save.png +share/doc/${PKGNAME}/html/edit-delete.png +share/doc/${PKGNAME}/html/edit-find.png +share/doc/${PKGNAME}/html/go-down.png +share/doc/${PKGNAME}/html/go-previous.png +share/doc/${PKGNAME}/html/go-up.png +share/doc/${PKGNAME}/html/gtk-color-picker.png +share/doc/${PKGNAME}/html/gtk-edit.png +share/doc/${PKGNAME}/html/gtk-select-color.png +share/doc/${PKGNAME}/html/help-contents.png +share/doc/${PKGNAME}/html/icon_float.png +share/doc/${PKGNAME}/html/icon_thumb.png share/doc/${PKGNAME}/html/index.html +share/doc/${PKGNAME}/html/list-add.png +share/doc/${PKGNAME}/html/list-remove.png +share/doc/${PKGNAME}/html/media-playback-pause.png +share/doc/${PKGNAME}/html/preferences-desktop-font.png +share/doc/${PKGNAME}/html/preferences-desktop.png +share/doc/${PKGNAME}/html/process-stop.png +share/doc/${PKGNAME}/html/stock_convert_24.png +share/doc/${PKGNAME}/html/user-home.png +share/doc/${PKGNAME}/html/view-fullscreen.png +share/doc/${PKGNAME}/html/view-refresh.png +share/doc/${PKGNAME}/html/window-close.png +share/doc/${PKGNAME}/html/zoom-fit-best.png +share/doc/${PKGNAME}/html/zoom-in.png +share/doc/${PKGNAME}/html/zoom-original.png +share/doc/${PKGNAME}/html/zoom-out.png share/geeqie/applications/geeqie-import-geeqie.desktop share/geeqie/applications/geeqie-import-gqview.desktop share/geeqie/applications/geeqie-ufraw-id.desktop Index: pkgsrc/graphics/geeqie/distinfo diff -u pkgsrc/graphics/geeqie/distinfo:1.11 pkgsrc/graphics/geeqie/distinfo:1.12 --- pkgsrc/graphics/geeqie/distinfo:1.11 Sun May 29 20:40:16 2016 +++ pkgsrc/graphics/geeqie/distinfo Wed Jan 10 09:38:32 2018 @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.11 2016/05/29 20:40:16 wiz Exp $ +$NetBSD: distinfo,v 1.12 2018/01/10 09:38:32 wiz Exp $ -SHA1 (geeqie-1.3.tar.xz) = f991b44d8587f2f42d5793700c5f6882bed6abf9 -RMD160 (geeqie-1.3.tar.xz) = fd730c5ce969b53e3b5d250f58308ea9b58fd936 -SHA512 (geeqie-1.3.tar.xz) = b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 -Size (geeqie-1.3.tar.xz) = 1141820 bytes +SHA1 (geeqie-1.4.tar.xz) = bef0e6c6a0aba8b957375087bcb570cb9dac64b1 +RMD160 (geeqie-1.4.tar.xz) = 1e3ffccba08edc2739051f1252ca653f008de35b +SHA512 (geeqie-1.4.tar.xz) = a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205 +Size (geeqie-1.4.tar.xz) = 35881152 bytes +SHA1 (patch-Makefile.am) = 49aba28dcb6a3671550ddab5c80d93f3a094d47f SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170 -SHA1 (patch-configure.in) = 4d1ca9003938669651f98cc43a6d525979b737da -SHA1 (patch-doc_Makefile.am) = 0efedf8892e4a1bc342e6f6ebc757151c33920b2 +SHA1 (patch-configure.in) = d606bab2b701a48af92fc90404740d9a16492e44 +SHA1 (patch-doc_Makefile.am) = 9ffbcd6f8e5bc5710b61dfbfb020e92497d3414f +SHA1 (patch-src_layout__util.c) = cb5d82d7c02690fcad6ef8139788100928d03ac1 Index: pkgsrc/graphics/geeqie/patches/patch-configure.in diff -u pkgsrc/graphics/geeqie/patches/patch-configure.in:1.1 pkgsrc/graphics/geeqie/patches/patch-configure.in:1.2 --- pkgsrc/graphics/geeqie/patches/patch-configure.in:1.1 Sun Apr 17 09:45:59 2016 +++ pkgsrc/graphics/geeqie/patches/patch-configure.in Wed Jan 10 09:38:32 2018 @@ -1,20 +1,17 @@ -$NetBSD: patch-configure.in,v 1.1 2016/04/17 09:45:59 wiz Exp $ +$NetBSD: patch-configure.in,v 1.2 2018/01/10 09:38:32 wiz Exp $ Fix unportable test(1) operator. ---- configure.in.orig 2016-03-07 10:21:06.000000000 +0000 +--- configure.in.orig 2017-12-31 12:31:21.000000000 +0000 +++ configure.in -@@ -192,7 +192,7 @@ fi +@@ -200,12 +200,12 @@ fi AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.)) - AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])]) + AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--enable-gtk3], [use gtk3 instead of gtk2]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], m4_ifdef([AM_PATH_GTK_2_0], [no], [auto]), [no])]) -if test x$gtk3 == xyes; then +if test x$gtk3 = xyes; then AC_MSG_WARN("Gtk3 enabled") m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))]) - else -@@ -202,7 +202,7 @@ else - fi fi -if test x$gtk3 == xno; then Index: pkgsrc/graphics/geeqie/patches/patch-doc_Makefile.am diff -u pkgsrc/graphics/geeqie/patches/patch-doc_Makefile.am:1.1 pkgsrc/graphics/geeqie/patches/patch-doc_Makefile.am:1.2 --- pkgsrc/graphics/geeqie/patches/patch-doc_Makefile.am:1.1 Sun Apr 17 09:45:59 2016 +++ pkgsrc/graphics/geeqie/patches/patch-doc_Makefile.am Wed Jan 10 09:38:32 2018 @@ -1,4 +1,4 @@ -$NetBSD: patch-doc_Makefile.am,v 1.1 2016/04/17 09:45:59 wiz Exp $ +$NetBSD: patch-doc_Makefile.am,v 1.2 2018/01/10 09:38:32 wiz Exp $ Generate html docs in build phase (instead of install phase). gnome-doc-tool seems to ignore "-o html" so manually generate @@ -8,11 +8,11 @@ Solves PLIST problem due to missing html This is not know to be reported upstream. ---- doc/Makefile.am.orig 2016-03-07 10:21:06.000000000 +0000 +--- doc/Makefile.am.orig 2017-12-31 12:31:21.000000000 +0000 +++ doc/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook html/GuideIndex.html: docbook/GuideIndex.xml - rm -rf html; mkdir html + rm -rf html; mkdir html; cp $(srcdir)/icons/* html/ if [ -x "$(GNOME_DOC_TOOL)" ]; then \ - "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \ + cd html && "$(GNOME_DOC_TOOL)" html $(srcdir)/../docbook/GuideIndex.xml ; \ Added files: Index: pkgsrc/graphics/geeqie/patches/patch-Makefile.am diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-Makefile.am:1.1 --- /dev/null Wed Jan 10 09:38:32 2018 +++ pkgsrc/graphics/geeqie/patches/patch-Makefile.am Wed Jan 10 09:38:32 2018 @@ -0,0 +1,18 @@ +$NetBSD: patch-Makefile.am,v 1.1 2018/01/10 09:38:32 wiz Exp $ + +ChangeLog files are not in distfile. + +--- Makefile.am.orig 2017-12-31 12:31:21.000000000 +0000 ++++ 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 Index: pkgsrc/graphics/geeqie/patches/patch-src_layout__util.c diff -u /dev/null pkgsrc/graphics/geeqie/patches/patch-src_layout__util.c:1.1 --- /dev/null Wed Jan 10 09:38:32 2018 +++ pkgsrc/graphics/geeqie/patches/patch-src_layout__util.c Wed Jan 10 09:38:32 2018 @@ -0,0 +1,35 @@ +$NetBSD: patch-src_layout__util.c,v 1.1 2018/01/10 09:38:32 wiz Exp $ + +1. For WEXITSTATUS(). +2. Fix +layout_util.c: In function 'layout_menu_write_rotate': +layout_util.c:516:16: error: lvalue required as unary '&' operand + +--- src/layout_util.c.orig 2017-12-31 12:31:21.000000000 +0000 ++++ src/layout_util.c +@@ -58,6 +58,7 @@ + #include "metadata.h" + #include "desktop_file.h" + ++#include + #include /* for keyboard values */ + #include "keymap_template.c" + +@@ -495,6 +496,7 @@ static void layout_menu_write_rotate(Gtk + + while (work) + { ++ int ret; + if (lw->vf->type == FILEVIEW_ICON) + { + fd_n = work->data; +@@ -512,7 +514,8 @@ static void layout_menu_write_rotate(Gtk + command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation, + keep_date ? " -t " : " ", fd_n->path, NULL); + +- run_result = WEXITSTATUS(runcmd(command)); ++ ret = runcmd(command); ++ run_result = WEXITSTATUS(ret); + if (!run_result) + { + fd_n->user_orientation = 0; --_----------=_1515577112157930--