removing patch for fonts_alias, no longer needed

5 files changed, 69 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eab8d9334848..3128e4c8af83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cdesktopenv-git
 	pkgdesc = Common Desktop Environment
-	pkgver = 2.4.0.778.g2a988df4c
+	pkgver = 2.5.0.23.g3449ea676
 	pkgrel = 1
 	url = http://sourceforge.net/projects/cdesktopenv/
 	install = cdesktopenv.install
@@ -37,18 +37,16 @@ pkgbase = cdesktopenv-git
 	source = dtlogin.service
 	source = fonts.alias
 	source = fonts.dir
-	source = startxsession.sh
+	source = startcdesession.sh
 	source = cde.desktop
 	source = mksh.patch
-	source = fonts_alias.patch
 	sha512sums = SKIP
-	sha512sums = 1964e5150fa7e29905f19651834ff7c609a69a1a652b30350bb6c6f89aa282fd7b3057f4a025c8dabb3f0b5c98a2afe512e2a77a78893e9a935d5987bd954545
+	sha512sums = 25148b543e787394e1842c7c697ae684af0ac0bd5c0f50e53d456c1cf62a345346cd4a37e2c356f245f6c12acceedaba2f1ba463fd94b882619ee67d67af5cc5
 	sha512sums = a14176bc2b9e7cc163965fe1c53e12b3bee7e2ca47e91ec9508666f6a91576ae658ff009cf4f2c22dd06d98e3b098c90f5019896a6fa7fde6cf9810a805798a8
 	sha512sums = 69b740e1d8925f0dd2df09a206e3c36c1331af1617085610689067d1042a031b442fdeff502a36a895265abb4c1f899fa6ed2df6c60df8a60f8835e037c10067
 	sha512sums = a546d1300f49037a465ecec8bc1ebd07d57015a5ff1abfa1c94da9b30576933fb68e3898ff764d4de6e6741da822a7c93adc6e845806a266a63aa14c8bb09ebb
 	sha512sums = fdeea1adaf0de5da63e3cc8760893451e7ad1b2bb5c383f70208e3ac62e8fbce3092d6036e70ac46d4ccfb0a4884029cbf0088e58e56004bc9aeb7aa53983548
 	sha512sums = bc7e4f7430c6d939459faa97aac1f43c87c08828f751933b6f9247040e3eec8ea0194260b020e90e71ccb4d51198d403e7687155a87d3e9fb409a233bd768881
 	sha512sums = 4821925f902481bf59cda0f7a51b35c834c80f676e37608030e7cd64b1e18269cd7cbe1f37cffedd0f1205a6621f51c1b22293c959cffa3602bfdcdba82fd8f4
-	sha512sums = c7f34130a7d4881584bdf7592a218c8eb18f017e05e87b27020a170858fc5040e73806fcb2ad6fa37abc7114a431fc143400f79831a57aab35bac083e5158520
 
 pkgname = cdesktopenv-git
diff --git a/PKGBUILD b/PKGBUILD
index 3b4fc5e27a28..bae600b8f9a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer: Brian Cole <arch at brianEcole dot com>
+# Maintainer: Sidney Kuyateh <autinerd-arch at kuyateh dot eu>
+# Contributor: Brian Cole <arch at brianEcole dot com>
 # Contributor: Ecmel Ercan <ecmel dot ercan at gmail dot com>
 # Contributor: Vain <aurmaint1 on host: uninformativ dot de>
 # Contributor: BlindPenguin <ferdinand holzner at gmail dot com>
 
 _gitname=cdesktopenv
 pkgname="$_gitname"-git
-pkgver=2.4.0.778.g2a988df4c
+pkgver=2.5.0.23.g3449ea676
 pkgrel=1
 pkgdesc="Common Desktop Environment"
 url="http://sourceforge.net/projects/cdesktopenv/"
