Update distro patches after 2b76d02

Cleanup distribution patches in 1.4 branch to account for 2b76d02
without fuzz.

(cherry picked from commit 6e00f1149073dd30a31142e9a23bf16f9feb9d3c)

diff --git a/contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch b/contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch
index 208608c634f78a516ef79882b85804f9b374120a..3aa803b366df8076cf5e825fa7c0fe01879dd7b7 100644 (file)
--- a/contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch
+++ b/contrib/packages/deb/ubuntu-precise/debian/patches/511_tigervnc11-gethomedir.patch
@@ -7,7 +7,7 @@
 +OS_LIB=$(LIB_DIR)/os/libos.la
  COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
  
- noinst_LTLIBRARIES = libvnccommon.la
+ # Hack to get the C headers to work when included from C++ code
 @@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
  
  libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now

diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch
index 208608c634f78a516ef79882b85804f9b374120a..3aa803b366df8076cf5e825fa7c0fe01879dd7b7 100644 (file)
--- a/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch
+++ b/contrib/packages/deb/ubuntu-trusty/debian/patches/511_tigervnc11-gethomedir.patch
@@ -7,7 +7,7 @@
 +OS_LIB=$(LIB_DIR)/os/libos.la
  COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
  
- noinst_LTLIBRARIES = libvnccommon.la
+ # Hack to get the C headers to work when included from C++ code
 @@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
  
  libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now

diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch
index fd07be3bb5e20747fd0903945f3fc59be4e11b62..05a35877c5727b86c4c8e271ea5d72a9a0aa952d 100644 (file)
--- a/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch
+++ b/contrib/packages/rpm/el5/SOURCES/tigervnc11-gethomedir.patch
@@ -8,7 +8,7 @@ diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0
 +OS_LIB=$(LIB_DIR)/os/libos.la
  COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
  
- noinst_LTLIBRARIES = libvnccommon.la
+ # Hack to get the C headers to work when included from C++ code
 @@ -52,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
  
  libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now

diff --git a/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch b/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch
index 0a4252d9c72b678d9cf71d98c1bc6cccc4b175e3..1ac9f44b87b5adcb2537e61e041e2d6a78f81956 100644 (file)
--- a/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch
+++ b/contrib/packages/rpm/el6/SOURCES/tigervnc11-gethomedir.patch
@@ -8,7 +8,7 @@ diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.2.
 +OS_LIB=$(LIB_DIR)/os/libos.la
  COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
  
- noinst_LTLIBRARIES = libvnccommon.la
+ # Hack to get the C headers to work when included from C++ code
 @@ -55,7 +56,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
  
  libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now