aboutsummaryrefslogtreecommitdiffstats
path: root/main/remmina/uclibc-underlinking.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/remmina/uclibc-underlinking.patch')
-rw-r--r--main/remmina/uclibc-underlinking.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/main/remmina/uclibc-underlinking.patch b/main/remmina/uclibc-underlinking.patch
deleted file mode 100644
index 63fa39a9c0..0000000000
--- a/main/remmina/uclibc-underlinking.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 465e905..4f1052d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,6 +92,11 @@ if(GCRYPT_FOUND)
- add_definitions(-DHAVE_LIBGCRYPT)
- endif()
-
-+find_required_package(X11)
-+find_library(GIO_LIBRARY NAMES gio-2.0)
-+find_library(GOBJECT_LIBRARY NAMES gobject-2.0)
-+find_library(GMODULE_LIBRARY NAMES gmodule-2.0)
-+find_library(GTHREAD_LIBRARY NAMES gthread-2.0)
- find_required_package(GTK)
- if(GTK_FOUND)
- add_subdirectory(remmina)
-diff --git a/remmina/CMakeLists.txt b/remmina/CMakeLists.txt
-index 0fe7bbf..5368a26 100644
---- a/remmina/CMakeLists.txt
-+++ b/remmina/CMakeLists.txt
-@@ -91,7 +91,7 @@ set(REMMINA_SRCS
- add_executable(remmina ${REMMINA_SRCS})
-
- include_directories(${GTK_INCLUDE_DIRS})
--target_link_libraries(remmina ${GTK_LIBRARIES})
-+target_link_libraries(remmina ${GTK_LIBRARIES} ${X11_LIBRARIES} ${GIO_LIBRARY} ${GOBJECT_LIBRARY} ${GMODULE_LIBRARY} ${GTHREAD_LIBRARY} -lintl -lpthread)
-
- find_suggested_package(LIBSSH)
- if(LIBSSH_FOUND)
---
-1.7.9
-
---- ./cmake/FindFREERDP.cmake.orig
-+++ ./cmake/FindFREERDP.cmake
-@@ -42,11 +42,17 @@
- find_library(FREERDP_CHANNELS_LIBRARY NAMES freerdp-channels
- HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
-
-+find_library(FREERDP_CACHE_LIBRARY NAMES freerdp-cache
-+ HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
-+
-+find_library(FREERDP_UTILS NAMES freerdp-utils
-+ HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
-+
- include(FindPackageHandleStandardArgs)
-
- find_package_handle_standard_args(FREERDP DEFAULT_MSG FREERDP_LIBRARY FREERDP_INCLUDE_DIR)
-
--set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY} ${FREERDP_KBD_LIBRARY} ${FREERDP_RAIL_LIBRARY} ${FREERDP_CODEC_LIBRARY} ${FREERDP_CHANNELS_LIBRARY})
-+set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY} ${FREERDP_KBD_LIBRARY} ${FREERDP_RAIL_LIBRARY} ${FREERDP_CODEC_LIBRARY} ${FREERDP_CHANNELS_LIBRARY} ${FREERDP_CACHE_LIBRARY} ${FREERDP_UTILS_LIBRARY} -lfreerdp-utils)
- set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR})
-
- mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY)
---- ./remmina-plugins/vnc/CMakeLists.txt.orig
-+++ ./remmina-plugins/vnc/CMakeLists.txt
-@@ -28,7 +28,7 @@
- set_target_properties(remmina-plugin-vnc PROPERTIES PREFIX "")
-
- include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${LIBVNCSERVER_INCLUDE_DIRS})
--target_link_libraries(remmina-plugin-vnc ${REMMINA_COMMON_LIBRARIES} ${LIBVNCSERVER_LIBRARIES})
-+target_link_libraries(remmina-plugin-vnc ${REMMINA_COMMON_LIBRARIES} ${LIBVNCSERVER_LIBRARIES})
-
- install(TARGETS remmina-plugin-vnc DESTINATION ${REMMINA_PLUGINDIR})
-
---- ./remmina-plugins/vnc/libvncserver/CMakeLists.txt.orig
-+++ ./remmina-plugins/vnc/libvncserver/CMakeLists.txt
-@@ -29,6 +29,7 @@
- endif(JPEG_FOUND)
- option(LIBVNCSERVER_ALLOW24BPP "Allow 24 bpp" ON)
- if(GNUTLS_FOUND)
-+ message(STATUS "Found libgnutls: ${GNUTLS_LIBRARIES}")
- set(LIBVNCSERVER_WITH_CLIENT_TLS 1)
- endif(GNUTLS_FOUND)
- if(LIBGCRYPT_LIBRARIES)
-@@ -98,5 +99,5 @@
- set(ADDITIONAL_LIBS ws2_32)
- endif(WIN32)
-
--target_link_libraries(vncclient ${ADDITIONAL_LIBS} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES})
-+target_link_libraries(vncclient ${ADDITIONAL_LIBS} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${GNUTLS_LIBRARIES})
-