diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-18 10:58:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-18 10:58:51 +0000 |
| commit | 51850de3660c2ca80abbebdf0b4b0cab9322e171 (patch) | |
| tree | 99444ffa7df82169c4c78834ce0acdfc5d771cf3 | |
| parent | fbdd5fdd471d73047d691ae4483f6bbdbdf55072 (diff) | |
| download | aports-51850de3660c2ca80abbebdf0b4b0cab9322e171.tar.bz2 aports-51850de3660c2ca80abbebdf0b4b0cab9322e171.tar.xz | |
main/remmina: try fix the underlinking of vnc and rdp plugins
| -rw-r--r-- | main/remmina/APKBUILD | 5 | ||||
| -rw-r--r-- | main/remmina/underlinking.patch | 37 |
2 files changed, 26 insertions, 16 deletions
diff --git a/main/remmina/APKBUILD b/main/remmina/APKBUILD index f4921207f1..7c9282aa33 100644 --- a/main/remmina/APKBUILD +++ b/main/remmina/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=remmina pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Remmina is a remote desktop client written in GTK+" url="http://remmina.sourceforge.net/" arch="all" @@ -30,6 +30,7 @@ build() { cd "$srcdir"/FreeRDP-Remmina-* cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_PTHREAD=ON \ -DWITH_TELEPATHY=OFF \ || return 1 make || return 1 @@ -41,5 +42,5 @@ package() { } md5sums="701c540acaab961bc3adf130a2ddb8b1 Remmina-1.0.0.tar.gz -73e31e8d312d12161cafab19eea8fc34 underlinking.patch +b47acfd011b51bc4ffe51896e6858bd8 underlinking.patch 178d55f7aa59d6dc73b19e03201ad1e4 no-gnome-keyring.patch" diff --git a/main/remmina/underlinking.patch b/main/remmina/underlinking.patch index 0cf7cecdd8..654bfedbce 100644 --- a/main/remmina/underlinking.patch +++ b/main/remmina/underlinking.patch @@ -32,33 +32,25 @@ index 0fe7bbf..5368a26 100644 --- ./cmake/FindFREERDP.cmake.orig +++ ./cmake/FindFREERDP.cmake -@@ -42,11 +42,14 @@ +@@ -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}) ++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}) set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR}) mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY) ---- ./remmina-plugins/rdp/CMakeLists.txt.orig -+++ ./remmina-plugins/rdp/CMakeLists.txt -@@ -39,7 +39,7 @@ - set_target_properties(remmina-plugin-rdp PROPERTIES PREFIX "") - - include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${FREERDP_INCLUDE_DIRS}) --target_link_libraries(remmina-plugin-rdp ${REMMINA_COMMON_LIBRARIES} ${FREERDP_LIBRARIES}) -+target_link_libraries(remmina-plugin-rdp ${REMMINA_COMMON_LIBRARIES} ${FREERDP_LIBRARIES} ${X11_LIBRARIES}) - - install(TARGETS remmina-plugin-rdp DESTINATION ${REMMINA_PLUGINDIR}) - --- ./remmina-plugins/vnc/CMakeLists.txt.orig +++ ./remmina-plugins/vnc/CMakeLists.txt @@ -28,7 +28,7 @@ @@ -66,7 +58,24 @@ index 0fe7bbf..5368a26 100644 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} ${GCRYPT_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}) + |