From e712dface9ff76234cfb23dbd76be29e649c293a Mon Sep 17 00:00:00 2001
From: Maarten van Gompel <proycon@anaproy.nl>
Date: Sat, 5 Dec 2020 14:03:01 +0100
Subject: [PATCH] sxmo/sxmo-xdm: removed, replaced by new sxmo-xdm-config (MR
1789)
---
sxmo/sxmo-xdm/APKBUILD | 64 ----------------------------
sxmo/sxmo-xdm/GiveConsole | 10 -----
sxmo/sxmo-xdm/Xsession | 2 -
sxmo/sxmo-xdm/Xsetup_0 | 4 --
sxmo/sxmo-xdm/sxmo-xdm.post-install | 2 -
sxmo/sxmo-xdm/sxmo-xdm.pre-deinstall | 2 -
sxmo/sxmo-xdm/xdm.confd | 1 -
sxmo/sxmo-xdm/xdm.initd | 16 -------
8 files changed, 101 deletions(-)
delete mode 100644 sxmo/sxmo-xdm/APKBUILD
delete mode 100644 sxmo/sxmo-xdm/GiveConsole
delete mode 100644 sxmo/sxmo-xdm/Xsession
delete mode 100644 sxmo/sxmo-xdm/Xsetup_0
delete mode 100644 sxmo/sxmo-xdm/sxmo-xdm.post-install
delete mode 100644 sxmo/sxmo-xdm/sxmo-xdm.pre-deinstall
delete mode 100644 sxmo/sxmo-xdm/xdm.confd
delete mode 100644 sxmo/sxmo-xdm/xdm.initd
diff --git a/sxmo/sxmo-xdm/APKBUILD b/sxmo/sxmo-xdm/APKBUILD
deleted file mode 100644
index 97a0bc5dcfd..00000000000
--- a/sxmo/sxmo-xdm/APKBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Miles Alan <m@milesalan.com>
-pkgname=sxmo-xdm
-pkgver=1.1.12
-pkgrel=0
-pkgdesc="X Display Manager fork for Sxmo; starts with virtual keyboard and launches Sxmo UI"
-options="!check" # No testsuite
-url="http://xorg.freedesktop.org/"
-arch="all"
-license="MIT"
-depends="xorg-server sessreg sxmo-utils sxmo-svkbd"
-makedepends="linux-pam-dev libxmu-dev libxaw-dev libxft libxft-dev"
-subpackages="$pkgname-doc"
-source="
- $url/releases/individual/app/xdm-1.1.12.tar.bz2
- xdm.initd
- xdm.confd
- Xsession
- Xsetup_0
- GiveConsole
-"
-install="$pkgname.post-install $pkgname.pre-deinstall"
-provides="xdm"
-
-build() {
- cd xdm-$pkgver
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var \
- --enable-ipv6 \
- --with-xdmconfigdir=/etc/X11/xdm \
- --with-pam \
- --with-xft
- make
-}
-
-package() {
- cd $srcdir/xdm-$pkgver && make DESTDIR="$pkgdir" install
- install -Dm755 "$srcdir"/xdm.initd "$pkgdir"/etc/init.d/xdm
- install -Dm644 "$srcdir"/xdm.confd "$pkgdir"/etc/conf.d/xdm
- install -Dm755 "$srcdir"/Xsession "$pkgdir"/usr/lib/X11/xdm/
- install -Dm755 "$srcdir"/GiveConsole "$pkgdir"/usr/lib/X11/xdm/
- install -Dm755 "$srcdir"/Xsetup_0 "$pkgdir"/usr/lib/X11/xdm/
-
- # E.g. hide the cursor for Xorg
- echo ":0 local /usr/bin/X -nocursor :0" >> "$pkgdir/etc/X11/xdm/Xservers"
-
- echo "xlogin*logoPadding: 20" >> "$pkgdir/etc/X11/xdm/Xresources"
- echo "xlogin*geometry: 550x300+100+400" >> "$pkgdir/etc/X11/xdm/Xresources"
- echo "xlogin*greeting: Sxmo" >> "$pkgdir/etc/X11/xdm/Xresources"
- echo "xlogin*greetFace: Monospace:bold:size=20" >> "$pkgdir/etc/X11/xdm/Xresources"
- echo "xlogin*face: Monospace:size=15:italic" >> "$pkgdir/etc/X11/xdm/Xresources"
- echo "xlogin*promptFace: Monospace:size=15:bold" >> "$pkgdir/etc/X11/xdm/Xresources"
- echo "xlogin*failFace: Monospace:size=15" >> "$pkgdir/etc/X11/xdm/Xresources"
-}
-
-sha512sums="1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb xdm-1.1.12.tar.bz2
-24f0c8dd71db73df34b3f59709e6cfb3ef58c18b7baa0fee83eac943fc6faa2e77e1e95351dfc1687534f52c9cd84cf2033d745502745422e7fae9c2cb52f43b xdm.initd
-36a442c9d82445217a6a7eca21a1f64636bf7b9cb920bed7b24fd808a4d1e60d9a09af7024fb84218b3c9c499e7b9067e8f8e4cba23928cf9fff63139ea5960b xdm.confd
-c07672dd079bb3840ec5777c46aaa1a86aca9ad1be5193ced4fa00521dc32aeb6c50817c800863b9296c5f21399cc4805dcbf02963709db8c62ff27494ad241c Xsession
-02c45b2776a1b64a2191c870b9c80d37983feb8979c97ac94ba65e1e0556e01687ca9f463334d2d435d38ca2ff05fc1a848fd3625e16828409887037e8988b4c Xsetup_0
-eeccc1384559166972a6cff2687418423422cb4b7be8f45296db1e78aa727d290e527703ed0236e109bd3d8687c5da1ec502b7245c6228f7860c0336c7f47500 GiveConsole"
diff --git a/sxmo/sxmo-xdm/GiveConsole b/sxmo/sxmo-xdm/GiveConsole
deleted file mode 100644
index 58965cfc54d..00000000000
--- a/sxmo/sxmo-xdm/GiveConsole
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Assign ownership of the console to the invoking user
-#
-# By convention, both xconsole and xterm -C check that the
-# console is owned by the invoking user and is readable before attaching
-# the console output. This way a random user can invoke xterm -C without
-# causing serious grief.
-#
-pkill -9 svkbd-sxmo
-chown $USER /dev/console
diff --git a/sxmo/sxmo-xdm/Xsession b/sxmo/sxmo-xdm/Xsession
deleted file mode 100644
index f5447f10e7a..00000000000
--- a/sxmo/sxmo-xdm/Xsession
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/sxmo_xinit.sh
diff --git a/sxmo/sxmo-xdm/Xsetup_0 b/sxmo/sxmo-xdm/Xsetup_0
deleted file mode 100644
index 2bdb8699154..00000000000
--- a/sxmo/sxmo-xdm/Xsetup_0
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-xsetroot -mod 29 29 -fg '#e8e8e8' -bg '#ffffff'
-svkbd-sxmo &
-xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail
diff --git a/sxmo/sxmo-xdm/sxmo-xdm.post-install b/sxmo/sxmo-xdm/sxmo-xdm.post-install
deleted file mode 100644
index 562d60a9979..00000000000
--- a/sxmo/sxmo-xdm/sxmo-xdm.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rc-update add xdm default
diff --git a/sxmo/sxmo-xdm/sxmo-xdm.pre-deinstall b/sxmo/sxmo-xdm/sxmo-xdm.pre-deinstall
deleted file mode 100644
index 11ec525b60e..00000000000
--- a/sxmo/sxmo-xdm/sxmo-xdm.pre-deinstall
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rc-update del xdm
diff --git a/sxmo/sxmo-xdm/xdm.confd b/sxmo/sxmo-xdm/xdm.confd
deleted file mode 100644
index 395f0edcdea..00000000000
--- a/sxmo/sxmo-xdm/xdm.confd
+++ /dev/null
@@ -1 +0,0 @@
-xdm_opts=""
\ No newline at end of file
diff --git a/sxmo/sxmo-xdm/xdm.initd b/sxmo/sxmo-xdm/xdm.initd
deleted file mode 100644
index abccc8456f9..00000000000
--- a/sxmo/sxmo-xdm/xdm.initd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-
-supervisor=supervise-daemon
-
-name="Display Manager"
-description="X Display Manager"
-
-command=/usr/bin/xdm
-command_args="${xdm_opts}"
-command_args_foreground="-nodaemon"
-
-depends() {
- needs localmount
-}
-
-# uses the openrc templates for start()/stop()
--
GitLab