From c7e2316678bff969fbae896b434a687145082a43 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@alpinelinux.org>
Date: Fri, 27 Jul 2018 08:47:42 +0000
Subject: main/geeqie: upgrade to 1.4

---
 main/geeqie/APKBUILD                           | 32 ++++++++++++++------------
 main/geeqie/disable-werror.patch               | 12 ++++++++++
 main/geeqie/geeqie-1.4-goodbye-changelog.patch | 14 +++++++++++
 3 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 main/geeqie/disable-werror.patch
 create mode 100644 main/geeqie/geeqie-1.4-goodbye-changelog.patch

(limited to 'main/geeqie')

diff --git a/main/geeqie/APKBUILD b/main/geeqie/APKBUILD
index f6b98142d1..d4604305aa 100644
--- a/main/geeqie/APKBUILD
+++ b/main/geeqie/APKBUILD
@@ -1,39 +1,41 @@
 # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=geeqie
-pkgver=1.3
-pkgrel=1
+pkgver=1.4
+pkgrel=0
 pkgdesc="Geeqie is a lightweight Gtk+ based image viewer and organiser"
 url="http://www.geeqie.org/"
 arch="all"
 license="GPL"
 depends=""
-depends_dev=""
+options="!check"
 makedepends="gtk+2.0-dev lcms2-dev exiv2-dev libtool doxygen \
             lua5.1-dev graphviz-dev automake autoconf"
 install=""
 subpackages="$pkgname-doc $pkgname-lang"
-source="http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz"
+source="http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz
+	geeqie-1.4-goodbye-changelog.patch
+	disable-werror.patch
+	"
 
 builddir=${srcdir}/${pkgname}-${pkgver}
 
 build() {
 	cd "$builddir"
-	./autogen.sh || return 1
-        export CXXFLAGS="$CXXFLAGS -std=gnu++98"
+	./autogen.sh
 	./configure \
-           --build=$CBUILD \
-           --host=$CHOST \
-           --prefix=/usr \
-           --enable-lua || return 1
-        make || exit 1
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--enable-lua
+	make
 }
 
 package() {
 	cd "$builddir"
-        make DESTDIR="${pkgdir}" install
+	make DESTDIR="${pkgdir}" install
 }
 
-md5sums="0339ad62946cae7009ec76ec21572065  geeqie-1.3.tar.xz"
-sha256sums="4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f  geeqie-1.3.tar.xz"
-sha512sums="b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718  geeqie-1.3.tar.xz"
+sha512sums="a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205  geeqie-1.4.tar.xz
+c18740dd388d24b56c35c481a169f58e2710a5fbee6eae4792d7fb13209033581f893cd40b5af160be8f64326e6eea6abc2bf7363a063fedd17a0a999175834d  geeqie-1.4-goodbye-changelog.patch
+1c975041b1d5e2a69b3c6b3bac38fe7f133229cd47985ddf9eba38712a33e36dd45bf295d40ca9268989b146fb56419e5926297ffb19f52078a5d5eb7577100b  disable-werror.patch"
diff --git a/main/geeqie/disable-werror.patch b/main/geeqie/disable-werror.patch
new file mode 100644
index 0000000000..78a6547ff2
--- /dev/null
+++ b/main/geeqie/disable-werror.patch
@@ -0,0 +1,12 @@
+--- ./configure.in
++++ ./configure.in
+@@ -17,9 +17,6 @@
+ AC_PREREQ(2.57)
+ AC_INIT([geeqie], 1.4, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/])
+ 
+-# Add -Werror to the default CFLAGS
+-CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
+-
+ # Check for rightly dirs
+ AC_CONFIG_SRCDIR([src/main.c])
+ 
diff --git a/main/geeqie/geeqie-1.4-goodbye-changelog.patch b/main/geeqie/geeqie-1.4-goodbye-changelog.patch
new file mode 100644
index 0000000000..1b8833b135
--- /dev/null
+++ b/main/geeqie/geeqie-1.4-goodbye-changelog.patch
@@ -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
-- 
cgit v1.2.3