rpms/tightvnc/devel xserver16.patch,1.1,1.2

Adam Tkac atkac at fedoraproject.org
Fri Feb 27 14:33:11 UTC 2009


Author: atkac

Update of /cvs/pkgs/rpms/tightvnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21185

Modified Files:
	xserver16.patch 
Log Message:
- improved xserver16.patch more


xserver16.patch:

Index: xserver16.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tightvnc/devel/xserver16.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver16.patch	27 Feb 2009 14:18:56 -0000	1.1
+++ xserver16.patch	27 Feb 2009 14:32:40 -0000	1.2
@@ -1,13 +1,13 @@
 diff -up xserver/configure.ac.vnc xserver/configure.ac
---- xserver/configure.ac.vnc	2009-02-25 11:45:20.000000000 +0100
-+++ xserver/configure.ac	2009-02-25 11:49:37.000000000 +0100
+--- xserver/configure.ac.vnc	2009-02-27 15:29:55.000000000 +0100
++++ xserver/configure.ac	2009-02-27 15:30:50.000000000 +0100
 @@ -29,7 +29,6 @@ AC_PREREQ(2.57)
- AC_INIT([xorg-server], 1.5.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+ AC_INIT([xorg-server], 1.6.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
  AC_CONFIG_SRCDIR([Makefile.am])
  AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 -AM_MAINTAINER_MODE
  
- RELEASE_DATE="2009-2-17"
+ RELEASE_DATE="2009-2-25"
  
 @@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD
  AC_CONFIG_HEADERS(include/kdrive-config.h)
@@ -17,7 +17,7 @@
  AM_PROG_AS
  AC_PROG_INSTALL
  AC_PROG_LN_S
-@@ -1195,6 +1195,9 @@ if test "x$XVFB" = xyes; then
+@@ -1203,6 +1203,9 @@ if test "x$XVFB" = xyes; then
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
  
@@ -27,7 +27,7 @@
  
  dnl Xnest DDX
  
-@@ -1230,6 +1233,8 @@ xorg_bus_linuxpci=no
+@@ -1238,6 +1241,8 @@ xorg_bus_linuxpci=no
  xorg_bus_bsdpci=no
  xorg_bus_sparc=no
  
@@ -36,7 +36,7 @@
  if test "x$XORG" = xyes; then
  	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
  	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -1417,7 +1422,6 @@ if test "x$XORG" = xyes; then
+@@ -1425,7 +1430,6 @@ if test "x$XORG" = xyes; then
  	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
  	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
  	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
@@ -44,7 +44,7 @@
  	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
  	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
  	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -1871,6 +1875,7 @@ hw/dmx/input/Makefile
+@@ -1879,6 +1883,7 @@ hw/dmx/input/Makefile
  hw/dmx/glxProxy/Makefile
  hw/dmx/Makefile
  hw/vfb/Makefile
@@ -53,8 +53,8 @@
  hw/xwin/Makefile
  hw/xquartz/Makefile
 diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
---- xserver/hw/Makefile.am.vnc	2009-02-25 11:45:20.000000000 +0100
-+++ xserver/hw/Makefile.am	2009-02-25 11:45:37.000000000 +0100
+--- xserver/hw/Makefile.am.vnc	2009-02-27 15:29:55.000000000 +0100
++++ xserver/hw/Makefile.am	2009-02-27 15:29:55.000000000 +0100
 @@ -33,7 +33,8 @@ SUBDIRS =			\
  	$(XNEST_SUBDIRS)	\
  	$(DMX_SUBDIRS)		\
@@ -66,8 +66,8 @@
  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
  
 diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
---- xserver/mi/miinitext.c.vnc	2009-02-25 11:45:21.000000000 +0100
-+++ xserver/mi/miinitext.c	2009-02-25 11:45:37.000000000 +0100
+--- xserver/mi/miinitext.c.vnc	2009-02-27 15:29:55.000000000 +0100
++++ xserver/mi/miinitext.c	2009-02-27 15:29:55.000000000 +0100
 @@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS
  extern void CompositeExtensionInit(INITARGS);
  #endif




More information about the fedora-extras-commits mailing list