development/devhelp: Updated for version 40.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 35 insertions, 31 deletions

diff --git a/development/devhelp/devhelp.SlackBuild b/development/devhelp/devhelp.SlackBuild
index 3541c24a14..8aac30e1a5 100644
--- a/development/devhelp/devhelp.SlackBuild
+++ b/development/devhelp/devhelp.SlackBuild
@@ -7,14 +7,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=devhelp
-VERSION=${VERSION:-2.32.0}
+VERSION=${VERSION:-41.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -32,8 +32,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,42 +46,46 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+ \( -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 {} \;
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -D strip=true \
+    -D plugin_emacs=true \
+    -D plugin_gedit=true \
+    -D plugin_vim=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSES NEWS *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/devhelp/devhelp.info b/development/devhelp/devhelp.info
index ac4f4f4e1c..f6e3ec9d95 100644
--- a/development/devhelp/devhelp.info
+++ b/development/devhelp/devhelp.info
@@ -1,10 +1,10 @@
 PRGNAM="devhelp"
-VERSION="2.32.0"
+VERSION="41.2"
 HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/devhelp/2.32/devhelp-2.32.0.tar.gz"
-MD5SUM="6253a7845cf3f800c105bcd115d77b29"
+DOWNLOAD="https://download.gnome.org/sources/devhelp/41/devhelp-41.2.tar.xz"
+MD5SUM="1b0ba87935ff3a06dfa716ca088b7a2d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libunique webkitgtk"
+REQUIRES="webkit2gtk"
 MAINTAINER="Andrew Rowland"
 EMAIL="darowland@ieee.org"