From: Brian P. Hinz <bphinz@users.sf.net>
Date: Tue, 1 Mar 2016 03:56:27 +0000 (-0500)
Subject: More fixes for libX11 linkage problems
X-Git-Tag: v1.6.90~51
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=846aed7d8b6100fcdc2ae89e78cacf53be6d975a;p=tigervnc.git

More fixes for libX11 linkage problems
---

diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch
index 686f2f7e..dd26ea66 100644
--- a/contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch
+++ b/contrib/packages/rpm/el5/SOURCES/tigervnc14-static-build-fixes.patch
@@ -9,7 +9,7 @@
        endif()
  
 -      set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -lX11")
-+      set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -Wl,-Bstatic -lX11 -lxcb -lXdmcp -lXau -lICE -Wl,-Bdynamic -ldl")
++      set(FLTK_LIBRARIES "${FLTK_LIBRARIES} -Wl,-Bdynamic -lX11 -Wl,-Bstatic -lxcb -lXdmcp -lXau -lICE -Wl,-Bdynamic -ldl")
      endif()
    endif()
  
@@ -18,7 +18,7 @@
    # even it has had an ABI change once or twice.
    if(X11_FOUND AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
 -    set(X11_LIBRARIES "-Wl,-Bstatic -lXext -Wl,-Bdynamic -lX11")
-+    set(X11_LIBRARIES "-Wl,-Bstatic -lXext -lX11 -lxcb -lXdmcp -lXau -lICE -Wl,-Bdynamic -ldl -lpthread")
++    set(X11_LIBRARIES "-Wl,-Bstatic -lXext -Wl,-Bdynamic -lX11 -Wl,-Bstatic -lxcb -lXdmcp -lXau -lICE -Wl,-Bdynamic -ldl -lpthread")
      if(X11_XTest_LIB)
        set(X11_XTest_LIB "-Wl,-Bstatic -lXtst -Wl,-Bdynamic")
      endif()