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

[Andreas Radke]

    Date: Friday, December 11, 2020 @ 22:42:45
  Author: andyrtr
Revision: 403999

upgpkg: geeqie 1.6-2: apply upstream fixes to make geeqie start using native wayland sessions; enable hardware acceleration - should now work with fixed libx11 1.7.0-2

Modified:
  geeqie/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-11 22:31:28 UTC (rev 403998)
+++ PKGBUILD	2020-12-11 22:42:45 UTC (rev 403999)
@@ -4,7 +4,7 @@
 
 pkgname=geeqie
 pkgver=1.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight image viewer'
 arch=('x86_64')
 url="http://www.geeqie.org/"
@@ -11,8 +11,7 @@
 license=('GPL2')
 # https://github.com/BestImageViewer/geeqie#optional-libraries
 depends=('exiv2' 'gtk3' 'ffmpegthumbnailer'
-         'libdjvu' 'libheif') 
-# 'libchamplain' - segfaults https://github.com/BestImageViewer/geeqie/issues/829
+         'libdjvu' 'libheif' 'libchamplain')
 makedepends=('intltool' 'python' 'librsvg' 'poppler-glib'
              'libwmf' 'libwebp' 'imagemagick'
              'fbida' 'gawk' 'perl-image-exiftool'
@@ -26,12 +25,15 @@
             '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}
+        wayland_fix1.patch::https://github.com/BestImageViewer/geeqie/commit/fa91a270d420a7fcdb38ebb40332d14c4e2f4492.patch
+        wayland_fix2.patch::https://github.com/BestImageViewer/geeqie/commit/8768ab3d7588019ea07a440a9cfd12679bc07d65.patch
         #https://github.com/BestImageViewer/geeqie/releases/download/v1.6/${pkgname}-${pkgver}.tar.xz"{,.asc}
 )
 sha256sums=('48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920'
+            'SKIP'
+            'SKIP'
             'SKIP')
 validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') # "Klaus Ethgen <Klaus at Ethgen.de>"
-# options=(debug !strip)
 
 # main repo: http://www.geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git
 # bug tracker: https://github.com/BestImageViewer/geeqie/issues
@@ -38,6 +40,12 @@
 
 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
+
   NOCONFIGURE=1 ./autogen.sh
 }