summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Rogoża2016-03-25 09:44:39 +0100
committerPiotr Rogoża2016-03-25 09:44:39 +0100
commit04e8d4e91dcc43ef010d260febf12aa792b8ff4d (patch)
tree559288853655ee4714bc5d8c78e2e013e9f673b2
parent3d63fec5c3749f7081ed9d02e6a77e0fc20b5c0d (diff)
downloadaur-04e8d4e91dcc43ef010d260febf12aa792b8ff4d.tar.gz
Added xorg-server-xvfb to makedepends, fixed check()
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0610bcff9cf5..f9b1121086e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jan 10 10:12:27 UTC 2016
+# Fri Mar 25 08:43:20 UTC 2016
pkgbase = perl-wx
pkgdesc = Wx - interface to the wxWidgets GUI toolkit
pkgver = 0.9928
- pkgrel = 2
+ pkgrel = 3
url = http://search.cpan.org/dist/Wx
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index c921d6bc1634..82e4c5e1243e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-wx
pkgver=0.9928
_author=M/MD/MDOOTSON
_perlmod=Wx
-pkgrel=2
+pkgrel=3
pkgdesc="Wx - interface to the wxWidgets GUI toolkit"
arch=('i686' 'x86_64')
url="http://search.cpan.org/dist/Wx"
@@ -16,13 +16,13 @@ wxgtk
makedepends=(
perl-alien-wxwidgets
perl-extutils-xspp
+xorg-server-xvfb
#ExtUtils::MakeMaker => perl
#ExtUtils::ParseXS => perl
#File::Spec::Functions => perl
#Test::More => perl
#Test::Harness => perl
)
-[ -z "$DISPLAY" ] && makedepends+=(xorg-server-xvfb)
provides=(
perl-wx-aui
perl-wx-app
@@ -89,8 +89,8 @@ build(){
}
check(){
cd "$srcdir"/$_perlmod-$pkgver
- if [ -z "$DISPLAY" ]; then
- warning 'Empty $DISPLAY - falling back to xvfb-run (xorg-server-xvfb)'
+ if [[ -z "$DISPLAY" || -x /usr/bin/xvfb-run ]]; then
+# warning 'Empty $DISPLAY - falling back to xvfb-run (xorg-server-xvfb)'
xvfb-run -a -s "+extension GLX -screen 0 1280x1024x24" make test
else
make test