Tue Sep 6 23:14:33 UTC 2011

6 files changed, 103 insertions, 5 deletions

diff --git a/testing/xf86-input-synaptics/PKGBUILD b/testing/xf86-input-synaptics/PKGBUILD
index f0a8ad31c..fb9b5836b 100644
--- a/testing/xf86-input-synaptics/PKGBUILD
+++ b/testing/xf86-input-synaptics/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 136561 2011-08-30 08:46:01Z jgc $
+# $Id: PKGBUILD 137001 2011-09-05 05:55:06Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-input-synaptics
-pkgver=1.4.1
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="Synaptics driver for notebook touchpads"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxtst')
@@ -22,7 +22,7 @@ options=(!libtool)
 backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         10-synaptics.conf)
-sha1sums=('e41201476f4bc8658291808d2d6ef2e0535179ae'
+sha1sums=('7373c1e3f02bf7e18f71b65762a982d907b4a053'
           '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
 
 build() {
@@ -30,6 +30,7 @@ build() {
   ./configure --prefix=/usr
   make
 }
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
diff --git a/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff b/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff
new file mode 100644
index 000000000..99e8a6754
--- /dev/null
+++ b/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff
@@ -0,0 +1,20 @@
+Move startx auth files in /tmp so they are removed on reboot.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xinit/startx.cpp
+===================================================================
+--- xinit.orig/startx.cpp
++++ xinit/startx.cpp
+@@ -273,7 +273,7 @@
+     dummy=0
+ 
+     XCOMM create a file with auth information for the server. ':0' is a dummy.
+-    xserverauthfile=$HOME/.serverauth.$$
++    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
+     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
+     xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
diff --git a/testing/xorg-xinit/PKGBUILD b/testing/xorg-xinit/PKGBUILD
new file mode 100644
index 000000000..9328da501
--- /dev/null
+++ b/testing/xorg-xinit/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id: PKGBUILD 137005 2011-09-05 06:01:09Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
+pkgname=xorg-xinit
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth')
+makedepends=('xorg-util-macros')
+optdepends=('xorg-twm' 'xterm')
+backup=('etc/skel/.xinitrc'
+        'etc/skel/.xsession'
+        'etc/X11/xinit/xserverrc'
+        'etc/X11/xinit/xinitrc')
+source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
+        06_move_serverauthfile_into_tmp.diff
+        xinitrc
+        xsession
+        xserverrc)
+options=(!emptydirs)
+md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
+         'abd072ec435ce084cf4e89c58f83d45c'
+         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
+         '7873d97db30d6c279ed37e3559e7c59d'
+         'c5baef10fdb7239594daee72a94ddab3')
+
+build() {
+  cd "${srcdir}/xinit-${pkgver}"
+  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
+  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+  make
+}
+
+package() {
+  cd "${srcdir}/xinit-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/etc/skel"
+  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
+  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
+  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/testing/xorg-xinit/xinitrc b/testing/xorg-xinit/xinitrc
new file mode 100644
index 000000000..dbd080d00
--- /dev/null
+++ b/testing/xorg-xinit/xinitrc
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/*; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+# ...or the Window Manager of your choice
diff --git a/testing/xorg-xinit/xserverrc b/testing/xorg-xinit/xserverrc
new file mode 100644
index 000000000..6f746cdce
--- /dev/null
+++ b/testing/xorg-xinit/xserverrc
@@ -0,0 +1 @@
+exec /usr/bin/X -nolisten tcp "$@"
diff --git a/testing/xorg-xinit/xsession b/testing/xorg-xinit/xsession
new file mode 100644
index 000000000..a16dc0b84
--- /dev/null
+++ b/testing/xorg-xinit/xsession
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/bash --login -i ~/.xinitrc
+