Fri Dec 27 23:54:04 UTC 2013

3 files changed, 93 insertions, 11 deletions

diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index 15d645dee..c313e7b51 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197640 2013-10-27 15:15:12Z andyrtr $
+# $Id: PKGBUILD 201357 2013-12-09 12:20:22Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xorg-xinit
 pkgver=1.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -21,24 +21,31 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
         fs25361.patch
         xinitrc
         xsession
-        xserverrc)
+        xserverrc
+        cpp-4.8-compat.patch
+        fix-globals-shadowing.patch)
 options=(!emptydirs)
 sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
             'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
             '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
             '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
             '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
-            '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
+            '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f'
+            '194104efba9bcbf8ec0bd9ac1b145017d459b734afbc8bbfc37e361efd467a96'
+            '6491c96dd0e98b6f5a45c4f0183eabcf2fb54728c81e793910c19d4107606bb1')
 
 prepare() {
   cd xinit-${pkgver}
-  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
-  patch -Np1 -i "${srcdir}/fs25361.patch"
+  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
 }
@@ -53,9 +60,4 @@ package() {
   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
-
 }
diff --git a/extra/xorg-xinit/cpp-4.8-compat.patch b/extra/xorg-xinit/cpp-4.8-compat.patch
new file mode 100644
index 000000000..b19f53eee
--- /dev/null
+++ b/extra/xorg-xinit/cpp-4.8-compat.patch
@@ -0,0 +1,22 @@
+From 463b85fcf51d8ff5886ebe1f3481e5cb4d603436 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@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@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
diff --git a/extra/xorg-xinit/fix-globals-shadowing.patch b/extra/xorg-xinit/fix-globals-shadowing.patch
new file mode 100644
index 000000000..d9e0a18f9
--- /dev/null
+++ b/extra/xorg-xinit/fix-globals-shadowing.patch
@@ -0,0 +1,58 @@
+From 182920f156c87715d91b2f64b8781a0072af996e Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@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@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