[arch-commits] Commit in xorg-xinit/repos (28 files)
Jan de Groot
jgc at nymeria.archlinux.org
Mon Dec 9 12:20:23 UTC 2013
Date: Monday, December 9, 2013 @ 13:20:22
Author: jgc
Revision: 201357
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff
(from rev 201356, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
xorg-xinit/repos/extra-i686/PKGBUILD
(from rev 201356, xorg-xinit/trunk/PKGBUILD)
xorg-xinit/repos/extra-i686/cpp-4.8-compat.patch
(from rev 201356, xorg-xinit/trunk/cpp-4.8-compat.patch)
xorg-xinit/repos/extra-i686/fix-globals-shadowing.patch
(from rev 201356, xorg-xinit/trunk/fix-globals-shadowing.patch)
xorg-xinit/repos/extra-i686/fs25361.patch
(from rev 201356, xorg-xinit/trunk/fs25361.patch)
xorg-xinit/repos/extra-i686/xinitrc
(from rev 201356, xorg-xinit/trunk/xinitrc)
xorg-xinit/repos/extra-i686/xserverrc
(from rev 201356, xorg-xinit/trunk/xserverrc)
xorg-xinit/repos/extra-i686/xsession
(from rev 201356, xorg-xinit/trunk/xsession)
xorg-xinit/repos/extra-x86_64/06_move_serverauthfile_into_tmp.diff
(from rev 201356, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
xorg-xinit/repos/extra-x86_64/PKGBUILD
(from rev 201356, xorg-xinit/trunk/PKGBUILD)
xorg-xinit/repos/extra-x86_64/cpp-4.8-compat.patch
(from rev 201356, xorg-xinit/trunk/cpp-4.8-compat.patch)
xorg-xinit/repos/extra-x86_64/fix-globals-shadowing.patch
(from rev 201356, xorg-xinit/trunk/fix-globals-shadowing.patch)
xorg-xinit/repos/extra-x86_64/fs25361.patch
(from rev 201356, xorg-xinit/trunk/fs25361.patch)
xorg-xinit/repos/extra-x86_64/xinitrc
(from rev 201356, xorg-xinit/trunk/xinitrc)
xorg-xinit/repos/extra-x86_64/xserverrc
(from rev 201356, xorg-xinit/trunk/xserverrc)
xorg-xinit/repos/extra-x86_64/xsession
(from rev 201356, xorg-xinit/trunk/xsession)
Deleted:
xorg-xinit/repos/extra-i686/06_move_serverauthfile_into_tmp.diff
xorg-xinit/repos/extra-i686/PKGBUILD
xorg-xinit/repos/extra-i686/fs25361.patch
xorg-xinit/repos/extra-i686/xinitrc
xorg-xinit/repos/extra-i686/xserverrc
xorg-xinit/repos/extra-i686/xsession
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/fs25361.patch
xorg-xinit/repos/extra-x86_64/xinitrc
xorg-xinit/repos/extra-x86_64/xserverrc
xorg-xinit/repos/extra-x86_64/xsession
---------------------------------------------------+
/06_move_serverauthfile_into_tmp.diff | 40 ++++++
/PKGBUILD | 126 ++++++++++++++++++++
/fs25361.patch | 32 +++++
/xinitrc | 34 +++++
/xserverrc | 12 +
/xsession | 20 +++
extra-i686/06_move_serverauthfile_into_tmp.diff | 20 ---
extra-i686/PKGBUILD | 61 ---------
extra-i686/cpp-4.8-compat.patch | 22 +++
extra-i686/fix-globals-shadowing.patch | 58 +++++++++
extra-i686/fs25361.patch | 16 --
extra-i686/xinitrc | 17 --
extra-i686/xserverrc | 6
extra-i686/xsession | 10 -
extra-x86_64/06_move_serverauthfile_into_tmp.diff | 20 ---
extra-x86_64/PKGBUILD | 61 ---------
extra-x86_64/cpp-4.8-compat.patch | 22 +++
extra-x86_64/fix-globals-shadowing.patch | 58 +++++++++
extra-x86_64/fs25361.patch | 16 --
extra-x86_64/xinitrc | 17 --
extra-x86_64/xserverrc | 6
extra-x86_64/xsession | 10 -
22 files changed, 424 insertions(+), 260 deletions(-)
Deleted: extra-i686/06_move_serverauthfile_into_tmp.diff
===================================================================
--- extra-i686/06_move_serverauthfile_into_tmp.diff 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-i686/06_move_serverauthfile_into_tmp.diff 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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-i686/06_move_serverauthfile_into_tmp.diff (from rev 201356, xorg-xinit/trunk/06_move_serverauthfile_into_tmp.diff)
===================================================================
--- extra-i686/06_move_serverauthfile_into_tmp.diff (rev 0)
+++ extra-i686/06_move_serverauthfile_into_tmp.diff 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-i686/PKGBUILD 2013-12-09 12:20:22 UTC (rev 201357)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xorg-xinit
-pkgver=1.3.3
-pkgrel=2
-pkgdesc="X.Org initialisation program "
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth' 'inetutils')
-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
- fs25361.patch
- xinitrc
- xsession
- xserverrc)
-options=(!emptydirs)
-sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
- 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
- '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
- '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
- '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
- '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
-
-prepare() {
- cd xinit-${pkgver}
- patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
- patch -Np1 -i "${srcdir}/fs25361.patch"
- sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
-}
-
-build() {
- cd xinit-${pkgver}
- ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
- make
-}
-
-package() {
- cd 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}/"
-
- # a workaround for https://bugs.archlinux.org/task/36959
- sed -i '/^\s*$/d' $pkgdir/usr/bin/startx
- sed -i '/^\s*$/d' $pkgdir/etc/X11/xinit/xinitrc
-
-}
Copied: xorg-xinit/repos/extra-i686/PKGBUILD (from rev 201356, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xorg-xinit
+pkgver=1.3.3
+pkgrel=3
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth' 'inetutils')
+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
+ fs25361.patch
+ xinitrc
+ xsession
+ xserverrc
+ cpp-4.8-compat.patch
+ fix-globals-shadowing.patch)
+options=(!emptydirs)
+sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
+ 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
+ '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+ '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
+ '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
+ '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f'
+ '194104efba9bcbf8ec0bd9ac1b145017d459b734afbc8bbfc37e361efd467a96'
+ '6491c96dd0e98b6f5a45c4f0183eabcf2fb54728c81e793910c19d4107606bb1')
+
+prepare() {
+ cd xinit-${pkgver}
+ patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
+ patch -Np1 -i ../fs25361.patch
+ patch -Np1 -i ../cpp-4.8-compat.patch
+ patch -Np1 -i ../fix-globals-shadowing.patch
+ sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+}
+
+build() {
+ cd xinit-${pkgver}
+ autoreconf -fi
+ ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+ make
+}
+
+package() {
+ cd 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-i686/cpp-4.8-compat.patch (from rev 201356, xorg-xinit/trunk/cpp-4.8-compat.patch)
===================================================================
--- extra-i686/cpp-4.8-compat.patch (rev 0)
+++ extra-i686/cpp-4.8-compat.patch 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,22 @@
+From 463b85fcf51d8ff5886ebe1f3481e5cb4d603436 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith at oracle.com>
+Date: Sat, 23 Nov 2013 07:03:39 +0000
+Subject: Pass files to cpp via CLI arg instead of stdin to workaround gcc 4.8 change
+
+Fixes Bug 69439 - Empty lines before #!/bin/sh in startx
+https://bugs.freedesktop.org/show_bug.cgi?id=69439
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
+---
+diff --git a/cpprules.in b/cpprules.in
+index eaea428..0931bee 100644
+--- a/cpprules.in
++++ b/cpprules.in
+@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
+ SUFFIXES = .cpp
+
+ .cpp:
+- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
+--
+cgit v0.9.0.2-2-gbebe
Copied: xorg-xinit/repos/extra-i686/fix-globals-shadowing.patch (from rev 201356, xorg-xinit/trunk/fix-globals-shadowing.patch)
===================================================================
--- extra-i686/fix-globals-shadowing.patch (rev 0)
+++ extra-i686/fix-globals-shadowing.patch 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,58 @@
+From 182920f156c87715d91b2f64b8781a0072af996e Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith at oracle.com>
+Date: Sun, 08 Sep 2013 16:48:50 +0000
+Subject: Fix warnings about parameters to startServer & startClient shadowing globals
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
+---
+diff --git a/xinit.c b/xinit.c
+index 18e3e10..1b04911 100644
+--- a/xinit.c
++++ b/xinit.c
+@@ -390,7 +390,7 @@ processTimeout(int timeout, const char *string)
+ }
+
+ static pid_t
+-startServer(char *server[])
++startServer(char *server_argv[])
+ {
+ sigset_t mask, old;
+ const char * const *cpp;
+@@ -422,12 +422,12 @@ startServer(char *server[])
+ * if client is xterm -L
+ */
+ setpgid(0,getpid());
+- Execute(server);
++ Execute(server_argv);
+
+- Error("unable to run server \"%s\"", server[0]);
++ Error("unable to run server \"%s\"", server_argv[0]);
+
+ fprintf(stderr, "Use the -- option, or make sure that %s is in your path and\n", bindir);
+- fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server[0]);
++ fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server_argv[0]);
+ fprintf(stderr, "for your display. Possible server names include:\n\n");
+ for (cpp = server_names; *cpp; cpp++)
+ fprintf(stderr, " %s\n", *cpp);
+@@ -556,7 +556,7 @@ setWindowPath(void)
+ }
+
+ static pid_t
+-startClient(char *client[])
++startClient(char *client_argv[])
+ {
+ clientpid = fork();
+ if (clientpid == 0) {
+@@ -568,8 +568,8 @@ startClient(char *client[])
+ _exit(EXIT_FAILURE);
+ }
+ setpgid(0, getpid());
+- Execute(client);
+- Error("Unable to run program \"%s\"", client[0]);
++ Execute(client_argv);
++ Error("Unable to run program \"%s\"", client_argv[0]);
+
+ fprintf(stderr, "Specify a program on the command line or make sure that %s\n", bindir);
+ fprintf(stderr, "is in your path.\n\n");
+--
+cgit v0.9.0.2-2-gbebe
Deleted: extra-i686/fs25361.patch
===================================================================
--- extra-i686/fs25361.patch 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-i686/fs25361.patch 2013-12-09 12:20:22 UTC (rev 201357)
@@ -1,16 +0,0 @@
-Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
-diff -u xinit.orig/startx.cpp xinit/startx.cpp
---- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
-+++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
-@@ -290,9 +290,9 @@
- XCOMM now add the same credentials to the client authority file
- XCOMM if '$displayname' already exists do not overwrite it as another
- XCOMM server man need it. Add them to the '$xserverauthfile' instead.
-- for displayname in $authdisplay $hostname$authdisplay; do
-+ for displayname in $authdisplay $hostname/unix$authdisplay; do
- authcookie=`XAUTH list "$displayname" @@
-- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
-+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
- if [ "z${authcookie}" = "z" ] ; then
- XAUTH -q << EOF
- add $displayname . $mcookie
Copied: xorg-xinit/repos/extra-i686/fs25361.patch (from rev 201356, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- extra-i686/fs25361.patch (rev 0)
+++ extra-i686/fs25361.patch 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,16 @@
+Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
++++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
+@@ -290,9 +290,9 @@
+ XCOMM now add the same credentials to the client authority file
+ XCOMM if '$displayname' already exists do not overwrite it as another
+ XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+- for displayname in $authdisplay $hostname$authdisplay; do
++ for displayname in $authdisplay $hostname/unix$authdisplay; do
+ authcookie=`XAUTH list "$displayname" @@
+- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
++ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
+ if [ "z${authcookie}" = "z" ] ; then
+ XAUTH -q << EOF
+ add $displayname . $mcookie
Deleted: extra-i686/xinitrc
===================================================================
--- extra-i686/xinitrc 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-i686/xinitrc 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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-i686/xinitrc (from rev 201356, xorg-xinit/trunk/xinitrc)
===================================================================
--- extra-i686/xinitrc (rev 0)
+++ extra-i686/xinitrc 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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-i686/xserverrc
===================================================================
--- extra-i686/xserverrc 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-i686/xserverrc 2013-12-09 12:20:22 UTC (rev 201357)
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ -z "$XDG_VTNR" ]; then
- exec /usr/bin/X -nolisten tcp "$@"
-else
- exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
-fi
Copied: xorg-xinit/repos/extra-i686/xserverrc (from rev 201356, xorg-xinit/trunk/xserverrc)
===================================================================
--- extra-i686/xserverrc (rev 0)
+++ extra-i686/xserverrc 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+ exec /usr/bin/X -nolisten tcp "$@"
+else
+ exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi
Deleted: extra-i686/xsession
===================================================================
--- extra-i686/xsession 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-i686/xsession 2013-12-09 12:20:22 UTC (rev 201357)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
Copied: xorg-xinit/repos/extra-i686/xsession (from rev 201356, xorg-xinit/trunk/xsession)
===================================================================
--- extra-i686/xsession (rev 0)
+++ extra-i686/xsession 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/bash --login -i ~/.xinitrc
+
Deleted: extra-x86_64/06_move_serverauthfile_into_tmp.diff
===================================================================
--- extra-x86_64/06_move_serverauthfile_into_tmp.diff 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-x86_64/06_move_serverauthfile_into_tmp.diff 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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 201356, xorg-xinit/trunk/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 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-x86_64/PKGBUILD 2013-12-09 12:20:22 UTC (rev 201357)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-
-pkgname=xorg-xinit
-pkgver=1.3.3
-pkgrel=2
-pkgdesc="X.Org initialisation program "
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth' 'inetutils')
-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
- fs25361.patch
- xinitrc
- xsession
- xserverrc)
-options=(!emptydirs)
-sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
- 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
- '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
- '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
- '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
- '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
-
-prepare() {
- cd xinit-${pkgver}
- patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
- patch -Np1 -i "${srcdir}/fs25361.patch"
- sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
-}
-
-build() {
- cd xinit-${pkgver}
- ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
- make
-}
-
-package() {
- cd 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}/"
-
- # a workaround for https://bugs.archlinux.org/task/36959
- sed -i '/^\s*$/d' $pkgdir/usr/bin/startx
- sed -i '/^\s*$/d' $pkgdir/etc/X11/xinit/xinitrc
-
-}
Copied: xorg-xinit/repos/extra-x86_64/PKGBUILD (from rev 201356, xorg-xinit/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xorg-xinit
+pkgver=1.3.3
+pkgrel=3
+pkgdesc="X.Org initialisation program "
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libx11' 'xorg-xauth' 'inetutils')
+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
+ fs25361.patch
+ xinitrc
+ xsession
+ xserverrc
+ cpp-4.8-compat.patch
+ fix-globals-shadowing.patch)
+options=(!emptydirs)
+sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
+ 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
+ '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
+ '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
+ '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
+ '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f'
+ '194104efba9bcbf8ec0bd9ac1b145017d459b734afbc8bbfc37e361efd467a96'
+ '6491c96dd0e98b6f5a45c4f0183eabcf2fb54728c81e793910c19d4107606bb1')
+
+prepare() {
+ cd xinit-${pkgver}
+ patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
+ patch -Np1 -i ../fs25361.patch
+ patch -Np1 -i ../cpp-4.8-compat.patch
+ patch -Np1 -i ../fix-globals-shadowing.patch
+ sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+}
+
+build() {
+ cd xinit-${pkgver}
+ autoreconf -fi
+ ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
+ make
+}
+
+package() {
+ cd 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/cpp-4.8-compat.patch (from rev 201356, xorg-xinit/trunk/cpp-4.8-compat.patch)
===================================================================
--- extra-x86_64/cpp-4.8-compat.patch (rev 0)
+++ extra-x86_64/cpp-4.8-compat.patch 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,22 @@
+From 463b85fcf51d8ff5886ebe1f3481e5cb4d603436 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith at oracle.com>
+Date: Sat, 23 Nov 2013 07:03:39 +0000
+Subject: Pass files to cpp via CLI arg instead of stdin to workaround gcc 4.8 change
+
+Fixes Bug 69439 - Empty lines before #!/bin/sh in startx
+https://bugs.freedesktop.org/show_bug.cgi?id=69439
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
+---
+diff --git a/cpprules.in b/cpprules.in
+index eaea428..0931bee 100644
+--- a/cpprules.in
++++ b/cpprules.in
+@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
+ SUFFIXES = .cpp
+
+ .cpp:
+- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
+--
+cgit v0.9.0.2-2-gbebe
Copied: xorg-xinit/repos/extra-x86_64/fix-globals-shadowing.patch (from rev 201356, xorg-xinit/trunk/fix-globals-shadowing.patch)
===================================================================
--- extra-x86_64/fix-globals-shadowing.patch (rev 0)
+++ extra-x86_64/fix-globals-shadowing.patch 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,58 @@
+From 182920f156c87715d91b2f64b8781a0072af996e Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith at oracle.com>
+Date: Sun, 08 Sep 2013 16:48:50 +0000
+Subject: Fix warnings about parameters to startServer & startClient shadowing globals
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
+---
+diff --git a/xinit.c b/xinit.c
+index 18e3e10..1b04911 100644
+--- a/xinit.c
++++ b/xinit.c
+@@ -390,7 +390,7 @@ processTimeout(int timeout, const char *string)
+ }
+
+ static pid_t
+-startServer(char *server[])
++startServer(char *server_argv[])
+ {
+ sigset_t mask, old;
+ const char * const *cpp;
+@@ -422,12 +422,12 @@ startServer(char *server[])
+ * if client is xterm -L
+ */
+ setpgid(0,getpid());
+- Execute(server);
++ Execute(server_argv);
+
+- Error("unable to run server \"%s\"", server[0]);
++ Error("unable to run server \"%s\"", server_argv[0]);
+
+ fprintf(stderr, "Use the -- option, or make sure that %s is in your path and\n", bindir);
+- fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server[0]);
++ fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server_argv[0]);
+ fprintf(stderr, "for your display. Possible server names include:\n\n");
+ for (cpp = server_names; *cpp; cpp++)
+ fprintf(stderr, " %s\n", *cpp);
+@@ -556,7 +556,7 @@ setWindowPath(void)
+ }
+
+ static pid_t
+-startClient(char *client[])
++startClient(char *client_argv[])
+ {
+ clientpid = fork();
+ if (clientpid == 0) {
+@@ -568,8 +568,8 @@ startClient(char *client[])
+ _exit(EXIT_FAILURE);
+ }
+ setpgid(0, getpid());
+- Execute(client);
+- Error("Unable to run program \"%s\"", client[0]);
++ Execute(client_argv);
++ Error("Unable to run program \"%s\"", client_argv[0]);
+
+ fprintf(stderr, "Specify a program on the command line or make sure that %s\n", bindir);
+ fprintf(stderr, "is in your path.\n\n");
+--
+cgit v0.9.0.2-2-gbebe
Deleted: extra-x86_64/fs25361.patch
===================================================================
--- extra-x86_64/fs25361.patch 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-x86_64/fs25361.patch 2013-12-09 12:20:22 UTC (rev 201357)
@@ -1,16 +0,0 @@
-Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
-diff -u xinit.orig/startx.cpp xinit/startx.cpp
---- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
-+++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
-@@ -290,9 +290,9 @@
- XCOMM now add the same credentials to the client authority file
- XCOMM if '$displayname' already exists do not overwrite it as another
- XCOMM server man need it. Add them to the '$xserverauthfile' instead.
-- for displayname in $authdisplay $hostname$authdisplay; do
-+ for displayname in $authdisplay $hostname/unix$authdisplay; do
- authcookie=`XAUTH list "$displayname" @@
-- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
-+ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
- if [ "z${authcookie}" = "z" ] ; then
- XAUTH -q << EOF
- add $displayname . $mcookie
Copied: xorg-xinit/repos/extra-x86_64/fs25361.patch (from rev 201356, xorg-xinit/trunk/fs25361.patch)
===================================================================
--- extra-x86_64/fs25361.patch (rev 0)
+++ extra-x86_64/fs25361.patch 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,16 @@
+Common subdirectories: xinit.orig/privileged_startx and xinit/privileged_startx
+diff -u xinit.orig/startx.cpp xinit/startx.cpp
+--- xinit.orig/startx.cpp 2011-08-02 18:26:57.161711018 +0400
++++ xinit/startx.cpp 2011-08-02 19:06:39.348816866 +0400
+@@ -290,9 +290,9 @@
+ XCOMM now add the same credentials to the client authority file
+ XCOMM if '$displayname' already exists do not overwrite it as another
+ XCOMM server man need it. Add them to the '$xserverauthfile' instead.
+- for displayname in $authdisplay $hostname$authdisplay; do
++ for displayname in $authdisplay $hostname/unix$authdisplay; do
+ authcookie=`XAUTH list "$displayname" @@
+- | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
++ | sed -n "s/.*$hostname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
+ if [ "z${authcookie}" = "z" ] ; then
+ XAUTH -q << EOF
+ add $displayname . $mcookie
Deleted: extra-x86_64/xinitrc
===================================================================
--- extra-x86_64/xinitrc 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-x86_64/xinitrc 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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 201356, xorg-xinit/trunk/xinitrc)
===================================================================
--- extra-x86_64/xinitrc (rev 0)
+++ extra-x86_64/xinitrc 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-x86_64/xserverrc 2013-12-09 12:20:22 UTC (rev 201357)
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ -z "$XDG_VTNR" ]; then
- exec /usr/bin/X -nolisten tcp "$@"
-else
- exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
-fi
Copied: xorg-xinit/repos/extra-x86_64/xserverrc (from rev 201356, xorg-xinit/trunk/xserverrc)
===================================================================
--- extra-x86_64/xserverrc (rev 0)
+++ extra-x86_64/xserverrc 2013-12-09 12:20:22 UTC (rev 201357)
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+ exec /usr/bin/X -nolisten tcp "$@"
+else
+ exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi
Deleted: extra-x86_64/xsession
===================================================================
--- extra-x86_64/xsession 2013-12-09 12:20:09 UTC (rev 201356)
+++ extra-x86_64/xsession 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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 201356, xorg-xinit/trunk/xsession)
===================================================================
--- extra-x86_64/xsession (rev 0)
+++ extra-x86_64/xsession 2013-12-09 12:20:22 UTC (rev 201357)
@@ -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