summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2020-04-07 12:54:39 -0400
committerTed Alff2020-04-07 12:54:39 -0400
commitfd60399410676e9c8879e58e738e11ca39354920 (patch)
treeefd7f804b867c189be9b625d98e727e8592e501f
parent1c3950c82f70532051b3e675c237369fe9fa0df6 (diff)
downloadaur-fd60399410676e9c8879e58e738e11ca39354920.tar.gz
Fixed the vala0.46 package, so remove the hack to use vapigen-0.46 since it's picked up from PKG_CONFIG_PATH now.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0306988d4301..e69c634ff778 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = xfce4-panel-devel
pkgdesc = Panel for the Xfce desktop environment
pkgver = 4.15.2
- pkgrel = 1
+ pkgrel = 2
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
+ makedepends = vala0.46>=0.46.7-2
makedepends = python
depends = exo
depends = garcon
diff --git a/PKGBUILD b/PKGBUILD
index e042e80db242..a15a7f767499 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=xfce4-panel
pkgname=${_pkgname}-devel
pkgver=4.15.2
-pkgrel=1
+pkgrel=2
pkgdesc="Panel for the Xfce desktop environment"
arch=('i686' 'x86_64')
url="https://www.xfce.org/"
@@ -11,7 +11,7 @@ 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' 'python') #for gdbus-codegen
+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.
provides=("${_pkgname}=${pkgver}")
conflicts=("${_pkgname}")
@@ -31,8 +31,6 @@ 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
}