From df29ea27c131f6fc465a717ea56adca22c3ab4dc Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 4 Aug 2015 10:39:37 -0600
Subject: [PATCH] Rebuild to fix broken deps and build against xorg 1.18
 prerelease

---
 tigervnc-xorg118-QueueKeyboardEvents.patch | 12 ++++++
 tigervnc-xserver118.patch                  | 46 ++++++++++++++++++++++
 tigervnc.spec                              | 15 ++++---
 3 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 tigervnc-xorg118-QueueKeyboardEvents.patch
 create mode 100644 tigervnc-xserver118.patch

diff --git a/tigervnc-xorg118-QueueKeyboardEvents.patch b/tigervnc-xorg118-QueueKeyboardEvents.patch
new file mode 100644
index 0000000..5470fe1
--- /dev/null
+++ b/tigervnc-xorg118-QueueKeyboardEvents.patch
@@ -0,0 +1,12 @@
+diff -Nur tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e.orig/unix/xserver/hw/vnc/Input.cc tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e/unix/xserver/hw/vnc/Input.cc
+--- tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e.orig/unix/xserver/hw/vnc/Input.cc	2015-03-01 12:58:35.000000000 -0700
++++ tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e/unix/xserver/hw/vnc/Input.cc	2015-08-04 10:02:26.234604801 -0600
+@@ -378,7 +378,7 @@
+ 	n = GetKeyboardEvents(eventq, dev, action, kc);
+ 	enqueueEvents(dev, n);
+ #else
+-	QueueKeyboardEvents(dev, action, kc, NULL);
++	QueueKeyboardEvents(dev, action, kc);
+ #endif
+ }
+ 
diff --git a/tigervnc-xserver118.patch b/tigervnc-xserver118.patch
new file mode 100644
index 0000000..c6c20d8
--- /dev/null
+++ b/tigervnc-xserver118.patch
@@ -0,0 +1,46 @@
+diff -Nur tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e.orig/unix/xserver/hw/vnc/xorg-version.h	2015-03-01 12:58:35.000000000 -0700
++++ tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e/unix/xserver/hw/vnc/xorg-version.h	2015-08-04 09:46:14.796336147 -0600
+@@ -48,8 +48,12 @@
+ #define XORG 115
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000))
+ #define XORG 116
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
++#define XORG 117
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
++#define XORG 118
+ #else
+-#error "X.Org newer than 1.16 is not supported"
++#error "X.Org newer than 1.18 is not supported"
+ #endif
+ 
+ #endif
+diff -Nur tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e/unix/xserver/hw/vnc/xvnc.cc
+--- tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e.orig/unix/xserver/hw/vnc/xvnc.cc	2015-03-01 12:58:35.000000000 -0700
++++ tigervnc-49d0629dd87c0eb695d72dec7481e9169f55ae9e/unix/xserver/hw/vnc/xvnc.cc	2015-08-04 09:48:07.632507101 -0600
+@@ -717,9 +717,9 @@
+ 	entries = pmap->pVisual->ColormapEntries;
+ 	pVisual = pmap->pVisual;
+ 
+-	ppix = (Pixel *)xalloc(entries * sizeof(Pixel));
+-	prgb = (xrgb *)xalloc(entries * sizeof(xrgb));
+-	defs = (xColorItem *)xalloc(entries * sizeof(xColorItem));
++	ppix = (Pixel *)calloc(entries, sizeof(Pixel));
++	prgb = (xrgb *)calloc(entries, sizeof(xrgb));
++	defs = (xColorItem *)calloc(entries, sizeof(xColorItem));
+ 
+ 	for (i = 0; i < entries; i++)  ppix[i] = i;
+ 	/* XXX truecolor */
+@@ -738,9 +738,9 @@
+ 	}
+ 	(*pmap->pScreen->StoreColors)(pmap, entries, defs);
+ 	
+-	xfree(ppix);
+-	xfree(prgb);
+-	xfree(defs);
++	free(ppix);
++	free(prgb);
++	free(defs);
+     }
+ }
+ 
diff --git a/tigervnc.spec b/tigervnc.spec
index 0ff0b6e..7bdfe9a 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -5,7 +5,7 @@
 
 Name:		tigervnc
 Version:	1.4.3
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A TigerVNC remote display system
 
 %global _hardened_build 1
@@ -60,10 +60,11 @@ Patch8:		tigervnc-getmaster.patch
 Patch9:		tigervnc-shebang.patch
 Patch11:	tigervnc-format-security.patch
 Patch14:	tigervnc-xstartup.patch
-Patch15:	tigervnc-xserver117.patch
+Patch15:	tigervnc-xserver118.patch
 Patch16:	tigervnc-gnutls-3.4.patch
+Patch17:        tigervnc-xorg118-QueueKeyboardEvents.patch
 
-# This is tigervnc-%{version}/unix/xserver116.patch rebased on the latest xorg
+# This is tigervnc-%%{version}/unix/xserver116.patch rebased on the latest xorg
 Patch100:       tigervnc-xserver116-rebased.patch
 
 %description
@@ -191,11 +192,12 @@ popd
 # Clearer xstartup file (bug #923655).
 %patch14 -p1 -b .xstartup
 
-# Allow build against xorg-x11-server-1.17.
-%patch15 -p1 -b .xserver117
+# Allow build against xorg-x11-server-1.18.
+%patch15 -p1 -b .xserver118
 
 # Fix the build with gnutls 3.4 (bug #1218518).
 %patch16 -p1 -b .gnutls-3.4
+%patch17 -p1
 
 %build
 %ifarch sparcv9 sparc64 s390 s390x
@@ -364,6 +366,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Aug 04 2015 Kevin Fenzi <kevin@scrye.com> 1.4.3-12
+- Rebuild to fix broken deps and build against xorg 1.18 prerelease
+
 * Thu Jun 25 2015 Tim Waugh <twaugh@redhat.com> - 1.4.3-11
 - Rebuilt (bug #1235603).