Date: Thursday, March 12, 2020 @ 20:06:50 Author: bisson Revision: 377433
archrelease: copy trunk to extra-x86_64 Added: geeqie/repos/extra-x86_64/PKGBUILD (from rev 377432, geeqie/trunk/PKGBUILD) geeqie/repos/extra-x86_64/geeqie-no-changelog.patch (from rev 377432, geeqie/trunk/geeqie-no-changelog.patch) geeqie/repos/extra-x86_64/yelp-build.patch (from rev 377432, geeqie/trunk/yelp-build.patch) Deleted: geeqie/repos/extra-x86_64/PKGBUILD geeqie/repos/extra-x86_64/geeqie-no-changelog.patch ---------------------------+ PKGBUILD | 77 ++++++++++++++++++++++---------------------- geeqie-no-changelog.patch | 28 ++++++++-------- yelp-build.patch | 46 ++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 51 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-03-12 20:06:26 UTC (rev 377432) +++ PKGBUILD 2020-03-12 20:06:50 UTC (rev 377433) @@ -1,37 +0,0 @@ -# Maintainer: Eric Bélanger <e...@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> - -pkgname=geeqie -pkgver=1.5.1 -pkgrel=1 -pkgdesc='Lightweight image viewer' -arch=('x86_64') -url="http://www.geeqie.org/" -license=('GPL2') -depends=('exiv2' 'gtk2' 'ffmpegthumbnailer') -makedepends=('intltool' 'doxygen' 'gnome-doc-utils' 'python') -optdepends=('librsvg: SVG rendering' - 'fbida: for jpeg rotation') -validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') -source=("http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz"{,.asc} - 'geeqie-no-changelog.patch') -sha256sums=('4854d5d323c31f8f4068fd73ab2c454ff91e826c4ca4d37b22c246ad14dea10a' - 'SKIP' - 'f6eb2725a47fc750d95455d4bbf4be5a0ae45307d3ada571937212a25b2b4301') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../geeqie-no-changelog.patch # Workaround missing changelog (Fedora) - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: geeqie/repos/extra-x86_64/PKGBUILD (from rev 377432, geeqie/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-03-12 20:06:50 UTC (rev 377433) @@ -0,0 +1,40 @@ +# Maintainer: Eric Bélanger <e...@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> + +pkgname=geeqie +pkgver=1.5.1 +pkgrel=2 +pkgdesc='Lightweight image viewer' +arch=('x86_64') +url="http://www.geeqie.org/" +license=('GPL2') +depends=('exiv2' 'gtk2' 'ffmpegthumbnailer') +makedepends=('intltool' 'doxygen' 'yelp-tools' 'python') +optdepends=('librsvg: SVG rendering' + 'fbida: for jpeg rotation') +validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C') +source=("http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz"{,.asc} + 'yelp-build.patch' + 'geeqie-no-changelog.patch') +sha256sums=('4854d5d323c31f8f4068fd73ab2c454ff91e826c4ca4d37b22c246ad14dea10a' + 'SKIP' + '511d12cbf24ddc5fa8bea0809dc0fbe9587555545d1edd88034a4a72bd972d67' + 'f6eb2725a47fc750d95455d4bbf4be5a0ae45307d3ada571937212a25b2b4301') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../yelp-build.patch + patch -p1 -i ../geeqie-no-changelog.patch # Workaround missing changelog (Fedora) + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: geeqie-no-changelog.patch =================================================================== --- geeqie-no-changelog.patch 2020-03-12 20:06:26 UTC (rev 377432) +++ geeqie-no-changelog.patch 2020-03-12 20:06:50 UTC (rev 377433) @@ -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 Copied: geeqie/repos/extra-x86_64/geeqie-no-changelog.patch (from rev 377432, geeqie/trunk/geeqie-no-changelog.patch) =================================================================== --- geeqie-no-changelog.patch (rev 0) +++ geeqie-no-changelog.patch 2020-03-12 20:06:50 UTC (rev 377433) @@ -0,0 +1,14 @@ +--- 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 Copied: geeqie/repos/extra-x86_64/yelp-build.patch (from rev 377432, geeqie/trunk/yelp-build.patch) =================================================================== --- yelp-build.patch (rev 0) +++ yelp-build.patch 2020-03-12 20:06:50 UTC (rev 377433) @@ -0,0 +1,46 @@ +From c9ea0d5b58270f360530ccf70d0a90758fe47490 Mon Sep 17 00:00:00 2001 +From: Colin Clark <colin.cl...@cclark.uk> +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 +