Date: Wednesday, December 2, 2020 @ 21:54:03 Author: andyrtr Revision: 402826
upgpkg: geeqie 1.6-1: upstream update 1.6; use gtk3; enable most possible features since this is geeqie nad not a simple viewer - the gpu acceleration using clutter-gtk is currently broken and not possible - see upstream report Modified: geeqie/trunk/PKGBUILD Deleted: geeqie/trunk/gcc10.patch geeqie/trunk/geeqie-no-changelog.patch geeqie/trunk/yelp-build.patch ---------------------------+ PKGBUILD | 57 +++++++++++++++++++++++++------------------- gcc10.patch | 55 ------------------------------------------ geeqie-no-changelog.patch | 14 ---------- yelp-build.patch | 46 ----------------------------------- 4 files changed, 33 insertions(+), 139 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-02 20:06:09 UTC (rev 402825) +++ PKGBUILD 2020-12-02 21:54:03 UTC (rev 402826) @@ -2,42 +2,51 @@ # Contributor: Lukas Jirkovsky <[email protected]> pkgname=geeqie -pkgver=1.5.1 -pkgrel=3 +pkgver=1.6 +pkgrel=1 pkgdesc='Lightweight image viewer' arch=('x86_64') url="http://www.geeqie.org/"; license=('GPL2') -depends=('exiv2' 'gtk2' 'ffmpegthumbnailer') -makedepends=('intltool' 'doxygen' 'yelp-tools' 'python') +# https://github.com/BestImageViewer/geeqie#optional-libraries +depends=('exiv2' 'gtk3' 'ffmpegthumbnailer' + 'libdjvu' 'libheif') +# 'libchamplain' - segfaults https://github.com/BestImageViewer/geeqie/issues/829 +makedepends=('intltool' 'python' 'librsvg' 'poppler-glib' + 'libwmf' 'libwebp' 'imagemagick' + 'fbida' 'gawk' 'perl-image-exiftool' + # for the docs + 'doxygen' 'yelp-tools' 'graphviz') optdepends=('librsvg: SVG rendering' - 'fbida: for jpeg rotation') -validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') + 'fbida: for jpeg rotation' + 'gawk: to use the geo-decode function' + 'perl-image-exiftool: for the jpeg extraction plugin' + 'poppler-glib: for displaying pdf files' + 'gphoto2: command-line tools for various (plugin) operations' + 'imagemagick: command-line tools for various (plugin) operations') source=("http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz"{,.asc} - 'gcc10.patch' - 'yelp-build.patch' - 'geeqie-no-changelog.patch') -sha256sums=('4854d5d323c31f8f4068fd73ab2c454ff91e826c4ca4d37b22c246ad14dea10a' - 'SKIP' - '9589e10d88e3e8d9d0ada45d595fc95b75eead6a99b2e5932955198f74368e0a' - '511d12cbf24ddc5fa8bea0809dc0fbe9587555545d1edd88034a4a72bd972d67' - 'f6eb2725a47fc750d95455d4bbf4be5a0ae45307d3ada571937212a25b2b4301') + #https://github.com/BestImageViewer/geeqie/releases/download/v1.6/${pkgname}-${pkgver}.tar.xz"{,.asc} +) +sha256sums=('48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920' + 'SKIP') +validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') # "Klaus Ethgen <[email protected]>" +# options=(debug !strip) +# main repo: http://www.geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git +# bug tracker: https://github.com/BestImageViewer/geeqie/issues + prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../gcc10.patch - patch -p1 -i ../yelp-build.patch - patch -p1 -i ../geeqie-no-changelog.patch # Workaround missing changelog (Fedora) - NOCONFIGURE=1 ./autogen.sh + cd "${pkgname}-${pkgver}" + NOCONFIGURE=1 ./autogen.sh } build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } Deleted: gcc10.patch =================================================================== --- gcc10.patch 2020-12-02 20:06:09 UTC (rev 402825) +++ gcc10.patch 2020-12-02 21:54:03 UTC (rev 402826) @@ -1,55 +0,0 @@ -From 3ea5fa39d37e56443907255fbc81cb1b83dc9978 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <> -Date: Sun, 26 Jan 2020 11:05:18 +0000 -Subject: [PATCH] Fix #746: src/options: fix build failure against gcc-10 - -https://github.com/BestImageViewer/geeqie/pull/746 ---- - src/bar_exif.h | 3 --- - src/options.c | 3 +++ - src/options.h | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/bar_exif.h b/src/bar_exif.h -index 63c30d4b..1395e842 100644 ---- a/src/bar_exif.h -+++ b/src/bar_exif.h -@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n - void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); - - /* these are exposed for when duplication of the exif bar's text is needed */ -- --const gchar **bar_exif_key_list; --const gint bar_exif_key_count; - GList *bar_pane_exif_list(); - - #endif -diff --git a/src/options.c b/src/options.c -index 99459381..bab26acb 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -32,6 +32,9 @@ - #include "ui_fileops.h" - #include "window.h" - -+ConfOptions *options; -+CommandLine *command_line; -+ - ConfOptions *init_options(ConfOptions *options) - { - gint i; -diff --git a/src/options.h b/src/options.h -index fcfe961a..02ff8fac 100644 ---- a/src/options.h -+++ b/src/options.h -@@ -329,8 +329,8 @@ struct _ConfOptions - GList *disabled_plugins; - }; - --ConfOptions *options; --CommandLine *command_line; -+extern ConfOptions *options; -+extern CommandLine *command_line; - - ConfOptions *init_options(ConfOptions *options); - void setup_default_options(ConfOptions *options); Deleted: geeqie-no-changelog.patch =================================================================== --- geeqie-no-changelog.patch 2020-12-02 20:06:09 UTC (rev 402825) +++ geeqie-no-changelog.patch 2020-12-02 21:54:03 UTC (rev 402826) @@ -1,14 +0,0 @@ ---- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500 -+++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500 -@@ -10,9 +10,9 @@ - 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 Deleted: yelp-build.patch =================================================================== --- yelp-build.patch 2020-12-02 20:06:09 UTC (rev 402825) +++ yelp-build.patch 2020-12-02 21:54:03 UTC (rev 402826) @@ -1,46 +0,0 @@ -From c9ea0d5b58270f360530ccf70d0a90758fe47490 Mon Sep 17 00:00:00 2001 -From: Colin Clark <[email protected]> -Date: Mon, 30 Dec 2019 11:59:07 +0000 -Subject: [PATCH] Fix #736: Please migrate from gnome-doc-tool to yelp-build - -https://github.com/BestImageViewer/geeqie/issues/736 ---- - autogen.sh | 7 +++++++ - configure.ac | 2 +- - web/geeqie-install-debian.sh | 3 ++- - 3 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/autogen.sh b/autogen.sh -index 9a326050..3e247c45 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -58,6 +58,13 @@ test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - DIE=1 - } - -+GNOMEDOC=`which yelp-build` -+if test -z $GNOMEDOC; then -+ echo "*** The tools to build the documentation are not found," -+ echo " please intall the yelp-tool package ***" -+ DIE=1 -+fi -+ - if test "$DIE" -eq 1; then - exit 1 - fi -diff --git a/configure.ac b/configure.ac -index 29f54ae7..2ba122f1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -242,7 +242,7 @@ AC_ARG_WITH(htmldir, [ --with-htmldir=DIR install path for html files], - AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$readmedir", [Location of documentation files]) - AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$htmldir", [Location of html documentation]) - --AC_PATH_PROG(GNOME_DOC_TOOL, gnome-doc-tool) -+AC_PATH_PROG(GNOME_DOC_TOOL, yelp-build) - - AC_SUBST(readmedir) - AC_SUBST(htmldir) --- -2.11.0 -
