Remove obsolete distro patches

Commit f0fffd4d7f0907e91dfcee02cd7fbe4f4cbe2342 makes ldnow patch unnecessary.
Commit 0dc36a501ee5e69ce1a201935a4a4a903d06cbe1 makes format-security patch unnecessary.

diff --git a/contrib/packages/deb/ubuntu-precise/debian/patches/510_tigervnc11-ldnow.patch b/contrib/packages/deb/ubuntu-precise/debian/patches/510_tigervnc11-ldnow.patch
deleted file mode 100644 (file)
index e8e99b5..0000000
--- a/contrib/packages/deb/ubuntu-precise/debian/patches/510_tigervnc11-ldnow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/unix/xserver/hw/vnc/Makefile.am  2011-10-31 09:14:40.000000000 +0100
-+++ b/unix/xserver/hw/vnc/Makefile.am  2012-08-22 15:51:47.013241342 +0200
-@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
-       -I$(top_srcdir)/include \
-       ${XSERVERLIBS_CFLAGS} -I$(includedir)
- 
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
- 

diff --git a/contrib/packages/deb/ubuntu-precise/debian/patches/series b/contrib/packages/deb/ubuntu-precise/debian/patches/series
index b9635cf395f062638e29cfde9af8f13bf93c6b4b..51c53e88d752e1d9e7768d5eb5a666b20ef7db70 100644 (file)
--- a/contrib/packages/deb/ubuntu-precise/debian/patches/series
+++ b/contrib/packages/deb/ubuntu-precise/debian/patches/series
@@ -6,6 +6,5 @@
 
 # Upstream patches
 504_tigervnc-cookie.patch
-510_tigervnc11-ldnow.patch
 511_tigervnc11-gethomedir.patch
 516_tigervnc-xorg-manpages.patch

diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch
deleted file mode 100644 (file)
index e8e99b5..0000000
--- a/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/unix/xserver/hw/vnc/Makefile.am  2011-10-31 09:14:40.000000000 +0100
-+++ b/unix/xserver/hw/vnc/Makefile.am  2012-08-22 15:51:47.013241342 +0200
-@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
-       -I$(top_srcdir)/include \
-       ${XSERVERLIBS_CFLAGS} -I$(includedir)
- 
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
- 

diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch
deleted file mode 100644 (file)
index 36f3fc8..0000000
--- a/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tigervnc-1.3.0/vncviewer/vncviewer.cxx.format-security tigervnc-1.3.0/vncviewer/vncviewer.cxx
---- tigervnc-1.3.0/vncviewer/vncviewer.cxx.format-security     2013-12-03 16:47:04.802800182 +0000
-+++ tigervnc-1.3.0/vncviewer/vncviewer.cxx     2013-12-03 16:47:08.680820024 +0000
-@@ -309,7 +309,7 @@ interpretViaParam(char *remoteHost, int
- 
-   snprintf(vncServerName, VNCSERVERNAMELEN, "localhost::%d", localPort);
-   vncServerName[VNCSERVERNAMELEN - 1] = '\0';
--  vlog.error(vncServerName);
-+  vlog.error("%s", vncServerName);
- 
-   return 0;
- }

diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/series b/contrib/packages/deb/ubuntu-trusty/debian/patches/series
index ced87cc67aebe0b64aca8a2ca3771e61eb8dd334..51c53e88d752e1d9e7768d5eb5a666b20ef7db70 100644 (file)
--- a/contrib/packages/deb/ubuntu-trusty/debian/patches/series
+++ b/contrib/packages/deb/ubuntu-trusty/debian/patches/series
@@ -6,7 +6,5 @@
 
 # Upstream patches
 504_tigervnc-cookie.patch
-510_tigervnc11-ldnow.patch
 511_tigervnc11-gethomedir.patch
 516_tigervnc-xorg-manpages.patch
-517_tigervnc-format-security.patch

diff --git a/contrib/packages/rpm/el5/SOURCES/fltk-1.3.3-static-libs.patch b/contrib/packages/rpm/el5/SOURCES/fltk-1.3.3-static-libs.patch
new file mode 100644 (file)
index 0000000..4e717e4
--- /dev/null
+++ b/contrib/packages/rpm/el5/SOURCES/fltk-1.3.3-static-libs.patch
@@ -0,0 +1,29 @@
+--- a/configure        2015-02-22 16:20:48.000000000 -0500
++++ b/configure        2015-02-22 16:21:52.000000000 -0500
+@@ -6793,7 +6793,7 @@
+   # See if we find them without any special options.
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS=$LIBS
+-  LIBS="-lX11 $LIBS"
++  LIBS="-lX11 -lXrender -lxcb -lXdmcp -lXau $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <X11/Xlib.h>
+@@ -6935,7 +6935,7 @@
+     # Martyn Johnson says this is needed for Ultrix, if the X
+     # libraries were built with DECnet support.  And Karl Berry says
+     # the Alpha needs dnet_stub (dnet does not exist).
+-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
++    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11 -lXrender -lxcb -lXdmcp -lXau"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -7359,7 +7359,7 @@
+ $as_echo "$as_me: WARNING: Ignoring libraries \"$X_PRE_LIBS\" requested by configure." >&2;}
+       fi
+ 
+-      LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
++      LIBS="$LIBS -lX11 -lXrender -lxcb -lXdmcp -lXau $X_EXTRA_LIBS"
+       CFLAGS="$CFLAGS $X_CFLAGS"
+       CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+       LDFLAGS="$X_LIBS $LDFLAGS"

diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc11-ldnow.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc11-ldnow.patch
deleted file mode 100644 (file)
index 0db5d88..0000000
--- a/contrib/packages/rpm/el5/SOURCES/tigervnc11-ldnow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow      2010-05-18 15:48:02.000000000 +0200
-+++ tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am    2010-07-21 17:05:45.242942531 +0200
-@@ -50,7 +50,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
-       -I$(top_srcdir)/hw/xfree86/os-support/bus \
-       -I$(includedir)/pixman-1 -I$(includedir)
- 
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
- 

diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index 2db96f696c7ab768413ef47ea6bb127853ee4bec..4dec5b359174368e0d89bc4f2a00ed6d2262fa5f 100644 (file)
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -128,7 +128,6 @@ Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586
 
 # tigervnc patches
 Patch4: tigervnc-cookie.patch
-Patch10: tigervnc11-ldnow.patch
 Patch11: tigervnc11-gethomedir.patch
 Patch12: tigervnc14-static-build-fixes.patch
 
@@ -267,7 +266,6 @@ cp %SOURCE9 cmake/Modules/
 sed -i -e "s#@_includedir@#%{xorg_buildroot}%{_includedir}#" cmake/Modules/FindX11.cmake
 sed -i -e "s#@_libdir@#%{xorg_buildroot}%{_libdir}#" cmake/Modules/FindX11.cmake
 %patch4 -p1 -b .cookie
-%patch10 -p1 -b .ldnow
 %patch11 -p1 -b .gethomedir
 %patch12 -p1 -b .static-build-fixes
 

diff --git a/contrib/packages/rpm/el6/SOURCES/tigervnc11-ldnow.patch b/contrib/packages/rpm/el6/SOURCES/tigervnc11-ldnow.patch
deleted file mode 100644 (file)
index f6edd09..0000000
--- a/contrib/packages/rpm/el6/SOURCES/tigervnc11-ldnow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.ldnow       2011-10-31 09:14:40.000000000 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am     2012-08-22 15:51:47.013241342 +0200
-@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
-       -I$(top_srcdir)/include \
-       ${XSERVERLIBS_CFLAGS} -I$(includedir)
- 
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
- 

diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index 7047ab192493c16ad052a1f624dd2467c9ead7c3..f1fef8d481b345e32225469276e7b43cc66e7ef4 100644 (file)
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -46,7 +46,6 @@ Provides: tightvnc = 1.5.0-0.15.20090204svn3586
 Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586
 
 Patch4: tigervnc-cookie.patch
-Patch10: tigervnc11-ldnow.patch
 Patch11: tigervnc11-gethomedir.patch
 Patch16: tigervnc-xorg-manpages.patch
 
@@ -140,7 +139,6 @@ This package contains icons for TigerVNC viewer
 
 # sed -i -e 's/80/0/g' CMakeLists.txt
 %patch4 -p1 -b .cookie
-%patch10 -p1 -b .ldnow
 %patch11 -p1 -b .gethomedir
 
 tar xzf %SOURCE11