system/lxdm: Added a Slackware theme, cleanups.

Switch to build the gtk+3 version by default

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

4 files changed, 53 insertions, 9 deletions

diff --git a/system/lxdm/README b/system/lxdm/README
index e1db0d5dbc..eff7c7fd0a 100644
--- a/system/lxdm/README
+++ b/system/lxdm/README
@@ -2,7 +2,13 @@ LXDM - GUI login manager for LXDE
 
 LXDM is a lightweight drop-in replacement for GDM or KDM.
 
-To build the GTK3 version, script can be run as:
-  GTK3=yes ./lxdm.SlackBuild
+By default the gtk+3 version of the greeter is built: to
+build the gtk+2 one instead, the script can be run as
+
+  GTK3=no ./lxdm.SlackBuild
+
+An additional InduSlack theme (by Sebastien Ballet) is
+provided: to avoid including it in the final package pass
+the script the parameter WITH_INDUSLACK=no
 
 See README.SLACKWARE for post-installation configuration.
diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild
index 5d4e92df1b..3a44265c69 100644
--- a/system/lxdm/lxdm.SlackBuild
+++ b/system/lxdm/lxdm.SlackBuild
@@ -25,12 +25,12 @@
 
 PRGNAM=lxdm
 VERSION=${VERSION:-20170805_e3e7517}
-BUILD=${BUILD:-3}
+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
@@ -41,8 +41,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"
@@ -55,7 +55,15 @@ else
   LIBDIRSUFFIX=""
 fi
 
-with_gtk3="" ; [ "${GTK3:-no}" != "no" ] && with_gtk3="--enable-gtk3"
+# InduSlack lxdm theme version number
+#
+INDUSLACK_VER=${INDUSLACK_VER:-20170818}
+
+# Defines whether or not to install InduSlack theme
+#
+WITH_INDUSLACK=${WITH_INDUSLACK:-yes}
+
+with_gtk3="" ; [ "${GTK3:-yes}" = "yes" ] && with_gtk3="--enable-gtk3"
 
 set -e
 
@@ -91,6 +99,14 @@ patch -p1 < $CWD/patches/remove_suse_from_Xsession.diff
 # to maintain ; let's hope I don't eat those words.  --rworkman
 patch -p1 < $CWD/patches/lxdm-set_DESKTOP_SESSION_in_env.diff
 
+# Set the minimum height of the user list to 100px in greeter-gtk3.ui (Gtk3
+# Industrial theme ui file). Without this, the user list is too small and 
+# barely unusable. 
+# According to upstream that seems to be related to a bug in Gtk+3 
+# version(ie. 3.18.9) shipped with Slackware 14.2.
+#
+patch -p0 < $CWD/patches/set_user_list_scrolled_min_content_height.patch
+
 sh autogen.sh || true
 
 CFLAGS="$SLKCFLAGS" \
@@ -134,6 +150,16 @@ EOF
 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
 
+if [ "${WITH_INDUSLACK}" = "yes" ] ; then
+  tar xvf $CWD/InduSlack-lxdm-theme-${INDUSLACK_VER}.tar.gz -C $PKG/usr/share/lxdm/themes
+  chown -R root:root $PKG/usr/share/lxdm/themes/InduSlack
+  find -L $PKG/usr/share/lxdm/themes/InduSlack \
+   \( -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 {} \;
+fi
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING INSTALL README TODO \
diff --git a/system/lxdm/lxdm.info b/system/lxdm/lxdm.info
index d44a6947c9..a4c0f7ccba 100644
--- a/system/lxdm/lxdm.info
+++ b/system/lxdm/lxdm.info
@@ -1,8 +1,10 @@
 PRGNAM="lxdm"
 VERSION="20170805_e3e7517"
 HOMEPAGE="http://lxde.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxdm-20170805_e3e7517.tar.xz"
-MD5SUM="80865c1a8fbdcbc5e9cfbf96e7f3a956"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxdm-20170805_e3e7517.tar.xz \
+          http://ponce.cc/slackware/sources/repo/InduSlack-lxdm-theme-20170818.tar.gz"
+MD5SUM="80865c1a8fbdcbc5e9cfbf96e7f3a956 \
+        8867c9a0fec0ddc47c364b99a5ef156d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/lxdm/patches/set_user_list_scrolled_min_content_height.patch b/system/lxdm/patches/set_user_list_scrolled_min_content_height.patch
new file mode 100644
index 0000000000..3c266194a7
--- /dev/null
+++ b/system/lxdm/patches/set_user_list_scrolled_min_content_height.patch
@@ -0,0 +1,10 @@
+--- data/themes/Industrial/greeter-gtk3.ui.orig	2017-08-16 18:07:41.274011389 +0200
++++ data/themes/Industrial/greeter-gtk3.ui	2017-08-16 18:08:40.999009868 +0200
+@@ -67,6 +67,7 @@
+                             <property name="can_focus">False</property>
+                             <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                             <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
++                            <property name="min-content-height">100</property>
+                             <child>
+                               <object class="GtkIconView" id="user_list">
+                                 <property name="visible">True</property>