- 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 97808848fcb76d68245d190368b9ec3cfdef3959..9114eea639d6ba366f0c0391aeaea0749ffb74be 100644 (file)
--- a/tigervnc-as-needed.patch
+++ b/tigervnc-as-needed.patch
@@ -1,34 +1,12 @@
---- 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)
- 
- Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
--      $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11
-+      $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 -lpthread
- 
- Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
- 
---- tigervnc-1.0.90/unix/xserver/configure.ac~ 2011-04-20 13:39:47.435047139 +0200
-+++ tigervnc-1.0.90/unix/xserver/configure.ac  2011-04-20 13:44:12.270047090 +0200
-@@ -1422,7 +1422,7 @@
- 
- dnl Xvnc DDX
- AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"])
--AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
- 
- dnl This is necessary to allow Xvnc to statically link with GnuTLS
- AC_ARG_VAR(GNUTLS_LDFLAGS, [Custom linker flags for using GnuTLS, e.g. -L{GnuTLS directory}/lib -lgnutls])
 --- 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
  
-+OS_LIB=$(LIB_DIR)/os/libos.la
++OS_LIB=$(LIB_DIR)/os/libos.a
  RFB_LIB=$(LIB_DIR)/rfb/librfb.la
- RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS)
+ 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)