tigervnc/cmakelists.patch

   1 diff -Nur tigervnc-1.1.90.orig/CMakeLists.txt tigervnc-1.1.90/CMakeLists.txt
   2 --- tigervnc-1.1.90.orig/CMakeLists.txt 2011-12-31 18:55:38.000000000 +0100
   3 +++ tigervnc-1.1.90/CMakeLists.txt      2012-01-01 21:36:06.035309022 +0100
   4 @@ -395,8 +395,6 @@
   5  endif()
   6  add_subdirectory(vncviewer)
   7
   8 -include(cmake/BuildPackages.cmake)
   9 -
  10  # uninstall
  11  configure_file("${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
  12    "cmake_uninstall.cmake" IMMEDIATE @ONLY)
  13 diff -Nur tigervnc-1.1.90.orig/unix/CMakeLists.txt tigervnc-1.1.90/unix/CMakeLists.txt
  14 --- tigervnc-1.1.90.orig/unix/CMakeLists.txt    2011-11-03 20:01:18.000000000 +0100
  15 +++ tigervnc-1.1.90/unix/CMakeLists.txt 2012-01-01 21:36:06.035309022 +0100
  16 @@ -5,4 +5,4 @@
  17  add_subdirectory(x0vncserver)
  18
  19  install(PROGRAMS vncserver DESTINATION bin)
  20 -install(FILES vncserver.man DESTINATION man/man1 RENAME vncserver.1)
  21 +install(FILES vncserver.man DESTINATION share/man/man1 RENAME vncserver.1)
  22 diff -Nur tigervnc-1.1.90.orig/unix/vncconfig/CMakeLists.txt tigervnc-1.1.90/unix/vncconfig/CMakeLists.txt
  23 --- tigervnc-1.1.90.orig/unix/vncconfig/CMakeLists.txt  2011-06-25 09:32:34.000000000 +0200
  24 +++ tigervnc-1.1.90/unix/vncconfig/CMakeLists.txt       2012-01-01 21:36:06.036308992 +0100
  25 @@ -12,4 +12,4 @@
  26  target_link_libraries(vncconfig tx rfb network rdr ${X11_LIBRARIES})
  27
  28  install(TARGETS vncconfig DESTINATION bin)
  29 -install(FILES vncconfig.man DESTINATION man/man1 RENAME vncconfig.1)
  30 +install(FILES vncconfig.man DESTINATION share/man/man1 RENAME vncconfig.1)
  31 diff -Nur tigervnc-1.1.90.orig/unix/vncpasswd/CMakeLists.txt tigervnc-1.1.90/unix/vncpasswd/CMakeLists.txt
  32 --- tigervnc-1.1.90.orig/unix/vncpasswd/CMakeLists.txt  2011-06-25 09:32:34.000000000 +0200
  33 +++ tigervnc-1.1.90/unix/vncpasswd/CMakeLists.txt       2012-01-01 21:36:06.036308992 +0100
  34 @@ -6,4 +6,4 @@
  35  target_link_libraries(vncpasswd tx rfb rdr os)
  36
  37  install(TARGETS vncpasswd DESTINATION bin)
  38 -install(FILES vncpasswd.man DESTINATION man/man1 RENAME vncpasswd.1)
  39 +install(FILES vncpasswd.man DESTINATION share/man/man1 RENAME vncpasswd.1)
  40 diff -Nur tigervnc-1.1.90.orig/unix/x0vncserver/CMakeLists.txt tigervnc-1.1.90/unix/x0vncserver/CMakeLists.txt
  41 --- tigervnc-1.1.90.orig/unix/x0vncserver/CMakeLists.txt        2011-08-19 18:41:06.000000000 +0200
  42 +++ tigervnc-1.1.90/unix/x0vncserver/CMakeLists.txt     2012-01-01 21:36:06.037308964 +0100
  43 @@ -24,4 +24,4 @@
  44  endif()
  45
  46  install(TARGETS x0vncserver DESTINATION bin)
  47 -install(FILES x0vncserver.man DESTINATION man/man1 RENAME x0vncserver.1)
  48 +install(FILES x0vncserver.man DESTINATION share/man/man1 RENAME x0vncserver.1)
  49 diff -Nur tigervnc-1.1.90.orig/vncviewer/CMakeLists.txt tigervnc-1.1.90/vncviewer/CMakeLists.txt
  50 --- tigervnc-1.1.90.orig/vncviewer/CMakeLists.txt       2011-10-05 11:32:28.000000000 +0200
  51 +++ tigervnc-1.1.90/vncviewer/CMakeLists.txt    2012-01-01 21:36:06.037308964 +0100
  52 @@ -40,7 +40,7 @@
  53  if(USE_INCLUDED_FLTK)
  54    target_link_libraries(vncviewer fltk_static)
  55  endif()
  56 -target_link_libraries(vncviewer rfb network rdr os Xregion ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
  57 +target_link_libraries(vncviewer rfb network rdr os Xregion fontconfig ${FLTK_LIBRARIES} ${GETTEXT_LIBRARIES})
  58
  59  # When building with GnuTLS, librdr depends on ws2_32, so in order to make
  60  # MinGW happy, we need to put ws2_32 in librdr's target_link_libraries string,
  61 @@ -55,5 +55,5 @@
  62    install(TARGETS vncviewer DESTINATION bin)
  63  endif()
  64  if(UNIX)
  65 -  install(FILES vncviewer.man DESTINATION man/man1 RENAME vncviewer.1)
  66 +  install(FILES vncviewer.man DESTINATION share/man/man1 RENAME vncviewer.1)
  67  endif()