Fix to build with vala 0.48

3 files changed, 25 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e278ef5e090..0d9ef55a7dd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = xfce4-dockbarx-plugin
 	pkgdesc = Embed DockbarX in the xfce4-panel
 	pkgver = 0.5
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/TiZ-EX1/xfce4-dockbarx-plugin
 	arch = i686
 	arch = x86_64
+	arch = aarch64
+	arch = armv7h
 	license = X11
 	makedepends = python2
 	makedepends = git
@@ -15,8 +17,10 @@ pkgbase = xfce4-dockbarx-plugin
 	conflicts = dockbarx-gtk3-git
 	source = xfce4-dockbarx-plugin::git+https://github.com/TiZ-EX1/xfce4-dockbarx-plugin#commit=cf16d6f415d03828e7a702550a0552ed5ea7ce0c
 	source = pref_dialog_fix.patch::https://github.com/TiZ-EX1/xfce4-dockbarx-plugin/commit/960ed3806d00b33b6a254fb583b366177ba56b77.patch
+	source = vala0.48fix.patch
 	sha256sums = SKIP
 	sha256sums = 04892f2eb8413a79288b234ed61af588a66f70553a9db9272d8f1d7904ad1dfa
+	sha256sums = 4b6c29fe052d6e890fbb67c5622728569a630bb6128c5b033039c5d00b22994d
 
 pkgname = xfce4-dockbarx-plugin
 
diff --git a/PKGBUILD b/PKGBUILD
index a458cd8f1913..1b5c598ee6f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,27 +2,30 @@
 
 pkgname=xfce4-dockbarx-plugin
 pkgver=0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Embed DockbarX in the xfce4-panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
 url="https://github.com/TiZ-EX1/xfce4-dockbarx-plugin"
 license=('X11')
 depends=('dockbarx>=0.91' 'xfce4-panel<4.15.0')
 makedepends=('python2' 'git' 'vala')
-conflicts=("${pkgname}-git" 'dockbarx-gtk3-git') # Unfortunately doesn't work with the GTK3 version of dockbarx yet
+conflicts=("${pkgname}-git" 'dockbarx-gtk3-git') # Use xfce4-dockbarx-plugin-gtk3-git to work with the GTK3 version of dockbarx
 
 #source=( ${pkgname}-${pkgver}.tar.gz::https://github.com/TiZ-EX1/${pkgname}/archive/v${pkgver}.tar.gz )
 #sha256sums=('c55e5231ae8b69ab10c22ab5150e47f5392b2398572e753cbcb1a147362e0ba5')
 # Version 0.5 was never properly tagged, so use the commit directly
 _commit='cf16d6f415d03828e7a702550a0552ed5ea7ce0c' # 1 after version bump with updated README
 source=("${pkgname}::git+https://github.com/TiZ-EX1/xfce4-dockbarx-plugin#commit=${_commit}"
-        'pref_dialog_fix.patch::https://github.com/TiZ-EX1/xfce4-dockbarx-plugin/commit/960ed3806d00b33b6a254fb583b366177ba56b77.patch')
+        'pref_dialog_fix.patch::https://github.com/TiZ-EX1/xfce4-dockbarx-plugin/commit/960ed3806d00b33b6a254fb583b366177ba56b77.patch'
+        'vala0.48fix.patch')
 sha256sums=('SKIP'
-            '04892f2eb8413a79288b234ed61af588a66f70553a9db9272d8f1d7904ad1dfa')
+            '04892f2eb8413a79288b234ed61af588a66f70553a9db9272d8f1d7904ad1dfa'
+            '4b6c29fe052d6e890fbb67c5622728569a630bb6128c5b033039c5d00b22994d')
 
 prepare() {
   cd "${srcdir}/${pkgname}" #-${pkgver}"
   patch -Np1 -i ../pref_dialog_fix.patch
+  patch -Np2 -r- -i ../vala0.48fix.patch
 }
 
 build() {
diff --git a/vala0.48fix.patch b/vala0.48fix.patch
new file mode 100644
index 000000000000..6e89b805518a
--- /dev/null
+++ b/vala0.48fix.patch
@@ -0,0 +1,12 @@
+diff -Naur ./xfce4-dockbarx-plugin.orig/vapi/libxfce4panel-1.0.vapi ./xfce4-dockbarx-plugin/vapi/libxfce4panel-1.0.vapi
+--- ./xfce4-dockbarx-plugin.orig/vapi/libxfce4panel-1.0.vapi	2020-03-22 14:23:20.633731643 -0400
++++ ./xfce4-dockbarx-plugin/vapi/libxfce4panel-1.0.vapi	2020-03-22 14:23:32.289623541 -0400
+@@ -99,7 +99,7 @@
+ 		public virtual signal void mode_changed (Xfce.PanelPluginMode mode);
+ 		public virtual signal void nrows_changed (uint rows);
+ 		public virtual signal void orientation_changed (Gtk.Orientation orientation);
+-		public virtual signal bool remote_event (string name, GLib.Value value);
++		public virtual signal bool remote_event (string name, GLib.Value value, uint handle);
+ 		public virtual signal void removed ();
+ 		public virtual signal void save ();
+ 		public virtual signal void screen_position_changed (Xfce.ScreenPosition position);