@@ -16,44 +17,40 @@ install="cdesktopenv.install"
 depends=(openmotif xbitmaps rpcbind mksh ncurses libxss xbitmaps libxinerama libutempter rpcsvc-proto xorg-mkfontdir xorg-bdftopcf xorg-xrdb libxpm libxaw)
 makedepends=(tcl ncompress bison)
 optdepends=('xorg-fonts-100dpi: additional fonts'
-            'cups: for printing support'
-            'xinetd: for rpc services')
+			'cups: for printing support'
+			'xinetd: for rpc services')
 conflicts=('cdesktopenv')
 backup=('etc/dt/config/xfonts/C/fonts.alias')
 source=("git+https://git.code.sf.net/p/cdesktopenv/code"
-        'cdesktopenv.install'
-        'dtlogin.service'
-        'fonts.alias'
-        'fonts.dir'
-        'startxsession.sh'
-        'cde.desktop'
-        'mksh.patch'
-        'fonts_alias.patch')
+		'cdesktopenv.install'
+		'dtlogin.service'
+		'fonts.alias'
+		'fonts.dir'
+		'startcdesession.sh'
+		'cde.desktop'
+		'mksh.patch')
 
 sha512sums=('SKIP'
-            '1964e5150fa7e29905f19651834ff7c609a69a1a652b30350bb6c6f89aa282fd7b3057f4a025c8dabb3f0b5c98a2afe512e2a77a78893e9a935d5987bd954545'
-            'a14176bc2b9e7cc163965fe1c53e12b3bee7e2ca47e91ec9508666f6a91576ae658ff009cf4f2c22dd06d98e3b098c90f5019896a6fa7fde6cf9810a805798a8'
-            '69b740e1d8925f0dd2df09a206e3c36c1331af1617085610689067d1042a031b442fdeff502a36a895265abb4c1f899fa6ed2df6c60df8a60f8835e037c10067'
-            'a546d1300f49037a465ecec8bc1ebd07d57015a5ff1abfa1c94da9b30576933fb68e3898ff764d4de6e6741da822a7c93adc6e845806a266a63aa14c8bb09ebb'
-            'fdeea1adaf0de5da63e3cc8760893451e7ad1b2bb5c383f70208e3ac62e8fbce3092d6036e70ac46d4ccfb0a4884029cbf0088e58e56004bc9aeb7aa53983548'
-            'bc7e4f7430c6d939459faa97aac1f43c87c08828f751933b6f9247040e3eec8ea0194260b020e90e71ccb4d51198d403e7687155a87d3e9fb409a233bd768881'
-            '4821925f902481bf59cda0f7a51b35c834c80f676e37608030e7cd64b1e18269cd7cbe1f37cffedd0f1205a6621f51c1b22293c959cffa3602bfdcdba82fd8f4'
-            'c7f34130a7d4881584bdf7592a218c8eb18f017e05e87b27020a170858fc5040e73806fcb2ad6fa37abc7114a431fc143400f79831a57aab35bac083e5158520')
+			'25148b543e787394e1842c7c697ae684af0ac0bd5c0f50e53d456c1cf62a345346cd4a37e2c356f245f6c12acceedaba2f1ba463fd94b882619ee67d67af5cc5'
+			'a14176bc2b9e7cc163965fe1c53e12b3bee7e2ca47e91ec9508666f6a91576ae658ff009cf4f2c22dd06d98e3b098c90f5019896a6fa7fde6cf9810a805798a8'
+			'69b740e1d8925f0dd2df09a206e3c36c1331af1617085610689067d1042a031b442fdeff502a36a895265abb4c1f899fa6ed2df6c60df8a60f8835e037c10067'
+			'a546d1300f49037a465ecec8bc1ebd07d57015a5ff1abfa1c94da9b30576933fb68e3898ff764d4de6e6741da822a7c93adc6e845806a266a63aa14c8bb09ebb'
+			'fdeea1adaf0de5da63e3cc8760893451e7ad1b2bb5c383f70208e3ac62e8fbce3092d6036e70ac46d4ccfb0a4884029cbf0088e58e56004bc9aeb7aa53983548'
+			'bc7e4f7430c6d939459faa97aac1f43c87c08828f751933b6f9247040e3eec8ea0194260b020e90e71ccb4d51198d403e7687155a87d3e9fb409a233bd768881'
+			'4821925f902481bf59cda0f7a51b35c834c80f676e37608030e7cd64b1e18269cd7cbe1f37cffedd0f1205a6621f51c1b22293c959cffa3602bfdcdba82fd8f4')
 
 pkgver() {
-    cd "$srcdir/code/cde"
-    git describe --long --tags | sed 's/-/./g'
+	cd "$srcdir/code/cde"
+	git describe --long --tags | sed 's/-/./g'
 }
 
 prepare() {
-  # Sets autoconf to accept mksh, which is much easier to build then the original ksh93
-  patch -p1 -i mksh.patch
-  # Bug in build where it tries to find a file in the /usr directory
-  patch -p1 -i fonts_alias.patch
+	# Sets autoconf to accept mksh, which is much easier to build then the original ksh93
+	patch -p1 -i mksh.patch
 }
 
 build() {
-    cd "$srcdir/code/cde"
+	cd "$srcdir/code/cde"
 	./autogen.sh
 	./configure --with-gnu-ld --prefix=/usr/dt
 	make LDFLAGS=-lm
@@ -61,52 +58,49 @@ build() {
 }
 
 package() {
+	cd "$srcdir/code/cde"
+	(
+		export LANG=C
+		export LC_ALL=C
+		make DESTDIR="$pkgdir" install
+	)
+	mkdir -p "$pkgdir/var/dt/"
+	cd "$pkgdir/var/dt"
 
-  cd "$srcdir/code/cde"
+	chmod 755 .
+	chown bin .
+	chgrp bin .
+	mkdir -p appconfig/appmanager
+	mkdir -p tmp
+	chmod -R 755 *
+	chown -R bin *
+	chgrp -R bin *
 
-  (
-    export LANG=C
-    export LC_ALL=C
-    make DESTDIR="$pkgdir" install
-  )
+	mkdir -p "$pkgdir/etc/dt/"
+	cd "$pkgdir/etc/dt/"
+	chmod 755 .
+	mkdir -p appconfig/appmanager/C
+	mkdir -p appconfig/help/C
+	mkdir -p appconfig/icons/C
+	mkdir -p appconfig/types/C
+	mkdir -p config/Xsession.d
+	mkdir -p config/xfonts/C
+	chmod -R 755 *
 
-  mkdir -p "$pkgdir/var/dt/"
-  cd "$pkgdir/var/dt"
+	chmod a+x $srcdir/startcdesession.sh
+	install -m644 "$srcdir"/fonts.{alias,dir} "$pkgdir/etc/dt/config/xfonts/C/"
+	
+	install -Dm644 "$srcdir/cde.desktop" \
+								 "$pkgdir/usr/share/xsessions/cde.desktop"
+	install -Dm644 "$srcdir/dtlogin.service" \
+								 "$pkgdir/usr/lib/systemd/system/dtlogin.service" 
 
-  chmod 755 .
-  chown bin .
-  chgrp bin .
-  mkdir -p appconfig/appmanager
-  mkdir -p tmp
-  chmod -R 755 *
-  chown -R bin *
-  chgrp -R bin *
-
-  mkdir -p "$pkgdir/etc/dt/"
-  cd "$pkgdir/etc/dt/"
-  chmod 755 .
-  mkdir -p appconfig/appmanager/C
-  mkdir -p appconfig/help/C
-  mkdir -p appconfig/icons/C
-  mkdir -p appconfig/types/C
-  mkdir -p config/Xsession.d
-  mkdir -p config/xfonts/C
-  chmod -R 755 *
-
-  chmod a+x $srcdir/startxsession.sh
-  install -m644 "$srcdir"/fonts.{alias,dir} "$pkgdir/etc/dt/config/xfonts/C/"
-  
-  install -Dm644 "$srcdir/cde.desktop" \
-                 "$pkgdir/usr/share/xsessions/cde.desktop"
-  install -Dm644 "$srcdir/dtlogin.service" \
-                 "$pkgdir/usr/lib/systemd/system/dtlogin.service" 
-
-  install -dm755 "$pkgdir/usr/spool"
-  install -dm755 "$pkgdir/var/spool/calendar"
-  install -Dm644 "$srcdir/code/cde/contrib/xinetd/cmsd" \
-                 "$pkgdir/etc/xinetd.d/cmsd"
-  install -Dm644 "$srcdir/code/cde/contrib/xinetd/ttdbserver" \
-                 "$pkgdir/etc/xinetd.d/ttdbserver"
-  install -Dm644 "$srcdir/startxsession.sh" \
-		 "$pkgdir/usr/bin/startxsession.sh"
+	install -dm755 "$pkgdir/usr/spool"
+	install -dm755 "$pkgdir/var/spool/calendar"
+	install -Dm644 "$srcdir/code/cde/contrib/xinetd/cmsd" \
+								 "$pkgdir/etc/xinetd.d/cmsd"
+	install -Dm644 "$srcdir/code/cde/contrib/xinetd/ttdbserver" \
+								 "$pkgdir/etc/xinetd.d/ttdbserver"
+	install -Dm644 "$srcdir/startcdesession.sh" \
+		 "$pkgdir/usr/bin/startcdesession.sh"
 }
diff --git a/cdesktopenv.install b/cdesktopenv.install
index 2625fafaa29e..0928f4c12281 100644
--- a/cdesktopenv.install
+++ b/cdesktopenv.install
@@ -2,10 +2,9 @@ post_install() {
 	echo "This package is probably insecure."
 	echo "CDE requires rpcbind.service to be running."
 	echo "To start dtlogin, first use systemctl to start rpcbind.service, and then start dtlogin.service"
+	echo "The start script is now called startcdesession.sh, to be more precise and having scripts for other desktop environments as well."
 }
 
 post_upgrade() {
 	post_install
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/fonts_alias.patch b/fonts_alias.patch
deleted file mode 100644
index 0e3118e9a541..000000000000
--- a/fonts_alias.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/code/cde/programs/fontaliases/Makefile.am
-+++ b/code/cde/programs/fontaliases/Makefile.am
-@@ -33,4 +33,4 @@ fonts.dir: dtinfo.pcf.gz
- 
- install-data-hook:
- 	$(MKDIR_P) $(DESTDIR)$(fontaliasesconfdir)
--	$(CP) $(fontaliasesdatadir)/$(FONTS_ALIAS) $(DESTDIR)$(fontaliasesconfdir)/fonts.alias
-+	$(CP) $(FONTS_ALIAS) $(DESTDIR)$(fontaliasesconfdir)/fonts.alias
diff --git a/startxsession.sh b/startcdesession.sh
index 6e74b6157ba7..6e74b6157ba7 100755
--- a/startxsession.sh
+++ b/startcdesession.sh