Backport vala 0.48 build fix.

2 files changed, 18 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e69c634ff778..d88d4c81c031 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xfce4-panel-devel
-	pkgdesc = Panel for the Xfce desktop environment
+	pkgdesc = Panel for the Xfce desktop environment (development release)
 	pkgver = 4.15.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.xfce.org/
 	arch = i686
 	arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = xfce4-panel-devel
 	makedepends = intltool
 	makedepends = gtk-doc
 	makedepends = gobject-introspection
-	makedepends = vala0.46>=0.46.7-2
+	makedepends = vala
 	makedepends = python
 	depends = exo
 	depends = garcon
@@ -22,7 +22,9 @@ pkgbase = xfce4-panel-devel
 	provides = xfce4-panel=4.15.2
 	conflicts = xfce4-panel
 	source = https://archive.xfce.org/src/xfce/xfce4-panel/4.15/xfce4-panel-4.15.2.tar.bz2
+	source = vala_0.48_build_fix.patch::https://git.xfce.org/xfce/xfce4-panel/patch/?id=659d61ee2901ffe1e34f7dbcf5d8213b7a17d142
 	sha256sums = a668b5315268ba5b14b6574edbe00c522f879dea659b75c7742da7140cc3657f
+	sha256sums = 5837420637f100ec5f5170c992932a9f930e958cb34f647d993b031543138b02
 
 pkgname = xfce4-panel-devel
 
diff --git a/PKGBUILD b/PKGBUILD
index a15a7f767499..a98d27941505 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,26 +3,31 @@
 _pkgname=xfce4-panel
 pkgname=${_pkgname}-devel
 pkgver=4.15.2
-pkgrel=2
-pkgdesc="Panel for the Xfce desktop environment"
+pkgrel=3
+pkgdesc="Panel for the Xfce desktop environment (development release)"
 arch=('i686' 'x86_64')
 url="https://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4-devel')
 depends=('exo' 'garcon' 'libxfce4ui>=4.15.1' 'xfconf' 'libwnck3' 'hicolor-icon-theme'
          'desktop-file-utils')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'vala0.46>=0.46.7-2' 'python') #for gdbus-codegen
-# won't build with vala 0.48: see https://bugzilla.xfce.org/show_bug.cgi?id=16426#c9. Will backport once they commit a working fix.
+makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'vala' 'python') #for gdbus-codegen
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${_pkgname}")
-source=("https://archive.xfce.org/src/xfce/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2")
-sha256sums=('a668b5315268ba5b14b6574edbe00c522f879dea659b75c7742da7140cc3657f')
+source=("https://archive.xfce.org/src/xfce/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
+        "vala_0.48_build_fix.patch::https://git.xfce.org/xfce/xfce4-panel/patch/?id=659d61ee2901ffe1e34f7dbcf5d8213b7a17d142")
+sha256sums=('a668b5315268ba5b14b6574edbe00c522f879dea659b75c7742da7140cc3657f'
+            '5837420637f100ec5f5170c992932a9f930e958cb34f647d993b031543138b02')
 
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  patch -Np1 -i ../vala_0.48_build_fix.patch
+}
+	
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  PKG_CONFIG_PATH="/usr/lib/pkgconfig/vala-0.46/:${PKG_CONFIG_PATH}" \
-    ./configure \
+  ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \