packages: tigervnc/tigervnc.spec, tigervnc/tigervnc-110patch.patch (NEW) - ...

[baggins]

Author: baggins                      Date: Sat Mar  5 23:48:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix xorg 1.10 patch

---- Files affected:
packages/tigervnc:
   tigervnc.spec (1.28 -> 1.29) , tigervnc-110patch.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/tigervnc/tigervnc.spec
diff -u packages/tigervnc/tigervnc.spec:1.28 packages/tigervnc/tigervnc.spec:1.29
--- packages/tigervnc/tigervnc.spec:1.28	Sun Mar  6 00:39:45 2011
+++ packages/tigervnc/tigervnc.spec	Sun Mar  6 00:48:24 2011
@@ -21,6 +21,7 @@
 Patch2:		%{name}-rh102434.patch
 Patch5:		%{name}-viewer-reparent.patch
 Patch6:		%{name}-as-needed.patch
+Patch7:		%{name}-110patch.patch
 URL:		http://www.tigervnc.com/
 BuildRequires:	ImageMagick
 BuildRequires:	ImageMagick-coder-png
@@ -169,6 +170,7 @@
 %patch2 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's|^po/Makefile.in||' configure.ac
 
@@ -305,6 +307,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2011/03/05 23:48:24  baggins
+- fix xorg 1.10 patch
+
 Revision 1.28  2011/03/05 23:39:45  baggins
 - new snap for xserver 1.10
 - removed obsolete patches

================================================================
Index: packages/tigervnc/tigervnc-110patch.patch
diff -u /dev/null packages/tigervnc/tigervnc-110patch.patch:1.1
--- /dev/null	Sun Mar  6 00:48:29 2011
+++ packages/tigervnc/tigervnc-110patch.patch	Sun Mar  6 00:48:24 2011
@@ -0,0 +1,30 @@
+--- tigervnc/unix/xserver110.patch~	2010-12-08 17:10:47.000000000 +0100
++++ tigervnc/unix/xserver110.patch	2011-03-06 00:46:19.785092000 +0100
+@@ -10,9 +10,9 @@
+  # Require xorg-macros minimum of 1.10 for XORG_CHECK_SGML_DOCTOOLS
+  m4_ifndef([XORG_MACROS_VERSION],
+ @@ -65,6 +64,7 @@ dnl forcing an entire recompile.x
++ dnl forcing an entire recompile.x
+  AC_CONFIG_HEADERS(include/version-config.h)
+  
+- AC_PROG_CC
+ +AC_PROG_CXX
+  AM_PROG_AS
+  AC_PROG_INSTALL
+@@ -45,13 +45,13 @@
+  	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+  	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+ @@ -2245,6 +2249,7 @@ hw/dmx/input/Makefile
+- hw/dmx/glxProxy/Makefile
+- hw/dmx/Makefile
++ hw/dmx/man/Makefile
+  hw/vfb/Makefile
++ hw/vfb/man/Makefile
+ +hw/vnc/Makefile
+  hw/xnest/Makefile
++ hw/xnest/man/Makefile
+  hw/xwin/Makefile
+- hw/xwin/glx/Makefile
+ diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
+ --- xserver/hw/Makefile.am.vnc	2010-12-08 17:09:34.469198303 +0100
+ +++ xserver/hw/Makefile.am	2010-12-08 17:09:46.789193164 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigervnc/tigervnc.spec?r1=1.28&r2=1.29&f=u