nicer pkgver and libhandy patching

3 files changed, 48 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c797c34cbc1..bd0c959f45bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri May 25 18:37:59 UTC 2018
 pkgbase = pantheon-screenshot-git
 	pkgdesc = The Pantheon Screenshot Tool
-	pkgver = r581.4f8a110
+	pkgver = 1.7.1.r85.g1d72fc1
 	pkgrel = 1
 	url = https://github.com/elementary/screenshot-tool
 	arch = x86_64
@@ -19,11 +17,14 @@ pkgbase = pantheon-screenshot-git
 	depends = glibc
 	depends = gtk3
 	depends = libcanberra
+	depends = libhandy1
 	depends = libgranite.so
 	provides = pantheon-screenshot
 	conflicts = pantheon-screenshot
 	source = pantheon-screenshot::git+https://github.com/elementary/screenshot-tool.git
+	source = 0001-support-libhandy1.patch
 	sha256sums = SKIP
+	sha256sums = b300a47911342fbe1cf22ccae0287b53ca584bff873d3491ef480687d8d9933a
 
 pkgname = pantheon-screenshot-git
 
diff --git a/0001-support-libhandy1.patch b/0001-support-libhandy1.patch
new file mode 100644
index 000000000000..9ad2a43de104
--- /dev/null
+++ b/0001-support-libhandy1.patch
@@ -0,0 +1,30 @@
+From a63269a8cac80fc6da96a1c4002a97d455e1ed72 Mon Sep 17 00:00:00 2001
+From: Solomon Choina <shlomochoina@gmail.com>
+Date: Thu, 13 Aug 2020 22:13:04 -0400
+Subject: [PATCH] support libhandy1
+
+---
+ meson.build | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index f10c378..a80fd52 100644
+--- a/meson.build
++++ b/meson.build
+@@ -13,6 +13,13 @@ add_global_arguments(
+     language:'c'
+ )
+ 
++add_project_arguments (
++  # FIXME Drop once we depend on libhandy 1.0.
++  '--disable-since-check',
++  language: 'vala'
++)
++
++
+ icon_res = gnome.compile_resources(
+     'screenshot-icon-resources',
+     'data/' + meson.project_name() + '.gresource.xml',
+-- 
+2.28.0
+
diff --git a/PKGBUILD b/PKGBUILD
index c69170118f4d..795632a4f6d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,45 @@
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=pantheon-screenshot-git
-pkgver=r581.4f8a110
+pkgver=1.7.1.r85.g1d72fc1
 pkgrel=1
 pkgdesc='The Pantheon Screenshot Tool'
 arch=('x86_64')
 url='https://github.com/elementary/screenshot-tool'
 license=('GPL3')
 groups=('pantheon-unstable')
-depends=('cairo' 'gdk-pixbuf2' 'glib2' 'glibc' 'gtk3' 'libcanberra'
+depends=('cairo' 'gdk-pixbuf2' 'glib2' 'glibc' 
+         'gtk3' 'libcanberra' 'libhandy1'
          'libgranite.so')
 makedepends=('git' 'granite-git' 'intltool' 'meson' 'vala')
 provides=('pantheon-screenshot')
 conflicts=('pantheon-screenshot')
-source=("pantheon-screenshot::git+https://github.com/elementary/screenshot-tool.git")
-sha256sums=('SKIP')
+source=("pantheon-screenshot::git+https://github.com/elementary/screenshot-tool.git"
+        "0001-support-libhandy1.patch")
+sha256sums=('SKIP'
+            'b300a47911342fbe1cf22ccae0287b53ca584bff873d3491ef480687d8d9933a')
 
 pkgver() {
   cd pantheon-screenshot
 
-  echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-
   sed 's/extra/io.elementary.screenshot-tool.extra/' -i pantheon-screenshot/po/extra/meson.build
+
+   cd pantheon-screenshot
+   patch -Np1 -i ../0001-support-libhandy1.patch
 }
 
 build() {
-  cd build
-
-  arch-meson ../pantheon-screenshot
-  ninja
+  arch-meson pantheon-screenshot build
+  ninja -C build
 }
 
 package() {
-  cd build
 
-  DESTDIR="${pkgdir}" ninja install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et: