This workaround is no longer needed as we've fixed the bad interaction with libtool.tags/v1.4.90
@@ -1,18 +0,0 @@ | |||
--- a/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:01.876216608 +0200 | |||
+++ b/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:45.973143684 +0200 | |||
@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la | |||
RDR_LIB=$(LIB_DIR)/rdr/librdr.la | |||
NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la | |||
XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la | |||
+OS_LIB=$(LIB_DIR)/os/libos.la | |||
COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) | |||
noinst_LTLIBRARIES = libvnccommon.la | |||
@@ -55,6 +56,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I | |||
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | |||
-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | |||
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) | |||
EXTRA_DIST = Xvnc.man |
@@ -6,5 +6,4 @@ | |||
# Upstream patches | |||
504_tigervnc-cookie.patch | |||
511_tigervnc11-gethomedir.patch | |||
516_tigervnc-xorg-manpages.patch |
@@ -1,18 +0,0 @@ | |||
--- a/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:01.876216608 +0200 | |||
+++ b/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:45.973143684 +0200 | |||
@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la | |||
RDR_LIB=$(LIB_DIR)/rdr/librdr.la | |||
NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la | |||
XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la | |||
+OS_LIB=$(LIB_DIR)/os/libos.la | |||
COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) | |||
noinst_LTLIBRARIES = libvnccommon.la | |||
@@ -55,6 +56,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I | |||
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | |||
-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | |||
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) | |||
EXTRA_DIST = Xvnc.man |
@@ -6,5 +6,4 @@ | |||
# Upstream patches | |||
504_tigervnc-cookie.patch | |||
511_tigervnc11-gethomedir.patch | |||
516_tigervnc-xorg-manpages.patch |
@@ -1,19 +0,0 @@ | |||
diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am | |||
--- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir 2011-03-22 10:53:05.206429397 +0100 | |||
+++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am 2011-03-22 10:53:30.550388457 +0100 | |||
@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la | |||
RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS) | |||
NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la | |||
XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la | |||
+OS_LIB=$(LIB_DIR)/os/libos.la | |||
COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) | |||
noinst_LTLIBRARIES = libvnccommon.la | |||
@@ -52,6 +53,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I | |||
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | |||
-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | |||
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) | |||
EXTRA_DIST = Xvnc.man |
@@ -132,7 +132,6 @@ Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 | |||
# tigervnc patches | |||
Patch4: tigervnc-cookie.patch | |||
Patch11: tigervnc11-gethomedir.patch | |||
Patch12: tigervnc14-static-build-fixes.patch | |||
# fltk patches |
@@ -1,19 +0,0 @@ | |||
diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am | |||
--- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.gethomedir 2012-08-22 15:52:01.876216608 +0200 | |||
+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-08-22 15:52:45.973143684 +0200 | |||
@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la | |||
RDR_LIB=$(LIB_DIR)/rdr/librdr.la | |||
NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la | |||
XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la | |||
+OS_LIB=$(LIB_DIR)/os/libos.la | |||
COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) | |||
noinst_LTLIBRARIES = libvnccommon.la | |||
@@ -55,6 +56,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I | |||
libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now | |||
-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) | |||
+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) | |||
EXTRA_DIST = Xvnc.man |
@@ -50,7 +50,6 @@ Provides: tightvnc = 1.5.0-0.15.20090204svn3586 | |||
Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586 | |||
Patch4: tigervnc-cookie.patch | |||
Patch11: tigervnc11-gethomedir.patch | |||
Patch16: tigervnc-xorg-manpages.patch | |||
%description |