From e640e49a5bd5cb8a3b272af2d38aa2c5d9993949 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Mon, 26 Oct 2020 22:06:13 +0100 Subject: 20201026.1 global branch merge. Signed-off-by: Matteo Bernardini --- .../totem-pl-parser/totem-pl-parser.SlackBuild | 42 ++++++++++------------ 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'libraries/totem-pl-parser/totem-pl-parser.SlackBuild') diff --git a/libraries/totem-pl-parser/totem-pl-parser.SlackBuild b/libraries/totem-pl-parser/totem-pl-parser.SlackBuild index a65d1f9a4d..fcc7e06516 100644 --- a/libraries/totem-pl-parser/totem-pl-parser.SlackBuild +++ b/libraries/totem-pl-parser/totem-pl-parser.SlackBuild @@ -5,13 +5,13 @@ # Written by crocket (crockabiscuit@gmail.com) PRGNAM=totem-pl-parser -VERSION=${VERSION:-3.4.5} +VERSION=${VERSION:-3.26.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -46,30 +46,26 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.xz 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +mkdir build +cd build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --disable-static \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make V=1 -make install-strip DESTDIR=$PKG + --libexecdir=/usr/lib$LIBDIRSUFFIX \ + --buildtype=release \ + -Denable-gtk-doc=true \ + .. +ninja +DESTDIR="$PKG" ninja install +cd .. mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README \ + AUTHORS COPYING.LIB MAINTAINERS NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cd $PKG/usr/doc/$PRGNAM-$VERSION ln -sf ../../share/gtk-doc/html/$PRGNAM html -- cgit v1.2.3