diff options
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | PKGBUILD | 69 |
2 files changed, 70 insertions, 27 deletions
@@ -1,9 +1,10 @@ pkgbase = geeqie-gtk2 pkgdesc = Lightweight image viewer (GTK2 build) - pkgver = 1.5 - pkgrel = 1 + pkgver = 1.6 + pkgrel = 6 url = http://www.geeqie.org/ arch = x86_64 + arch = i686 license = GPL2 makedepends = git makedepends = intltool @@ -15,12 +16,14 @@ pkgbase = geeqie-gtk2 makedepends = fbida makedepends = gawk makedepends = perl-image-exiftool + makedepends = doxygen + makedepends = yelp-tools + makedepends = graphviz depends = exiv2 depends = gtk2 depends = ffmpegthumbnailer depends = djvulibre depends = libheif - depends = libchamplain depends = poppler-glib optdepends = librsvg: SVG rendering optdepends = fbida: for jpeg rotation @@ -28,9 +31,22 @@ pkgbase = geeqie-gtk2 optdepends = perl-image-exiftool: for the jpeg extraction plugin optdepends = gphoto2: command-line tools for various (plugin) operations optdepends = imagemagick: command-line tools for various (plugin) operations - provides = geeqie + provides = geeqie=1.6-6 conflicts = geeqie - source = https://github.com/BestImageViewer/geeqie/releases/download/v1.5/geeqie-1.5.tar.xz - sha256sums = 9736c8cbf21cc39d0a9c720934cdd33fe2756dc903c2a12cfc78b8822d2d1bf5 + source = https://github.com/BestImageViewer/geeqie/releases/download/v1.6/geeqie-1.6.tar.xz + source = https://github.com/BestImageViewer/geeqie/releases/download/v1.6/geeqie-1.6.tar.xz.asc + source = wayland_fix1.patch::https://github.com/BestImageViewer/geeqie/commit/fa91a270d420a7fcdb38ebb40332d14c4e2f4492.patch + source = wayland_fix2.patch::https://github.com/BestImageViewer/geeqie/commit/8768ab3d7588019ea07a440a9cfd12679bc07d65.patch + source = fix_segfault_with_clutter-gtk.patch::https://github.com/BestImageViewer/geeqie/commit/f34ea0700048c27319a2256408171adda32a7580.patch + source = geeqie-yelp40.patch::https://github.com/BestImageViewer/geeqie/commit/a33d8c40.patch + source = image-not-shown.patch::https://github.com/BestImageViewer/geeqie/commit/89c5590a2ecc3132d34fa5b692d03b96e58ac117.patch + validpgpkeys = 85D4CA42952C949B175362B379D0B06F4E20AF1C + sha256sums = 48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920 + sha256sums = SKIP + sha256sums = ffcd29f4f7f9a4fcf68cffc54a82e1e006dd3755a0739970408ef61b3f3ddab2 + sha256sums = 56b390ff13459c73d45e768e6e87d42f7d92a5290d647b03601e9ce5ab83f741 + sha256sums = e7e5364d93d5f7a7a754d1548ba7701acdc4e2809c35feb5b3911829253a1af3 + sha256sums = 919e81f484486bc3e5ebabe7fb492bd611c079d2bd87d313b0d160359daada44 + sha256sums = 9669033361c67abbefb0163f545a3ae0c86a2d3df68952efb83e33999a6bae3c pkgname = geeqie-gtk2 @@ -1,48 +1,75 @@ # Maintainer: Maciej Dems <macdems at gmail.com> pkgname=geeqie-gtk2 -pkgver=1.5 -pkgrel=1 +_pkgname=geeqie +pkgver=1.6 +pkgrel=6 pkgdesc='Lightweight image viewer (GTK2 build)' -arch=('x86_64') +arch=(x86_64 i686) url="http://www.geeqie.org/" license=('GPL2') +# https://github.com/BestImageViewer/geeqie#optional-libraries depends=('exiv2' 'gtk2' 'ffmpegthumbnailer' - 'djvulibre' 'libheif' 'libchamplain' + 'djvulibre' 'libheif' 'poppler-glib') makedepends=('git' 'intltool' 'python' 'librsvg' 'libwmf' 'libwebp' 'imagemagick' - 'fbida' 'gawk' 'perl-image-exiftool') + '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') -provides=('geeqie') -conflicts=('geeqie') -source=("https://github.com/BestImageViewer/geeqie/releases/download/v1.5/geeqie-1.5.tar.xz") -sha256sums=('9736c8cbf21cc39d0a9c720934cdd33fe2756dc903c2a12cfc78b8822d2d1bf5') +provides=(geeqie=${pkgver}-${pkgrel}) +conflicts=(geeqie) +source=(https://github.com/BestImageViewer/geeqie/releases/download/v${pkgver}/${_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 +) +sha256sums=('48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920' + 'SKIP' + 'ffcd29f4f7f9a4fcf68cffc54a82e1e006dd3755a0739970408ef61b3f3ddab2' + '56b390ff13459c73d45e768e6e87d42f7d92a5290d647b03601e9ce5ab83f741' + 'e7e5364d93d5f7a7a754d1548ba7701acdc4e2809c35feb5b3911829253a1af3' + '919e81f484486bc3e5ebabe7fb492bd611c079d2bd87d313b0d160359daada44' + '9669033361c67abbefb0163f545a3ae0c86a2d3df68952efb83e33999a6bae3c') +validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') # "Klaus Ethgen <Klaus@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 "${srcdir}/geeqie-${pkgver}" + 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 + NOCONFIGURE=1 ./autogen.sh } build() { - cd "${srcdir}/geeqie-${pkgver}" - - CFLAGS=-fcommon - - ./configure \ - --prefix=/usr \ - --disable-lirc \ - --disable-lua - make + cd "${_pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-gtk3 + make } package() { - cd "${srcdir}/geeqie-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } |