diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-03-20 15:17:34 +0700 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2016-03-20 23:34:30 -0500 |
| commit | 3f3f1a04409fad8d3f2ac8fe3b2ada7da58daf3c (patch) | |
| tree | 7c3ce372f1dbc084b9f357d86692d5955713f704 | |
| parent | ae5af4e07dc873174993e0308d2867b4e22abd20 (diff) | |
| download | slackbuilds-3f3f1a04409fad8d3f2ac8fe3b2ada7da58daf3c.tar.gz | |
audio/guitarix: Fix build.
This commit remove webkit hack since upstream requires it as well.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | audio/guitarix/guitarix.SlackBuild | 23 | ||||
| -rw-r--r-- | audio/guitarix/guitarix.info | 2 |
2 files changed, 5 insertions, 20 deletions
diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild index e3fa1af6a9..adba06e984 100644 --- a/audio/guitarix/guitarix.SlackBuild +++ b/audio/guitarix/guitarix.SlackBuild @@ -86,10 +86,10 @@ tar xvf $CWD/$TARNAME-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Confusing freedesktop.org standard is confusing. # To pass desktop-file-validate, we need both Audio and AudioVideo, even @@ -102,17 +102,6 @@ if [ "${LV2:-yes}" = "no" ]; then LV2OPT=--no-lv2 fi -# 20151109 bkw: in case anyone needs guitarix-0.33.0: -# Starting with 0.34.0, the default is to pass -std=c++11 to gcc, which -# causes Slack 14.1's old bluetooth.h to fail (it uses gcc extensions). -# Before 0.34.0, this option's not needed... and will cause an error if -# it's present. Also, our patches are for 0.34.0 and won't apply to -# 0.33.0. So: -if ./waf --help | grep -q -- --disable-cxx11; then - EXTRAOPT="--disable-cxx11" - PATCH=${PATCH:-yes} -fi - # patches are optional (undocumented in README, on purpose) if [ "${PATCH:-no}" = "yes" ]; then for patch in $CWD/patches/*.patch; do @@ -123,10 +112,6 @@ fi # allow building non-SSE package on SSE host [ "${SSE:-yes}" = "no" ] && EXTRAOPT="$EXTRAOPT --disable-sse" -# allow disabling webkitgtk. A bit of a dirty hack. -[ "${WEBKIT:-yes}" = "no" ] && \ - sed -i 's,webkit-1.0,webkit-DISABLED,' wscript - LIBDIR="/usr/lib${LIBDIRSUFFIX}" ./waf configure \ --prefix=/usr \ diff --git a/audio/guitarix/guitarix.info b/audio/guitarix/guitarix.info index 7cdebf3e2e..184cc06095 100644 --- a/audio/guitarix/guitarix.info +++ b/audio/guitarix/guitarix.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/guitarix/guitarix2-0.34.0.tar.bz2" MD5SUM="0ac5f18ee738d535b1551ea68ac2fce9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jack-audio-connection-kit liblrdf lilv" +REQUIRES="jack-audio-connection-kit liblrdf lilv webkitgtk" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" |