[arch-commits] Commit in xorg-server/trunk (PKGBUILD server-1.6-branch.patch)

Sat Aug 1 19:26:49 UTC 2009

Date: Saturday, August 1, 2009 @ 15:26:48
  Author: jgc
Revision: 48401

upgpkg: xorg-server 1.6.3-1
    Update to 1.6.3, remove 1.6 branch patch, as there is no patch after 1.6.3

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/server-1.6-branch.patch

-------------------------+
 PKGBUILD                |   25 ++++++----------
 server-1.6-branch.patch |   69 ----------------------------------------------
 2 files changed, 10 insertions(+), 84 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2009-08-01 19:12:16 UTC (rev 48400)
+++ PKGBUILD	2009-08-01 19:26:48 UTC (rev 48401)
@@ -3,41 +3,36 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
-pkgver=1.6.2
+pkgver=1.6.3
 pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-depends=('hal>=0.5.11' 'libgl' 'libxfont>=1.4.0' 'openssl>=0.9.8k' 'libpciaccess>=0.10.6' 'libxv>=1.0.4' 'pixman>=0.14.0' 'xcursor-themes' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.2')
-makedepends=('libx11>=1.2.1' 'mesa>=7.5' 'xf86driproto>=2.0.4' 'xtrans>=1.2.3' 'libxkbfile>=1.0.5' 'randrproto>=1.3.0' 'renderproto>=0.9.3' 'xcmiscproto>=1.1.2' 'bigreqsproto>=1.0.2' 'resourceproto>=1.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'scrnsaverproto>=1.1.0' 'libxinerama>=1.0.3' 'xf86dgaproto>=2.0.3' 'recordproto>=1.13.2' 'libgl>=7.5' 'glproto>=1.4.9' 'xorg-util-macros')
+depends=('hal>=0.5.11' 'libgl' 'libxfont>=1.4.0' 'openssl>=0.9.8k' 'libpciaccess>=0.10.6' 'libxv>=1.0.4' 'pixman>=0.14.0' 'xcursor-themes' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.3')
+makedepends=('libx11>=1.2.2' 'mesa>=7.5' 'xf86driproto>=2.0.4' 'xtrans>=1.2.4' 'libxkbfile>=1.0.5' 'randrproto>=1.3.0' 'renderproto>=0.9.3' 'xcmiscproto>=1.1.2' 'bigreqsproto>=1.0.2' 'resourceproto>=1.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'scrnsaverproto>=1.1.0' 'libxinerama>=1.0.3' 'xf86dgaproto>=2.0.3' 'recordproto>=1.13.2' 'libgl>=7.5' 'glproto>=1.4.9' 'xorg-util-macros')
 conflicts=('catalyst-utils<=9.2')
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')
 install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
-        xorg-redhat-die-ugly-pattern-die-die-die.patch
-        server-1.6-branch.patch)
-md5sums=('37641d0899df8a9c4a6284586d932b8d'
-         '1a336eb22e27cbf443ec5a2ecddfa93c'
-         '811b6f4cda60ac5f94fd790415efb073')
+        xorg-redhat-die-ugly-pattern-die-die-die.patch)
+md5sums=('0af168abeefa6579cab20387f75c0c7a'
+         '1a336eb22e27cbf443ec5a2ecddfa93c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # Get rid of the ugly pattern
   patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || return 1
 
-  # Upstream updates from server-1.6 branch
-  patch -Np1 -i "${srcdir}/server-1.6-branch.patch" || return 1
-
   # Fix dbus config path
   sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
 
-  libtoolize --force || return 1
-  aclocal || return 1
-  autoconf || return 1
-  automake || return 1
+#libtoolize --force || return 1
+#aclocal || return 1
+#autoconf || return 1
+#automake || return 1
   ./configure --prefix=/usr \
               --enable-ipv6 \
               --enable-dri \

Deleted: server-1.6-branch.patch
===================================================================
--- server-1.6-branch.patch	2009-08-01 19:12:16 UTC (rev 48400)
+++ server-1.6-branch.patch	2009-08-01 19:26:48 UTC (rev 48401)
@@ -1,69 +0,0 @@
-From 396d3a7762abd0dd84042833b75f2ebf9d100bb0 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith at sun.com>
-Date: Wed, 08 Jul 2009 18:26:46 +0000
-Subject: Fix build of drivers with 1.6.2 when not using --install-libxf86config
-
-c859b736d1d23c5dc2f53958b1e76660e6d45018 removed duplicate entries for
-these from the Makefile, but removed a different set than was done in
-master branch, causing xf86Parser.h to not be installed, which in turn
-breaks the build of drivers like -ati, -intel & -nv that use xf86Modes.h,
-which includes xf86Parser.h
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
----
-diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index 6ed1814..a2774a4 100644
---- a/hw/xfree86/parser/Makefile.am
-+++ b/hw/xfree86/parser/Makefile.am
-@@ -1,8 +1,5 @@
- if INSTALL_LIBXF86CONFIG
- lib_LIBRARIES = libxf86config.a
--LIBHEADERS = \
--	xf86Optrec.h \
--	xf86Parser.h
- else
- noinst_LIBRARIES = libxf86config.a
- endif
-@@ -30,9 +27,8 @@ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
- EXTRA_DIST = \
- 	Configint.h \
- 	configProcs.h \
--	xf86Optrec.h \
--	xf86Parser.h \
- 	xf86tokens.h
- 
- sdk_HEADERS = \
--	$(LIBHEADERS)
-+	xf86Optrec.h \
-+	xf86Parser.h
---
-cgit v0.8.2
-From 606f6dba16d42e3546a82a386d5a01087467b511 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-Date: Tue, 14 Apr 2009 14:54:25 +0000
-Subject: xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)
-
-You could be more clever than this, but the wire protocol says this
-really is an array of not more than 255 ARRAY8, so it's not just a
-matter of changing the types.
-
-(cherry picked from commit 0eb19f9437b7d8c19592e49eedb028771d300d80)
----
-diff --git a/os/xdmcp.c b/os/xdmcp.c
-index 736cd3e..746f598 100644
---- a/os/xdmcp.c
-+++ b/os/xdmcp.c
-@@ -491,7 +491,9 @@ XdmcpRegisterConnection (
- 	    return;
- 	}
-     }
--    newAddress = (CARD8 *) xalloc (addrlen * sizeof (CARD8));
-+    if (ConnectionAddresses.length + 1 == 256)
-+	return;
-+    newAddress = xalloc (addrlen * sizeof (CARD8));
-     if (!newAddress)
- 	return;
-     if (!XdmcpReallocARRAY16 (&ConnectionTypes, ConnectionTypes.length + 1))
---
-cgit v0.8.2


