[arch-commits] Commit in geeqie/trunk (PKGBUILD buildfix.diff)

[Andreas Radke]

    Date: Monday, January 17, 2022 @ 18:51:53
  Author: andyrtr
Revision: 434619

upgpkg: geeqie 1.7.1-1: upstream update 1.7.1 - apply some fixed to get it installed properly

Added:
  geeqie/trunk/buildfix.diff
Modified:
  geeqie/trunk/PKGBUILD

---------------+
 PKGBUILD      |   51 ++++++++++++++++++---------------------------------
 buildfix.diff |   14 ++++++++++++++
 2 files changed, 32 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-17 18:13:58 UTC (rev 434618)
+++ PKGBUILD	2022-01-17 18:51:53 UTC (rev 434619)
@@ -3,8 +3,8 @@
 # Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 
 pkgname=geeqie
-pkgver=1.6
-pkgrel=6
+pkgver=1.7.1
+pkgrel=1
 pkgdesc='Lightweight image viewer'
 arch=('x86_64')
 url="http://www.geeqie.org/"
@@ -12,12 +12,14 @@
 # https://github.com/BestImageViewer/geeqie#optional-libraries
 depends=('exiv2' 'gtk3' 'ffmpegthumbnailer'
          'djvulibre' 'libheif' 'libchamplain'
-         'poppler-glib')
-makedepends=('intltool' 'python' 'librsvg'
+         'poppler-glib' 'libarchive' 'libraw' 'lua')
+makedepends=('git'
+             'intltool' 'python' 'librsvg'
              'libwmf' 'libwebp' 'imagemagick'
              'fbida' 'gawk' 'perl-image-exiftool'
              # for the docs
-             'doxygen' 'yelp-tools' 'graphviz')
+             'doxygen' 'yelp-tools' 'graphviz'
+)
 optdepends=('librsvg: SVG rendering'
             'fbida: for jpeg rotation'
             'gawk: to use the geo-decode function'
@@ -24,22 +26,13 @@
             'perl-image-exiftool: for the jpeg extraction plugin'
             '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}
-        #https://github.com/BestImageViewer/geeqie/releases/download/v1.6/${pkgname}-${pkgver}.tar.xz"{,.asc}
-        wayland_fix1.patch::https://github.com/BestImageViewer/geeqie/commit/fa91a270d420a7fcdb38ebb40332d14c4e2f4492.patch
-        wayland_fix2.patch::https://github.com/BestImageViewer/geeqie/commit/8768ab3d7588019ea07a440a9cfd12679bc07d65.patch
-        fix_segfault_with_clutter-gtk.patch::https://github.com/BestImageViewer/geeqie/commit/f34ea0700048c27319a2256408171adda32a7580.patch
-        geeqie-yelp40.patch::https://github.com/BestImageViewer/geeqie/commit/a33d8c40.patch
-        image-not-shown.patch::https://github.com/BestImageViewer/geeqie/commit/89c5590a2ecc3132d34fa5b692d03b96e58ac117.patch
+source=(#"http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz"{,.asc}
+        ${pkgname}-${pkgver}.tar.gz::https://github.com/BestImageViewer/geeqie/archive/refs/tags/v${pkgver}.tar.gz
+        buildfix.diff
 )
-sha256sums=('48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920'
-            'SKIP'
-            'ffcd29f4f7f9a4fcf68cffc54a82e1e006dd3755a0739970408ef61b3f3ddab2'
-            '56b390ff13459c73d45e768e6e87d42f7d92a5290d647b03601e9ce5ab83f741'
-            'e7e5364d93d5f7a7a754d1548ba7701acdc4e2809c35feb5b3911829253a1af3'
-            '919e81f484486bc3e5ebabe7fb492bd611c079d2bd87d313b0d160359daada44'
-            '9669033361c67abbefb0163f545a3ae0c86a2d3df68952efb83e33999a6bae3c')
-validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') # "Klaus Ethgen <Klaus at Ethgen.de>"
+sha256sums=('6625f174abfda86883fd94f4cbd1054528db0f90915ae5d00f4a080dcb80411d'
+            '1e293e872a8ddce4e5f1e22ce50d1fe29212ca05cac8cc45df5ecdfd308effed')
+#validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') # "Klaus Ethgen <Klaus at Ethgen.de>"
 
 # main repo: http://www.geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git
 # bug tracker: https://github.com/BestImageViewer/geeqie/issues
@@ -46,19 +39,10 @@
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-
-  # fix crash on wayland
-  #https://github.com/BestImageViewer/geeqie/issues/539
-  patch -Np1 -i ../wayland_fix1.patch
-  patch -Np1 -i ../wayland_fix2.patch
-  # fix crash on X11 with clutter
-  # https://github.com/BestImageViewer/geeqie/issues/829
-  patch -Np1 -i ../fix_segfault_with_clutter-gtk.patch
-  # fix doc build with yelp 40
-  patch -p1 -i ../geeqie-yelp40.patch
-  # image not shown - FS#70755
-  patch -p1 -i ../image-not-shown.patch
-
+  # fix missinging Changelog.html
+  patch -Np1 -i ../buildfix.diff
+  # fix broken docdir
+  sed -i "s:+git:${pkgver}:" configure.ac
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -71,4 +55,5 @@
 package(){
   cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  mv "${pkgdir}"/usr/share/doc/geeqie-1.7.1/ChangeLog.gqview "${pkgdir}"/usr/share/doc/geeqie-1.7.1/ChangeLog
 }

Added: buildfix.diff
===================================================================
--- buildfix.diff	                        (rev 0)
+++ buildfix.diff	2022-01-17 18:51:53 UTC (rev 434619)
@@ -0,0 +1,14 @@
+--- geeqie-1.7.1/Makefile.am	2022-01-17 15:26:31.000000000 +0100
++++ geeqie-1.7.1/Makefile.am.new	2022-01-17 15:31:28.796386390 +0100
+@@ -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 ChangeLog.gqview TODO README.lirc AUTHORS README.html ChangeLog.html
+ else
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
++readme_DATA = README.md COPYING ChangeLog.gqview TODO README.lirc AUTHORS
+ endif
+ 
+ desktopdir = $(datadir)/applications