Update viewnior-git

3 files changed, 16 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07868d87135c..1800ea4b5dc9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
+# Generated by mksrcinfo v8
+# Thu May 31 15:01:05 UTC 2018
 pkgbase = viewnior-git
 	pkgdesc = Simple, fast, elegant and minimalistic image viewer, written in C(GTK+) with a new GtkImageView library. Git Version
-	pkgver = viewnior.1.4.r3.gfc0f5cb
+	pkgver = 1.7.r2.gaac0a0c
 	pkgrel = 1
 	url = http://xsisqox.github.com/Viewnior/
-	install = viewnior-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = gnome-common
 	makedepends = intltool
+	makedepends = meson
+	makedepends = ninja
 	depends = exiv2
 	depends = gtk2
-	depends = desktop-file-utils
 	provides = viewnior
 	conflicts = viewnior
-	options = strip
-	source = viewnior-git::git+https://github.com/xsisqox/Viewnior.git
+	source = viewnior-git::git+https://github.com/hellosiyan/Viewnior.git
 	md5sums = SKIP
 
 pkgname = viewnior-git
diff --git a/PKGBUILD b/PKGBUILD
index ffd6d534f1a5..06b49780886e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,24 @@
-# Mantainer: Berseker <berseker86 at gmail.com>
+# Maintainer: Florian Dejonckheere <florian at floriandejonckheere dot be>
+# Contributor: Berseker <berseker86 at gmail.com>
 
 pkgname=viewnior-git
-pkgver=viewnior.1.4.r3.gfc0f5cb
+pkgver=1.7.r2.gaac0a0c
 pkgrel=1
 pkgdesc="Simple, fast, elegant and minimalistic image viewer, written in C(GTK+) with a new GtkImageView library. Git Version"
 arch=('i686' 'x86_64')
 url='http://xsisqox.github.com/Viewnior/'
 license=('GPL')
-depends=('exiv2' 'gtk2' 'desktop-file-utils')
-makedepends=('gnome-common' 'intltool')
+depends=('exiv2' 'gtk2')
+makedepends=('gnome-common' 'intltool' 'meson' 'ninja')
 provides=('viewnior')
-install="${pkgname}.install"
 conflicts=('viewnior')
-options=('strip')
-source=("viewnior-git::git+https://github.com/xsisqox/Viewnior.git")
+source=("${pkgname}::git+https://github.com/hellosiyan/Viewnior.git")
 md5sums=('SKIP')
 
 pkgver()
 {
 	cd "${srcdir}/${pkgname}"
-	# Use the tag of the last commit
-	git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+	git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g;s/viewnior.//'
 }
 
 
@@ -28,16 +26,12 @@ pkgver()
 build()
 {
 	cd "${srcdir}/${pkgname}"
-	rm -rf "${srcdir}/${pkgname}/build"
-	sed -i 's/AM_PROG_CC_STDC/AC_PROG_CC/g' configure.ac
-	./autogen.sh
-
-	LDFLAGS='-lm' ./configure --prefix=/usr
-	make
+	meson builddir --prefix=/usr
+	ninja -C builddir
 }
 
 package()
 {
 	cd "${srcdir}/${pkgname}"
-	make DESTDIR=${pkgdir} install
+	DESTDIR="${pkgdir}" ninja -C builddir install
 }
diff --git a/viewnior-git.install b/viewnior-git.install
deleted file mode 100644
index eb5a5683f9aa..000000000000
--- a/viewnior-git.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-        xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-        update-desktop-database -q
-         gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-        post_install
-}
-
-post_remove() {
-        post_install
-}
\ No newline at end of file