system/lxsession: Switch to gtk+3 by default.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

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

3 files changed, 25 insertions, 16 deletions

diff --git a/system/lxsession/README b/system/lxsession/README
index 1f715bf79f..a5d2e2888f 100644
--- a/system/lxsession/README
+++ b/system/lxsession/README
@@ -4,5 +4,8 @@ LXSession is the standard session manager used by LXDE (Lightweight X11
 Desktop Environment).  A session manager is used to automatically start
 a set of applications and set up a working desktop environment.
 
-if you want to build this for gtk+3 pass to the script the switch
-  GTK3=yes
+if you want to build this for gtk+2 pass to the script the switch
+
+  GTK3=no
+
+you will need libunique as a dependency, in this case
diff --git a/system/lxsession/lxsession.SlackBuild b/system/lxsession/lxsession.SlackBuild
index 183c52298a..f900a0f37c 100644
--- a/system/lxsession/lxsession.SlackBuild
+++ b/system/lxsession/lxsession.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 # $Id: lxsession.SlackBuild,v 1.1 2009/09/11 10:33:13 root Exp root $
 # Copyright (c) 2008-2009  Eric Hameleers, Eindhoven, NL
-# Copyright (c) 2010-2019  Matteo Bernardini, Pisa, IT
+# Copyright (c) 2010-2024  Matteo Bernardini, Pisa, IT
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -61,6 +61,8 @@
 #             * update.
 # 0.5.5-2:    13/apr/2022 by B. Watson <urchlay@slackware.uk>
 #             * remove empty file from doc dir.
+# 0.5.5-3:    24/apr/2024 by Matteo Bernardini <ponce@slackbuilds.org>
+#             * Switch to gtk+3.
 #
 # Run 'sh lxsession.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -72,7 +74,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=lxsession
 VERSION=${VERSION:-0.5.5}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -84,9 +86,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 20220413 bkw: don't include NEWS, it's a 0-byte placeholder.
-DOCS="AUTHORS COPYING ChangeLog README"
-
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -110,8 +109,10 @@ else
   LIBDIRSUFFIX=""
 fi
 
-WITHGTK3=""
-[ "${GTK3:-no}" = "yes" ] && WITHGTK3="--enable-gtk3"
+WITHGTK3="--enable-gtk3" ; [ "${GTK3:-yes}" = "no" ] && WITHGTK3="--enable-gtk"
+
+# 20220413 bkw: don't include NEWS, it's a 0-byte placeholder.
+DOCS="AUTHORS COPYING ChangeLog README"
 
 set -e
 
@@ -123,10 +124,13 @@ 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 {} \;
+
+rm *.stamp
+autoreconf -fi
 
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
@@ -139,7 +143,6 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --program-prefix= \
   --program-suffix= \
-  --enable-gtk \
   $WITHGTK3 \
   --enable-buildin-clipboard \
   --enable-buildin-polkit \
@@ -147,9 +150,12 @@ CFLAGS="$SLKCFLAGS" \
 
 make
 make install-strip DESTDIR=$PKG
+
+echo 'X-AppStream-Ignore=true' >> $PKG/usr/share/applications/lxsession-default-apps.desktop
+echo 'X-AppStream-Ignore=true' >> $PKG/usr/share/applications/lxsession-edit.desktop
+
 gzip -9 $PKG/usr/man/man*/*
 
-# Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/system/lxsession/lxsession.info b/system/lxsession/lxsession.info
index d652daab67..116fd62cde 100644
--- a/system/lxsession/lxsession.info
+++ b/system/lxsession/lxsession.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sf.net/lxde/lxsession-0.5.5.tar.xz"
 MD5SUM="e8380acef215ee7c99c067a2241c2c7b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libunique"
+REQUIRES="libunique3"
 MAINTAINER="Matteo Bernardini"
 EMAIL="ponce@slackbuilds.org"