Moving packages from bzr to git

Adding the patch to support libhandy1 for vala
using a tagged pkgver

3 files changed, 58 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c142455fe57f..b2d776932a4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
-# Generated by mksrcinfo v8
-# Fri Jul 27 11:58:14 UTC 2018
 pkgbase = switchboard-git
 	pkgdesc = The Pantheon Control Center
-	pkgver = r1211.cd4124e
+	pkgver = 2.4.0.r25.gb406b3d
 	pkgrel = 1
 	url = https://github.com/elementary/switchboard
 	arch = x86_64
 	groups = pantheon-unstable
 	license = GPL3
 	makedepends = git
-	makedepends = granite-git
+	makedepends = granite
 	makedepends = intltool
 	makedepends = meson
 	makedepends = vala
@@ -19,17 +17,20 @@ pkgbase = switchboard-git
 	depends = gtk3
 	depends = libgee
 	depends = libgranite.so
-	optdepends = switchboard-plug-about-bzr: About plug
-	optdepends = switchboard-plug-default-applications-bzr: Default applications plug
-	optdepends = switchboard-plug-elementary-tweaks-bzr: Elementary tweaks plug
-	optdepends = switchboard-plug-keyboard-bzr: Keyboard plug
-	optdepends = switchboard-plug-pantheon-shell-bzr: Pantheon Shell plug
-	optdepends = switchboard-plug-power-bzr: Power plug
+	depends = libhandy1
+	optdepends = switchboard-plug-about-git: About plug
+	optdepends = switchboard-plug-default-applications-git: Default applications plug
+	optdepends = switchboard-plug-elementary-tweaks-git: Elementary tweaks plug
+	optdepends = switchboard-plug-keyboard-git: Keyboard plug
+	optdepends = switchboard-plug-pantheon-shell-git: Pantheon Shell plug
+	optdepends = switchboard-plug-power-git: Power plug
 	provides = switchboard
 	provides = libswitchboard-2.0.so
 	conflicts = switchboard
 	source = git+https://github.com/elementary/switchboard.git
+	source = 0001-libhandy1-support.patch
 	sha256sums = SKIP
+	sha256sums = 0963caab95c40cb9e538316eb5da2bd6e0614d570d887db13f3ff76e78fa9ed4
 
 pkgname = switchboard-git
 
diff --git a/0001-libhandy1-support.patch b/0001-libhandy1-support.patch
new file mode 100644
index 000000000000..63392de60207
--- /dev/null
+++ b/0001-libhandy1-support.patch
@@ -0,0 +1,29 @@
+From 2abccbdfc16b1c48453279f2205537a4f1656519 Mon Sep 17 00:00:00 2001
+From: Solomon Choina <shlomochoina@gmail.com>
+Date: Mon, 10 Aug 2020 11:57:02 -0400
+Subject: [PATCH] libhandy1-support
+
+---
+ meson.build | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index ac9407c..99a2dd8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -14,6 +14,12 @@ add_project_arguments([
+     language: 'c'
+ )
+ 
++add_project_arguments (
++  # FIXME Drop once we depend on libhandy 1.0.
++  '--disable-since-check',
++  language: 'vala'
++)
++
+ plugs_dir = join_paths(get_option('prefix'), get_option('libdir'), 'switchboard')
+ 
+ i18n = import('i18n')
+-- 
+2.28.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 66efa28c0376..6b92c3b3ae23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=switchboard-git
-pkgver=r1211.cd4124e
+pkgver=2.4.0.r25.gb406b3d
 pkgrel=1
 pkgdesc='The Pantheon Control Center'
 arch=('x86_64')
@@ -9,25 +9,31 @@ url='https://github.com/elementary/switchboard'
 license=('GPL3')
 groups=('pantheon-unstable')
 depends=('clutter-gtk' 'glib2' 'glibc' 'gtk3' 'libgee'
-         'libgranite.so')
-makedepends=('git' 'granite-git' 'intltool' 'meson' 'vala')
-optdepends=('switchboard-plug-about-bzr: About plug'
-            'switchboard-plug-default-applications-bzr: Default applications plug'
-            'switchboard-plug-elementary-tweaks-bzr: Elementary tweaks plug'
-            'switchboard-plug-keyboard-bzr: Keyboard plug'
-            'switchboard-plug-pantheon-shell-bzr: Pantheon Shell plug'
-            'switchboard-plug-power-bzr: Power plug')
+         'libgranite.so' 'libhandy1')
+makedepends=('git' 'granite' 'intltool' 'meson' 'vala')
+optdepends=('switchboard-plug-about-git: About plug'
+            'switchboard-plug-default-applications-git: Default applications plug'
+            'switchboard-plug-elementary-tweaks-git: Elementary tweaks plug'
+            'switchboard-plug-keyboard-git: Keyboard plug'
+            'switchboard-plug-pantheon-shell-git: Pantheon Shell plug'
+            'switchboard-plug-power-git: Power plug')
 provides=('switchboard' 'libswitchboard-2.0.so')
 conflicts=('switchboard')
-source=('git+https://github.com/elementary/switchboard.git')
-sha256sums=('SKIP')
+source=('git+https://github.com/elementary/switchboard.git'
+        '0001-libhandy1-support.patch')
+sha256sums=('SKIP'
+            '0963caab95c40cb9e538316eb5da2bd6e0614d570d887db13f3ff76e78fa9ed4')
 
 pkgver() {
   cd switchboard
 
-  echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd switchboard
+  patch -Np1 -i ../0001-libhandy1-support.patch
+}
 build() {
   arch-meson switchboard build \
     -Dlibunity='false'