diff options
| -rw-r--r-- | libraries/girara/girara.SlackBuild | 39 | ||||
| -rw-r--r-- | libraries/girara/girara.info | 8 |
2 files changed, 25 insertions, 22 deletions
diff --git a/libraries/girara/girara.SlackBuild b/libraries/girara/girara.SlackBuild index 41434cde3f681..acee9756e9992 100644 --- a/libraries/girara/girara.SlackBuild +++ b/libraries/girara/girara.SlackBuild @@ -6,8 +6,11 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20180619 bkw: Update for v0.3.0. Upstream switched from make to meson, +# so this script's no longer compatible with older versions of girara. + PRGNAM=girara -VERSION=${VERSION:-0.2.8} +VERSION=${VERSION:-0.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,31 +56,31 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -sed -i "s,-fPIC,$SLKCFLAGS," config.mk -sed -i '/-fdiagnostics-color/d' colors.mk - -# girara-0.2.8 claims to need a newer glib2 and gtk3 than Slack 14.2 has, -# but disabling the version checks and getting rid of one option in the -# Makefile allows it to build and run OK. -sed -i '/--dependency-file/d' Makefile -MAKEOPTS="GTK_VERSION_CHECK=0 GLIB_VERSION_CHECK=0 VERBOSE=1" +# upstream claims we need newer glib and gtk+3 libs than Slack 14.2 has, +# but diddling the requirements allows it to build and run OK. +sed -i \ + -e '/^glib =/s,>=2\.[0-9]\+,>=2.46,' \ + -e '/^gtk3 =/s,>=3\.[0-9]\+,>=3.18,' \ + meson.build -make LIBDIR=/usr/lib$LIBDIRSUFFIX $MAKEOPTS -make install LIBDIR=/usr/lib$LIBDIRSUFFIX DESTDIR=$PKG +# There's no SBo meson.template. +# see http://mesonbuild.com/Quick-guide.html -# don't need static lib: -rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.a +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ + meson \ + --libdir lib$LIBDIRSUFFIX \ + --prefix /usr \ + --buildtype=plain \ + build -# .so library not installed +x, fix: -chmod 755 $PKG/usr/lib$LIBDIRSUFFIX/*.so.*.* +DESTDIR="$PKG" ninja -C build install # strip it, strip it good strip $PKG/usr/lib$LIBDIRSUFFIX/*.so.*.* mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS LICENSE README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/girara/girara.info b/libraries/girara/girara.info index 6db186fc06303..340fbcf38494b 100644 --- a/libraries/girara/girara.info +++ b/libraries/girara/girara.info @@ -1,10 +1,10 @@ PRGNAM="girara" -VERSION="0.2.8" +VERSION="0.3.0" HOMEPAGE="https://github.com/pwmt/girara" -DOWNLOAD="https://github.com/pwmt/girara/archive/0.2.8/girara-0.2.8.tar.gz" -MD5SUM="5c6a86bc044a4b2da127cbc9cde12638" +DOWNLOAD="https://github.com/pwmt/girara/archive/0.3.0/girara-0.3.0.tar.gz" +MD5SUM="7f419ce20326dd7c9ef5118bb6d628b1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="meson" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" |