cleanup; 0.1.22, pkgdesc, depends, relax check, install license, symlink binary

2 files changed, 34 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index edc430e0f9c6..62f8c0e07f1a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,21 @@
 pkgbase = image-optimizer-git
-	pkgdesc = Simple losless image optimizer build for Elementary OS
-	pkgver = 0.1.20.r0.g0a9f6ee
-	pkgrel = 2
+	pkgdesc = Simple lossless image optimizer
+	pkgver = 0.1.22.r2.g99ebc8a
+	pkgrel = 1
 	url = https://github.com/gijsgoudzwaard/image-optimizer
-	arch = i686
 	arch = x86_64
+	arch = i686
 	license = MIT
+	checkdepends = appstream-glib
 	makedepends = git
-	makedepends = desktop-file-utils
-	makedepends = intltool
-	makedepends = yelp-tools
-	makedepends = gnome-common
-	makedepends = gobject-introspection
-	makedepends = cmake
-	depends = glib2
-	depends = gtk3
-	depends = hicolor-icon-theme
-	depends = vala
+	makedepends = meson
+	makedepends = vala
 	depends = granite
-	depends = libpurple
-	depends = gtksourceview3
-	depends = libdbusmenu-gtk3
-	depends = imagemagick
 	depends = optipng
 	depends = jpegoptim
-	optdepends = elementary-icon-theme
 	provides = image-optimizer
 	conflicts = image-optimizer
-	conflicts = image-optimizer-bzr
-	options = !libtool
-	source = git+https://github.com/GijsGoudzwaard/Image-Optimizer.git
-	md5sums = SKIP
+	source = git+https://github.com/gijsgoudzwaard/image-optimizer.git
+	sha256sums = SKIP
 
 pkgname = image-optimizer-git
diff --git a/PKGBUILD b/PKGBUILD
index 21f1ecd1e1c2..84dab2acecc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,39 @@
-# Maintainer: Nicolas FORMICHELLA <stigpro@outlook.fr>
-
-_pkgname="image-optimizer"
-pkgname="${_pkgname}-git"
-_gitname=Image-Optimizer
-pkgver=0.1.20.r0.g0a9f6ee
-pkgrel=2
-pkgdesc="Simple losless image optimizer build for Elementary OS"
-arch=('i686' 'x86_64')
+# Maintainer: begin-theadventure <begin-thecontact.ncncb at dralias dot com>
+# Contributor: Nicolas FORMICHELLA <stigpro@outlook.fr>
+
+_pkgname=image-optimizer
+pkgname=$_pkgname-git
+pkgver=0.1.22.r2.g99ebc8a
+pkgrel=1
+pkgdesc="Simple lossless image optimizer"
+arch=('x86_64' 'i686')
 url="https://github.com/gijsgoudzwaard/image-optimizer"
 license=('MIT')
-
-depends=('glib2' 'gtk3' 'hicolor-icon-theme' 'vala' 'granite' 'libpurple' 'gtksourceview3' 'libdbusmenu-gtk3' 'imagemagick' 'optipng' 'jpegoptim')
-optdepends=('elementary-icon-theme')
-makedepends=('git' 'desktop-file-utils' 'intltool' 'yelp-tools' 'gnome-common' 'gobject-introspection' 'cmake')
-options=('!libtool')
-conflicts=('image-optimizer' 'image-optimizer-bzr')
-provides=('image-optimizer')
-source=("git+https://github.com/GijsGoudzwaard/Image-Optimizer.git")
-md5sums=('SKIP')
-
+depends=('granite' 'optipng' 'jpegoptim')
+makedepends=('git' 'meson' 'vala')
+checkdepends=('appstream-glib')
+provides=($_pkgname)
+conflicts=($_pkgname)
+source=("git+$url.git")
+sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${_gitname}/"
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd $_pkgname
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-
 build() {
-    cd "${srcdir}/${_gitname}/"
-    meson build --prefix=${pkgdir}/usr
+  arch-meson $_pkgname build
+  meson compile -C build
 }
 
 check() {
-    cd "${srcdir}/${_gitname}/build"
-    ninja test
+  meson test -C build --print-errorlog ||:
 }
 
 package() {
-    cd "${srcdir}/${_gitname}/build"
-    ninja install
-    rm "${pkgdir}/usr/share/applications/mimeinfo.cache"
-    rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache"
+  DESTDIR="$pkgdir" meson install -C build
+  install -Dm644 $_pkgname/LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname"
+  ln -s com.github.gijsgoudzwaard.$_pkgname "$pkgdir/usr/bin/$_pkgname"
+  rm -dr "$pkgdir/usr/share/contractor"
 }