[arch-commits] Commit in xorg-xinit/repos (11 files)
Jan de Groot
jgc at archlinux.org
Tue Oct 11 21:27:58 UTC 2011
Date: Tuesday, October 11, 2011 @ 17:27:57
Author: jgc
Revision: 140273
db-move: moved xorg-xinit from [testing] to [extra] (x86_64)
Added:
xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff
(from rev 140271, xorg-xinit/repos/testing-x86_64/06_move_serverauthfile_into_tmp.diff)
xorg-xinit/repos/extra-x86_64/PKGBUILD
(from rev 140271, xorg-xinit/repos/testing-x86_64/PKGBUILD)
xorg-xinit/repos/extra-x86_64/xinitrc
(from rev 140271, xorg-xinit/repos/testing-x86_64/xinitrc)
xorg-xinit/repos/extra-x86_64/xserverrc
(from rev 140271, xorg-xinit/repos/testing-x86_64/xserverrc)
xorg-xinit/repos/extra-x86_64/xsession
(from rev 140271, xorg-xinit/repos/testing-x86_64/xsession)
Deleted:
xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff
xorg-xinit/repos/extra-x86_64/PKGBUILD
xorg-xinit/repos/extra-x86_64/xinitrc
xorg-xinit/repos/extra-x86_64/xserverrc
xorg-xinit/repos/extra-x86_64/xsession
xorg-xinit/repos/testing-x86_64/
--------------------------------------+
06_move_serverauthfile_into_tmp.diff | 40 ++++++-------
PKGBUILD | 98 ++++++++++++++++-----------------
xinitrc | 34 +++++------
xserverrc | 2
xsession | 20 +++---
5 files changed, 97 insertions(+), 97 deletions(-)
Deleted: extra-x86_64/06_move_serverauthfile_into_tmp.diff
===================================================================
--- extra-x86_64/06_move_serverauthfile_into_tmp.diff 2011-10-11 21:27:56 UTC (rev 140272)
+++ extra-x86_64/06_move_serverauthfile_into_tmp.diff 2011-10-11 21:27:57 UTC (rev 140273)
@@ -1,20 +0,0 @@
-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
Copied: xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff (from rev 140271, xorg-xinit/repos/testing-x86_64/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- extra-x86_64/06_move_serverauthfile_into_tmp.diff (rev 0)
+++ extra-x86_64/06_move_serverauthfile_into_tmp.diff 2011-10-11 21:27:57 UTC (rev 140273)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-10-11 21:27:56 UTC (rev 140272)
+++ extra-x86_64/PKGBUILD 2011-10-11 21:27:57 UTC (rev 140273)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xorg-xinit
-pkgver=1.3.0
-pkgrel=3
-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=('bc4e8b7d1919597cc37a0d24aa149dda'
- '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}/"
-}
Copied: xorg-xinit/repos/extra-x86_64/PKGBUILD (from rev 140271, xorg-xinit/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-11 21:27:57 UTC (rev 140273)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at 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}/"
+}
Deleted: extra-x86_64/xinitrc
===================================================================
--- extra-x86_64/xinitrc 2011-10-11 21:27:56 UTC (rev 140272)
+++ extra-x86_64/xinitrc 2011-10-11 21:27:57 UTC (rev 140273)
@@ -1,17 +0,0 @@
-#!/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
Copied: xorg-xinit/repos/extra-x86_64/xinitrc (from rev 140271, xorg-xinit/repos/testing-x86_64/xinitrc)
===================================================================
--- extra-x86_64/xinitrc (rev 0)
+++ extra-x86_64/xinitrc 2011-10-11 21:27:57 UTC (rev 140273)
@@ -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
Deleted: extra-x86_64/xserverrc
===================================================================
--- extra-x86_64/xserverrc 2011-10-11 21:27:56 UTC (rev 140272)
+++ extra-x86_64/xserverrc 2011-10-11 21:27:57 UTC (rev 140273)
@@ -1 +0,0 @@
-exec /usr/bin/X -nolisten tcp "$@"
Copied: xorg-xinit/repos/extra-x86_64/xserverrc (from rev 140271, xorg-xinit/repos/testing-x86_64/xserverrc)
===================================================================
--- extra-x86_64/xserverrc (rev 0)
+++ extra-x86_64/xserverrc 2011-10-11 21:27:57 UTC (rev 140273)
@@ -0,0 +1 @@
+exec /usr/bin/X -nolisten tcp "$@"
Deleted: extra-x86_64/xsession
===================================================================
--- extra-x86_64/xsession 2011-10-11 21:27:56 UTC (rev 140272)
+++ extra-x86_64/xsession 2011-10-11 21:27:57 UTC (rev 140273)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
Copied: xorg-xinit/repos/extra-x86_64/xsession (from rev 140271, xorg-xinit/repos/testing-x86_64/xsession)
===================================================================
--- extra-x86_64/xsession (rev 0)
+++ extra-x86_64/xsession 2011-10-11 21:27:57 UTC (rev 140273)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/bash --login -i ~/.xinitrc
+
More information about the arch-commits
mailing list