- release 2 (by relup.sh)

[packages/tigervnc.git] / tigervnc-as-needed.patch

diff --git a/tigervnc-as-needed.patch b/tigervnc-as-needed.patch
index d1f24eea77a94c38a352406d40a66771620fa5af..9114eea639d6ba366f0c0391aeaea0749ffb74be 100644 (file)
--- a/tigervnc-as-needed.patch
+++ b/tigervnc-as-needed.patch
@@ -1,11 +1,16 @@
---- tigervnc/unix/xserver/hw/vnc/Makefile.am~  2010-10-10 19:21:55.995628470 +0200
-+++ tigervnc/unix/xserver/hw/vnc/Makefile.am   2010-10-10 19:31:28.183628470 +0200
-@@ -35,7 +35,7 @@
-       -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir)
+--- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am~   2011-04-20 13:46:16.993047050 +0200
++++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am    2011-04-20 14:03:35.942724608 +0200
+@@ -1,11 +1,12 @@
+ TIGERVNC_SRCDIR=${top_srcdir}/../..
+ LIB_DIR=${top_builddir}/../../common
  
- Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
--      $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11
-+      $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 -lpthread
++OS_LIB=$(LIB_DIR)/os/libos.a
+ 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
+-COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
++COMMON_LIBS=$(NETWORK_LIB) $(OS_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
  
- Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+ noinst_LTLIBRARIES = libvnccommon.la