- fixed source0 url

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

diff --git a/tigervnc-as-needed.patch b/tigervnc-as-needed.patch
index af82e280ba007bdd4c9feb89d609f65a13b54804..af14c433e3052ff040bfb7d46f7a141db63fbbc7 100644 (file)
--- a/tigervnc-as-needed.patch
+++ b/tigervnc-as-needed.patch
@@ -1,22 +1,27 @@
---- 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
  
---- 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.2.0/CMakeLists.txt~     2012-03-09 21:34:29.000000000 +0100
++++ tigervnc-1.2.0/CMakeLists.txt      2012-03-23 13:47:57.895270032 +0100
+@@ -316,7 +316,7 @@
+   if(APPLE)
+     set(FLTK_LIBRARIES "-framework Carbon -framework Cocoa -framework ApplicationServices")
+   elseif(NOT WIN32)
+-    set(FLTK_LIBRARIES "-ldl")
++    set(FLTK_LIBRARIES "-ldl -lfontconfig")
+   endif()
+   message(STATUS "Using included FLTK library")
+ endif()