- fix building with xserver 1.13

- release 8

diff --git a/tigervnc.spec b/tigervnc.spec
index 5ab3a6b72f4f54e4c6f8ab7b9638015eb6a575c9..286b755e344b58579f629a328cdb53d5f71ea1c3 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -7,7 +7,7 @@ Summary:        A TigerVNC remote display system
 Summary(pl.UTF-8):     System zdalnego dostępu TigerVNC
 Name:          tigervnc
 Version:       1.2.0
-Release:       7
+Release:       8
 License:       GPL v2
 Group:         X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/tigervnc/1.2.0/%{name}-%{version}.tar.gz
@@ -27,6 +27,8 @@ Patch10:      xorg112.patch
 Patch11:       cmake-mandir.patch
 Patch12:       sed-all.patch
 Patch13:       xorg113.patch
+Patch14:       xserver113.patch
+Patch15:       format-security.patch
 URL:           http://www.tigervnc.com/
 BuildRequires: ImageMagick
 BuildRequires: ImageMagick-coder-png
@@ -185,10 +187,11 @@ pozwalający na zdalny dostęp do pulpitu.
 %patch9 -p1
 %patch11 -p1
 %patch12 -p1
+%patch15 -p1
 
 cp -a %{_usrsrc}/xorg-xserver-server-%{_xserverver}/* unix/xserver
 cd unix/xserver
-patch -p1 <../xserver110.patch
+patch -p1 <%{PATCH14}
 cd -
 %patch6 -p1
 %patch10 -p1

diff --git a/xorg113.patch b/xorg113.patch
index c0d11e6978c30514aff9739671f8744a8ed01b4e..78667fbdff4db83e601b08856ee17167417bad58 100644 (file)
--- a/xorg113.patch
+++ b/xorg113.patch
@@ -131,3 +131,14 @@ diff -up tigervnc/unix/xserver/hw/vnc/xvnc.cc.xorg113 tigervnc/unix/xserver/hw/v
  
      miSetPixmapDepths();
  
+--- tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc~  2012-09-23 19:45:21.946623087 +0200
++++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc   2012-09-23 19:49:31.809947601 +0200
+@@ -943,7 +943,7 @@
+ {
+   REQUEST(xVncExtApproveConnectReq);
+   REQUEST_SIZE_MATCH(xVncExtApproveConnectReq);
+-  if (queryConnectId == (void*)stuff->opaqueId) {
++  if ((CARD32)(long)queryConnectId == stuff->opaqueId) {
+     for (int scr = 0; scr < screenInfo.numScreens; scr++) {
+       if (desktop[scr]) {
+         desktop[scr]->approveConnection(queryConnectId, stuff->approve,

diff --git a/xserver113.patch b/xserver113.patch
new file mode 100644 (file)
index 0000000..e0a03d8
--- /dev/null
+++ b/xserver113.patch
@@ -0,0 +1,92 @@
+diff -up xserver/configure.ac.vnc xserver/configure.ac
+--- xserver/configure.ac.vnc   2012-08-28 15:35:23.778810954 +0200
++++ xserver/configure.ac       2012-08-28 15:54:46.396743431 +0200
+@@ -31,7 +31,6 @@ RELEASE_DATE="2012-08-21"
+ RELEASE_NAME="Splashing Orca"
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-AM_MAINTAINER_MODE
+ 
+ # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+@@ -73,6 +72,7 @@ dnl forcing an entire recompile.x
+ AC_CONFIG_HEADERS(include/version-config.h)
+ 
+ AM_PROG_AS
++AC_PROG_CXX
+ AC_PROG_LN_S
+ AC_LIBTOOL_WIN32_DLL
+ AC_DISABLE_STATIC
+@@ -1561,6 +1561,10 @@ if test "x$XVFB" = xyes; then
+       AC_SUBST([XVFB_SYS_LIBS])
+ fi
+ 
++dnl Xvnc DDX
++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
++AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
+ 
+ dnl Xnest DDX
+ 
+@@ -1596,6 +1600,8 @@ if test "x$XORG" = xauto; then
+ fi
+ AC_MSG_RESULT([$XORG])
+ 
++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
++
+ 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'
+@@ -1815,7 +1821,6 @@ if test "x$XORG" = xyes; then
+       AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+       AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+       AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+-      AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+       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])
+@@ -2280,6 +2285,7 @@ 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
+diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
+--- xserver/hw/Makefile.am.vnc 2012-08-28 15:35:23.856810890 +0200
++++ xserver/hw/Makefile.am     2012-08-28 15:35:42.272795917 +0200
+@@ -33,7 +33,8 @@ SUBDIRS =                    \
+       $(XNEST_SUBDIRS)        \
+       $(DMX_SUBDIRS)          \
+       $(KDRIVE_SUBDIRS)       \
+-      $(XQUARTZ_SUBDIRS)
++      $(XQUARTZ_SUBDIRS)      \
++      vnc
+ 
+ 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 2012-08-28 15:35:23.000000000 +0200
++++ xserver/mi/miinitext.c     2012-09-05 15:07:40.714953972 +0200
+@@ -112,6 +112,10 @@ SOFTWARE.
+ #include "micmap.h"
+ #include "globals.h"
+ 
++#ifdef TIGERVNC
++extern void vncExtensionInit(INITARGS);
++#endif
++
+ /* The following is only a small first step towards run-time
+  * configurable extensions.
+  */
+@@ -299,6 +303,9 @@ static ExtensionModule staticExtensions[
+ #ifdef XSELINUX
+     {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension},
+ #endif
++#ifdef TIGERVNC
++    {vncExtensionInit, "VNC-EXTENSION", NULL},
++#endif
+ };
+ 
+ static ExtensionModule *ExtensionModuleList = NULL;