- fix building with xorg 1.14

- rel 14

diff --git a/tigervnc.spec b/tigervnc.spec
index 85a8dfe841d9249e0e391fa75304ea73a2bca75f..bbdd68cd7e76c591906064feb9422946a534b813 100644 (file)
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,13 +1,13 @@
 # TODO:
 # - tigervnc.init
 
-%define                xversion        1.13.2
+%define                xversion        1.14.0
 
 Summary:       A TigerVNC remote display system
 Summary(pl.UTF-8):     System zdalnego dostępu TigerVNC
 Name:          tigervnc
 Version:       1.2.0
-Release:       13
+Release:       14
 License:       GPL v2
 Group:         X11/Applications/Networking
 Source0:       http://dl.sourceforge.net/tigervnc/1.2.0/%{name}-%{version}.tar.gz
@@ -29,6 +29,7 @@ Patch12:      sed-all.patch
 Patch13:       xorg113.patch
 Patch14:       xserver113.patch
 Patch15:       format-security.patch
+Patch16:       xorg114.patch
 URL:           http://www.tigervnc.com/
 BuildRequires: ImageMagick
 BuildRequires: ImageMagick-coder-png
@@ -196,6 +197,7 @@ cd -
 %patch6 -p1
 %patch10 -p1
 %patch13 -p1
+%patch16 -p1
 
 %build
 %cmake .

diff --git a/xorg114.patch b/xorg114.patch
new file mode 100644 (file)
index 0000000..6fef6d1
--- /dev/null
+++ b/xorg114.patch
@@ -0,0 +1,22 @@
+diff -up tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113 tigervnc/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113        2012-07-19 21:19:27.560942582 -0400
++++ tigervnc/unix/xserver/hw/vnc/xorg-version.h        2012-07-19 21:19:27.576942382 -0400
+@@ -42,6 +42,8 @@
+ #define XORG 112
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
+ #define XORG 113
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
++#define XORG 114
+ #else
+ #error "X.Org newer than 1.10 is not supported"
+ #endif
+--- tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc~        2013-04-07 20:20:47.297384278 +0200
++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-04-07 20:23:13.141847987 +0200
+@@ -54,7 +54,6 @@
+ #include "servermd.h"
+ #include "fb.h"
+ #include "mi.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"

diff --git a/xserver113.patch b/xserver113.patch
index e0a03d84197ee3dea60509cf300daefc7145a86a..bc0d17e5df5469bc6c41f362f342632d1e0cd558 100644 (file)
--- a/xserver113.patch
+++ b/xserver113.patch
@@ -1,14 +1,6 @@
 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)