[arch-commits] Commit in geeqie/repos/extra-x86_64 (PKGBUILD PKGBUILD buildfix.diff)

[Andreas Radke]

    Date: Tuesday, January 25, 2022 @ 14:20:57
  Author: andyrtr
Revision: 435101

archrelease: copy trunk to extra-x86_64

Added:
  geeqie/repos/extra-x86_64/PKGBUILD
    (from rev 435100, geeqie/trunk/PKGBUILD)
Deleted:
  geeqie/repos/extra-x86_64/PKGBUILD
  geeqie/repos/extra-x86_64/buildfix.diff

---------------+
 PKGBUILD      |  113 ++++++++++++++++++++++++++------------------------------
 buildfix.diff |   14 ------
 2 files changed, 54 insertions(+), 73 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-25 14:20:48 UTC (rev 435100)
+++ PKGBUILD	2022-01-25 14:20:57 UTC (rev 435101)
@@ -1,59 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Eric Bélanger <eric at archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-
-pkgname=geeqie
-pkgver=1.7.1
-pkgrel=1
-pkgdesc='Lightweight image viewer'
-arch=('x86_64')
-url="http://www.geeqie.org/"
-license=('GPL2')
-# https://github.com/BestImageViewer/geeqie#optional-libraries
-depends=('exiv2' 'gtk3' 'ffmpegthumbnailer'
-         'djvulibre' 'libheif' 'libchamplain'
-         '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'
-)
-optdepends=('librsvg: SVG rendering'
-            'fbida: for jpeg rotation'
-            'gawk: to use the geo-decode function'
-            '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}
-        ${pkgname}-${pkgver}.tar.gz::https://github.com/BestImageViewer/geeqie/archive/refs/tags/v${pkgver}.tar.gz
-        buildfix.diff
-)
-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
-
-prepare() {
-  cd "${pkgname}-${pkgver}"
-  # fix missinging Changelog.html
-  patch -Np1 -i ../buildfix.diff
-  # fix broken docdir
-  sed -i "s:+git:${pkgver}:" configure.ac
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-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
-}

Copied: geeqie/repos/extra-x86_64/PKGBUILD (from rev 435100, geeqie/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-25 14:20:57 UTC (rev 435101)
@@ -0,0 +1,54 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+
+pkgname=geeqie
+pkgver=1.7.2
+pkgrel=1
+pkgdesc='Lightweight image viewer'
+arch=('x86_64')
+url="http://www.geeqie.org/"
+license=('GPL2')
+# https://github.com/BestImageViewer/geeqie#optional-libraries
+depends=('exiv2' 'gtk3' 'ffmpegthumbnailer'
+         'djvulibre' 'libheif' 'libchamplain'
+         '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'
+)
+optdepends=('librsvg: SVG rendering'
+            'fbida: for jpeg rotation'
+            'gawk: to use the geo-decode function'
+            '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/v${pkgver}/${pkgname}-${pkgver}.tar.xz # {,.asc} nowhere to be found
+)
+sha256sums=('186c10fae05dd81783f5218432e777cae2e9579ce884e65afa0884c357192269'
+            #'SKIP'
+)
+#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
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package(){
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: buildfix.diff
===================================================================
--- buildfix.diff	2022-01-25 14:20:48 UTC (rev 435100)
+++ buildfix.diff	2022-01-25 14:20:57 UTC (rev 435101)
@@ -1,14 +0,0 @@
---- 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