summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2020-04-07 10:45:00 -0400
committerTed Alff2020-04-07 10:45:00 -0400
commit1c3950c82f70532051b3e675c237369fe9fa0df6 (patch)
tree830b702a002c1cabf104c156a7b21b17cfefb234
parent580e23cfc6c6a0b02f8b39e90e9a544915dc6dcb (diff)
downloadaur-1c3950c82f70532051b3e675c237369fe9fa0df6.tar.gz
Version bump 4.15.2
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD12
2 files changed, 13 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 21e974c4cc0a..0306988d4301 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xfce4-panel-devel
pkgdesc = Panel for the Xfce desktop environment
- pkgver = 4.15.1
+ pkgver = 4.15.2
pkgrel = 1
url = https://www.xfce.org/
arch = i686
@@ -10,7 +10,7 @@ pkgbase = xfce4-panel-devel
makedepends = intltool
makedepends = gtk-doc
makedepends = gobject-introspection
- makedepends = vala
+ makedepends = vala0.46
makedepends = python
depends = exo
depends = garcon
@@ -19,10 +19,10 @@ pkgbase = xfce4-panel-devel
depends = libwnck3
depends = hicolor-icon-theme
depends = desktop-file-utils
- provides = xfce4-panel=4.15.1
+ provides = xfce4-panel=4.15.2
conflicts = xfce4-panel
- source = https://archive.xfce.org/src/xfce/xfce4-panel/4.15/xfce4-panel-4.15.1.tar.bz2
- sha256sums = a05b5d3b3ea4e47e1ea3756225421123ffc56927e2023e4f39df1ef0d58deca2
+ source = https://archive.xfce.org/src/xfce/xfce4-panel/4.15/xfce4-panel-4.15.2.tar.bz2
+ sha256sums = a668b5315268ba5b14b6574edbe00c522f879dea659b75c7742da7140cc3657f
pkgname = xfce4-panel-devel
diff --git a/PKGBUILD b/PKGBUILD
index f2e81c476760..e042e80db242 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=xfce4-panel
pkgname=${_pkgname}-devel
-pkgver=4.15.1
+pkgver=4.15.2
pkgrel=1
pkgdesc="Panel for the Xfce desktop environment"
arch=('i686' 'x86_64')
@@ -11,16 +11,18 @@ 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' 'vala' 'python') #for gdbus-codegen
+makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'vala0.46' '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.
provides=("${_pkgname}=${pkgver}")
conflicts=("${_pkgname}")
source=("https://archive.xfce.org/src/xfce/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2")
-sha256sums=('a05b5d3b3ea4e47e1ea3756225421123ffc56927e2023e4f39df1ef0d58deca2')
+sha256sums=('a668b5315268ba5b14b6574edbe00c522f879dea659b75c7742da7140cc3657f')
build() {
cd "$srcdir/$_pkgname-$pkgver"
- ./configure \
+ PKG_CONFIG_PATH="/usr/lib/pkgconfig/vala-0.46/:${PKG_CONFIG_PATH}" \
+ ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
@@ -29,6 +31,8 @@ build() {
--enable-gio-unix \
--enable-gtk-doc \
--disable-debug
+ # Yuck, but it doesn't seem to want to pick this up if I export VAPIGEN
+ find . -type f -name Makefile -exec sed -i 's:VAPIGEN = /usr/bin/vapigen-0.48:VAPIGEN = /usr/bin/vapigen-0.46:g' '{}' \;
make
}