diff --git a/check-version.sh b/check-version.sh new file mode 100644 index 0000000..bfff622 --- /dev/null +++ b/check-version.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Github repository +REPO="sddm/sddm" + +# Get tag name using Github Rest API +TAG_NAME=$(curl -s -L -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/"$REPO"/releases/latest | jq -r '.tag_name') + +# Get version number from tag name +VERSION=$(echo "$TAG_NAME" | rev | cut -d'-' -f1 | rev) + +# Trim 'v' character in VERSION variable +VERSION=$(echo "$VERSION" | tr -d 'v') + +echo "$VERSION" diff --git a/pkg.info b/pkg.info index 475e174..961b54b 100644 --- a/pkg.info +++ b/pkg.info @@ -1,10 +1,11 @@ name: sddm description: QML based X11 and Wayland display manager version: 0.21.0 +revision: 2 url: https://github.com/sddm/sddm license: GPL2-only,CC-BY-3.0 architecture: any -depends: ["gcc","glibc","elogind","libxau","libxcb","pam","qt6-base","qt6-declarative","ttf-font","xorg-server","xorg-xauth"] +depends: ["gcc","glibc","elogind","libxau","libxcb","pam","qt6-base","qt6-declarative","sysusers","ttf-font","xorg-server","xorg-xauth"] make_depends: ["cmake","extra-cmake-modules","qt6-tools"] keep: ["etc/sddm.conf","usr/share/sddm/scripts/Xsetup","usr/share/sddm/scripts/Xstop"] type: source diff --git a/source-files/sddm.sh b/source-files/sddm.sh new file mode 100755 index 0000000..7ed0f0a --- /dev/null +++ b/source-files/sddm.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +if [ -x /usr/bin/elogind-inhibit ]; then + dbus-send --system --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.StartServiceByName string:org.freedesktop.login1 uint32:0 +fi + +exec sddm diff --git a/source-files/sysusers b/source-files/sysusers new file mode 100644 index 0000000..e56e07d --- /dev/null +++ b/source-files/sysusers @@ -0,0 +1,2 @@ +u sddm - "Simple Desktop Display Manager" /var/lib/sddm +m sddm video diff --git a/source.sh b/source.sh index 578909a..701abd9 100644 --- a/source.sh +++ b/source.sh @@ -18,17 +18,17 @@ build() { mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_BUILD_TYPE=Release \ - -DENABLE_JOURNALD=OFF \ - -DNO_SYSTEMD=ON \ - -DUSE_ELOGIND=ON \ - -D RUNTIME_DIR=/run/sddm \ - -D BUILD_MAN_PAGES=OFF \ - -D BUILD_WITH_QT6=ON \ - -D DATA_INSTALL_DIR=/usr/share/sddm \ - -D DBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \ - .. + cmake -D CMAKE_POLICY_VERSION_MINIMUM='3.5' \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_BUILD_TYPE=Release \ + -DENABLE_JOURNALD=OFF \ + -DNO_SYSTEMD=ON \ + -DUSE_ELOGIND=ON \ + -D RUNTIME_DIR=/run/sddm \ + -D BUILD_MAN_PAGES=OFF \ + -D BUILD_WITH_QT6=ON \ + -D DATA_INSTALL_DIR=/usr/share/sddm \ + -D DBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf .. make } @@ -52,8 +52,12 @@ package() { # Disable virtual keyboard sed -i 's/qtvirtualkeyboard//' "$BPM_OUTPUT"/etc/sddm.conf + # Install sysusers file + install -Dm644 "$BPM_WORKDIR"/sysusers "$BPM_OUTPUT"/usr/lib/sysusers.d/sddm.conf + # Install esvm service - install -Dm644 "$BPM_WORKDIR"/sddm.esv "$BPM_OUTPUT"/etc/esvm/services/sddm.esv + install -Dm644 "$BPM_WORKDIR"/sddm.esv "$BPM_OUTPUT"/etc/esvm/services/sddm.esv + install -Dm755 "$BPM_WORKDIR"/sddm.sh "$BPM_OUTPUT"/etc/esvm/scripts/sddm.sh install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/sddm/LICENSE install -Dm644 "$BPM_SOURCE"/LICENSE.CC-BY-3.0 "$BPM_OUTPUT"/usr/share/licenses/sddm/LICENSE.CC-BY-3.0