system/geoclue2: Updated for version 2.6.0.

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

4 files changed, 41 insertions, 34 deletions

diff --git a/system/geoclue2/README b/system/geoclue2/README
index 64c739f89539..347a22b1b293 100644
--- a/system/geoclue2/README
+++ b/system/geoclue2/README
@@ -12,3 +12,7 @@ avahi is an optional dependency, used for location sharing (by redshift,
 for example).  To enable it, use the option AVAHI=yes
 
   AVAHI=yes ./geoclue2.Slackbuild
+
+To build HTML Geoclue GTK docs, use the option GTK_DOC=yes
+
+  GTK_DOC=yes ./geoclue2.Slackbuild
diff --git a/system/geoclue2/geoclue2.SlackBuild b/system/geoclue2/geoclue2.SlackBuild
index df4698368ab5..943c2e85126a 100644
--- a/system/geoclue2/geoclue2.SlackBuild
+++ b/system/geoclue2/geoclue2.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Slackware build script for geoclue2
-# Copyright 2017-2018 Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Copyright 2017-2022 Aaditya Bagga <aaditya_gnulinux@zoho.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=geoclue2
-VERSION=${VERSION:-2.4.7}
+VERSION=${VERSION:-2.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -71,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -80,27 +77,30 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-avahi_opts='--disable-nmea-source'
-[ "${AVAHI:-no}" != "no" ] && avahi_opts=''
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  $avahi_opts \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+[ "${AVAHI:-no}" != "no" ] && avahi_opts=true || avahi_opts=false
+[ "${GTK_DOC:-no}" != "no" ] && doc_opts=true || doc_opts=false
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --prefix=/usr \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --libexecdir=/usr/libexec \
+    --sysconfdir=/etc \
+    --includedir=/usr/include \
+    --localstatedir=/var \
+    --datadir=/usr/share \
+    --mandir=/usr/man \
+    --infodir=/usr/info \
+    --buildtype=release \
+    -Dnmea-source=$avahi_opts \
+    -Dgtk-doc=$doc_opts \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 # Preserve config file
 mv $PKG/etc/geoclue/geoclue.conf $PKG/etc/geoclue/geoclue.conf.new
@@ -108,8 +108,11 @@ mv $PKG/etc/geoclue/geoclue.conf $PKG/etc/geoclue/geoclue.conf.new
 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
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING COPYING.LIB NEWS README docs \
+cp -a COPYING COPYING.LIB NEWS README.md HACKING.md docs \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/geoclue2/geoclue2.info b/system/geoclue2/geoclue2.info
index 9c7ede1bb559..fe0494d8fc00 100644
--- a/system/geoclue2/geoclue2.info
+++ b/system/geoclue2/geoclue2.info
@@ -1,8 +1,8 @@
 PRGNAM="geoclue2"
-VERSION="2.4.7"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/GeoClue"
-DOWNLOAD="https://www.freedesktop.org/software/geoclue/releases/2.4/geoclue-2.4.7.tar.xz"
-MD5SUM="e50086e742740413669ab72d8572db05"
+VERSION="2.6.0"
+HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home"
+DOWNLOAD="https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.6.0/geoclue-2.6.0.tar.bz2"
+MD5SUM="07ed45bc145e87d7f76fa521d5412f29"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/geoclue2/slack-desc b/system/geoclue2/slack-desc
index 3c2b9befdd1f..30e6fcf24ee3 100644
--- a/system/geoclue2/slack-desc
+++ b/system/geoclue2/slack-desc
@@ -8,11 +8,11 @@
         |-----handy-ruler------------------------------------------------------|
 geoclue2: geoclue2 (location information service)
 geoclue2:
-geoclue2: geoclue2 is a D-Bus service that provides location information.
+geoclue2: geoclue2 is a D-Bus geoinformation service.
 geoclue2:
 geoclue2: This is a rewrite of the original geoclue.
 geoclue2:
-geoclue2: Homepage: https://www.freedesktop.org/wiki/Software/GeoClue
+geoclue2: Homepage: https://gitlab.freedesktop.org/geoclue/geoclue
 geoclue2:
 geoclue2:
 geoclue2: