aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-02-17 20:13:46 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-02-17 20:13:46 +0000
commitfbdd5fdd471d73047d691ae4483f6bbdbdf55072 (patch)
tree89c6b6569e0289422e05731647ca661b3014cf76 /main
parentf8d9643da1f6039a1954d670a333122df8e983c1 (diff)
downloadaports-fbdd5fdd471d73047d691ae4483f6bbdbdf55072.tar.bz2
aports-fbdd5fdd471d73047d691ae4483f6bbdbdf55072.tar.xz
main/remmina: fix underlinking in rdp and vnc plugins
Diffstat (limited to 'main')
-rw-r--r--main/remmina/APKBUILD6
-rw-r--r--main/remmina/underlinking.patch40
2 files changed, 43 insertions, 3 deletions
diff --git a/main/remmina/APKBUILD b/main/remmina/APKBUILD
index 6c136ad90e..f4921207f1 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=1
+pkgrel=2
pkgdesc="Remmina is a remote desktop client written in GTK+"
url="http://remmina.sourceforge.net/"
arch="all"
@@ -9,7 +9,7 @@ license="GPL"
depends=
makedepends="gtk+-dev intltool zlib-dev jpeg-dev gnutls-dev vte-dev
libgcrypt-dev libssh-dev libxkbfile-dev freerdp-dev avahi-dev
- wget cmake"
+ cmake"
install=
replaces="remmina-plugins"
subpackages="$pkgname-dev $pkgname-lang"
@@ -41,5 +41,5 @@ package() {
}
md5sums="701c540acaab961bc3adf130a2ddb8b1 Remmina-1.0.0.tar.gz
-c5874505afdcbc984beda485eed23b47 underlinking.patch
+73e31e8d312d12161cafab19eea8fc34 underlinking.patch
178d55f7aa59d6dc73b19e03201ad1e4 no-gnome-keyring.patch"
diff --git a/main/remmina/underlinking.patch b/main/remmina/underlinking.patch
index 4cabfea11c..0cf7cecdd8 100644
--- a/main/remmina/underlinking.patch
+++ b/main/remmina/underlinking.patch
@@ -30,3 +30,43 @@ index 0fe7bbf..5368a26 100644
--
1.7.9
+--- ./cmake/FindFREERDP.cmake.orig
++++ ./cmake/FindFREERDP.cmake
+@@ -42,11 +42,14 @@
+ 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})
++
+ 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_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 @@
+ 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} ${GCRYPT_LIBRARIES})
+
+ install(TARGETS remmina-plugin-vnc DESTINATION ${REMMINA_PLUGINDIR})
+