Merge pull request #3244 from mariux64/update-lightdm

Update lightdm
mariux64 · May 22, 2025 · a995ec1 · a995ec1
2 parents b7d9b8f + 3102bee
commit a995ec1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/lightdm.be0 b/lightdm.be0
@@ -1,9 +1,9 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION lightdm-1.30.0-3
+# BEE_VERSION lightdm-1.32.0-0
 
-# SRCURL[0]="https://github.com/CanonicalLtd/lightdm/releases/download/${PKGVERSION}/lightdm-${PKGVERSION}.tar.xz"
-SRCURL[0]="https://beehive.molgen.mpg.de/c566ea595f2b81e68684be9f8dbcbb42/lightdm-1.30.0.tar.xz"
+#SRCURL[0]="https://github.com/CanonicalLtd/lightdm/releases/download/${PKGVERSION}/lightdm-${PKGVERSION}.tar.xz"
+SRCURL[0]="https://beehive.molgen.mpg.de/e62a5da6c35f612e4d9575eda5c8d467/lightdm-1.32.0.tar.xz"
 
 # PATCHURL+=(/src/mariux/patches/lightdm-faceoff.patch)
 PATCHURL+=("https://beehive.molgen.mpg.de/5fb001d7af859c412f471085f1e2e565/lightdm-faceoff.patch")
@@ -28,11 +28,12 @@ mee_configure() {
       --sbindir=/usr/bin                              \
       --sysconfdir=/etc                               \
       --docdir=/usr/share/doc/lightdm-${PKGVERSION}   \
+      --enable-introspection=no                       \
       --disable-static                                \
       --disable-tests                                 \
-      --enable-liblightdm-qt=no                       \
+      --enable-liblightdm-qt5=no                      \
       --with-greeter-user=${DMUSER}                   \
-      --with-greeter-session=slick-greeter \
+      --with-greeter-session=slick-greeter            \
       --disable-nls
 }
 

diff --git a/slick-greeter.be0 b/slick-greeter.be0
@@ -1,15 +1,15 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION slick-greeter-1.5.4-2
+# BEE_VERSION slick-greeter-2.0.9-0
 
 # SRCURL[0]="https://github.com/linuxmint/slick-greeter/archive/${PKGVERSION}.tar.gz slick-greeter-${PKGVERSION}.tar.gz"
-SRCURL[0]="https://beehive.molgen.mpg.de/800dabc37574cf3d636a9aa2ac572c24/slick-greeter-1.5.4.tar.gz"
+SRCURL[0]="https://beehive.molgen.mpg.de/dd34736cbc7a75e64fbe202469c9b670/slick-greeter-2.0.9.tar.gz"
 
 # pfffft ...
 # prevent call to python3 slick-greeter-check-hidpi which is basically 'echo "1"'
-PATCHURL+=("https://beehive.molgen.mpg.de/1860629294548b4b438adb7c2b33465d/slick-greeter-disable-check_hidpi.patch")
+#PATCHURL+=("https://beehive.molgen.mpg.de/1860629294548b4b438adb7c2b33465d/slick-greeter-disable-check_hidpi.patch")
 
-build_in_sourcedir  # or the 'badges' won't be installed
+#build_in_sourcedir  # or the 'badges' won't be installed
 
 # mee_extract() {
 #    bee_extract "${@}"
@@ -24,8 +24,7 @@ mee_patch() {
 }
 
 mee_configure() {
-    bee_configure \
-      --disable-nls
+    bee_configure
 }
 
 # mee_build() {
@@ -41,21 +40,23 @@ mee_install_post() {
     ###########################
     # write our default config
 
-    local slickgreeterconf=/etc/lightdm/slick-greeter.conf
-    mkdir -vp ${D}/etc/lightdm
+    local slickgreeterconfdir=/etc/lightdm/lightdm.conf.d
+    local slickgreeterconf=${slickgreeterconfdir}/slick-greeter.conf
+    mkdir -vp ${D}${slickgreeterconfdir}
 
-    cat <<CONF > ${D}/${slickgreeterconf}
+    cat <<CONF > ${D}${slickgreeterconf}
 # config options are listed here:
 #
 #     https://github.com/linuxmint/slick-greeter/blob/master/README.md
 #
+[Greeter]
 draw-user-backgrounds=false
 play-ready-sound=false
 # accessibility doesn't really help, and would require 'https://launchpad.net/onboard'
 show-a11y=false
 # since german is hammered into /etc/local/X11_xorg.conf, we can skip this
 # (also 'de   nodeadkeys' looks silly).
-show-keyboard=false
+show-keyboard=true
 # well, no nifty background right now
 # background=/tmp/test_bg.png