main/remmina: build with gtk3

6 files changed, 345 insertions, 98 deletions

diff --git a/main/remmina/APKBUILD b/main/remmina/APKBUILD
index 637c8f4d8..adb9ad19b 100644
--- a/main/remmina/APKBUILD
+++ b/main/remmina/APKBUILD
@@ -1,42 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=remmina
 pkgver=1.0.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Remmina is a remote desktop client written in GTK+"
 url="http://remmina.sourceforge.net/"
 arch="all"
 license="GPL"
 depends=
-makedepends="gtk+-dev intltool zlib-dev libjpeg-turbo-dev gnutls-dev vte-dev
-	libgcrypt-dev libssh-dev libxkbfile-dev freerdp-dev avahi-dev
-	cmake"
+makedepends="gtk+3.0-dev intltool zlib-dev libjpeg-turbo-dev gnutls-dev
+	vte3-dev libgcrypt-dev libssh-dev libxkbfile-dev freerdp-dev
+	avahi-ui-dev cmake"
 install=
 replaces="remmina-plugins"
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz
 	no-gnome-keyring.patch
-	uclibc-underlinking.patch
-
 	remmina-1.0.0-add-clipboard-support.patch
 	remmina-1.0.0-clipboard-bugfix.patch
 	remmina-1.0.0-some-more-clipboard-fixes.patch
 	remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
-	
 	remmina-1.0.0-fix-memory-leak.patch
+	remmina-1.0.0-linker-error.patch
+	remmina-1.0.0-dsofix.patch
+	remmina-1.0.0-fix-library-name.patch
+	libintl-underlink.patch
 	"
 
 prepare() {
 	cd "$srcdir"/FreeRDP-Remmina-*
         for patch in $source; do
                 case $patch in
-                # we concider patches with uclibc in its name
-                # only usefull on uclibc install
-                *uclibc*.patch)
-                        if [ "$ALPINE_LIBC" != "eglibc" ]; then
-                                msg "Applying patch $patch"
-                                patch -p1 -i "$srcdir"/$patch || return 1
-                        fi
-                        ;;
                 *.patch)
                         msg "Applying patch $patch"
                         patch -p1 -i "$srcdir"/$patch || return 1
@@ -51,6 +44,7 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DWITH_PTHREAD=ON \
 		-DWITH_TELEPATHY=OFF \
+		-DWITH_APPINDICATOR=OFF \
 		|| return 1
 	make || return 1
 }
@@ -69,9 +63,34 @@ package() {
 
 md5sums="701c540acaab961bc3adf130a2ddb8b1  Remmina-1.0.0.tar.gz
 178d55f7aa59d6dc73b19e03201ad1e4  no-gnome-keyring.patch
-594668bf54d4068cc57f8cfdae482adb  uclibc-underlinking.patch
 9312b5bf953a63e6203f0d0be6cb8134  remmina-1.0.0-add-clipboard-support.patch
 65bfcc39ae51343b90928ea329cc4900  remmina-1.0.0-clipboard-bugfix.patch
 42b971116f887657fc210da70c3afba5  remmina-1.0.0-some-more-clipboard-fixes.patch
 04b5bc1190b53211747e097897d1d19c  remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
-3bc1a4e50cdd864c0e2d7c91a1e02e32  remmina-1.0.0-fix-memory-leak.patch"
+3bc1a4e50cdd864c0e2d7c91a1e02e32  remmina-1.0.0-fix-memory-leak.patch
+b23b424509e968332be1b83c1063a252  remmina-1.0.0-linker-error.patch
+144e8f4127ccec7282060800147a48ea  remmina-1.0.0-dsofix.patch
+82b5007ed3bcb57b4f98b16eb9725ba8  remmina-1.0.0-fix-library-name.patch
+e5af6b49e42462550f51843ef8326076  libintl-underlink.patch"
+sha256sums="7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731  Remmina-1.0.0.tar.gz
+fb6094af599b64a1944f9a13a767e846d8bf772470690073da76cfd5eed799c2  no-gnome-keyring.patch
+7a1b539d4fc72e1be0792855396f78b1f64faeb5ff05a8c21309e842a23ef6be  remmina-1.0.0-add-clipboard-support.patch
+a826dcd93f5fb38285389294c0097c76086cdd14b49ac05622a0c2d5b448c149  remmina-1.0.0-clipboard-bugfix.patch
+4e95f6404e937f5e24ee21620ee0700643b5f519796cc4ae8e78e24a4bdd5e68  remmina-1.0.0-some-more-clipboard-fixes.patch
+3319a85e0bd7dce27b02007b2030189f2fb9b67f4e76f7e51bf3bd12b8bf641d  remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
+79477964423c03b50663cae76035474c208989bb5c25b3b5c16afa0b0921ba0b  remmina-1.0.0-fix-memory-leak.patch
+199ba96f3a20f3679e53419eb4d5aa99ec16c80a4ddace6a9b2427a5cb0200d7  remmina-1.0.0-linker-error.patch
+701cf9b0d6560ae9eee375f3c2828e449666190664fb28c9ccd95627db5d92e4  remmina-1.0.0-dsofix.patch
+9a996b1c203089917711af9ec5c7b9f9af668afe226c84e1cfa8ddb007d1b66d  remmina-1.0.0-fix-library-name.patch
+a8065f8bef88417bdfd8631441da19c9f945e0cc7131382e33a9f2c26f4e6017  libintl-underlink.patch"
+sha512sums="585fff5eb4585978ee321e481fafa057052d39ca01690a4e3bb7e9add94bb968373ab30001ef18c7578bc98b24df25ff4ab7a0fc882d99770b2dce079c4d39a6  Remmina-1.0.0.tar.gz
+5e0d26e799c9b85ae0c5bd7b9e6f07fd4a2da15c12b2a649098603c84d7dda6bfa518b0295edecc7522ab06c1a84d444083634d9fedb7d44b65b86dfc2eef65b  no-gnome-keyring.patch
+e84de833b76b5796c21829a410e46287cd268ecdd34cf453a8b56afdab1e991390e0dbc54d3ea60a2378cfd5a43907b0901b8cd9bf362d9354619554cc5e9934  remmina-1.0.0-add-clipboard-support.patch
+8233f41a50f9e4ddd172af5644a34dc1e9c7675d678c1fcb5fb02f38ff7238ffabbebbe241aa3bbcad4429c93fa29d6ffcd78b85ddd0c63631d31230b95b13c9  remmina-1.0.0-clipboard-bugfix.patch
+d31b26006acc45da8fb4a785c67c1252c924cb39a3437d2b3893bdb25bface7ca05f63a00d07e1ce82afcf7c05d5d810caf9ffb06f0a658a7a5a5d4c1b643591  remmina-1.0.0-some-more-clipboard-fixes.patch
+5c103a73d7c16022b526c21d710fef189e8058010f0553cf2da1676f4992bb89a5003b2268903d4d28b64cf3a9fe5797dfa991863e4f24045942aeda6371aa40  remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
+b836a73cba79a7e8357066e84a1d751843867d858bcbb48c731308b222826f6cf82788462a8e95b07a2617c835fe57ac14e6b291919b85bd8a1e13281ac17902  remmina-1.0.0-fix-memory-leak.patch
+175b2538540fdf32cdf5b217852683a5ce3833fd5ec08a4e1c9a85145aeaada2c280afb2912476fb45e5283ca27ffdea73684c8e49650f7b809317fa948a2465  remmina-1.0.0-linker-error.patch
+4b8299c65b9a1bc529fd44fdb05033d5dfd7e5589daea7056d275011a6f01f4154141ae9b787581de646019c9f15b0493da39484850b2df052df33824c67dd91  remmina-1.0.0-dsofix.patch
+eb26b108b1cf27ac6c71200e121f0b3276f4aeb1e4938bd13f332a228fe5a001adafffa3297ac1cf545d8a302fdb6c3f9457de766d07b92347758ae4822184e1  remmina-1.0.0-fix-library-name.patch
+43fa8caf186bac447921aa13c89ebf378f72d00a2d9c6bc76b4408c70fea3205e450e8cc7b145f4d5b3c6719e667be983d6e9f5b52fda00e10ecf7a48696c88b  libintl-underlink.patch"
diff --git a/main/remmina/libintl-underlink.patch b/main/remmina/libintl-underlink.patch
new file mode 100644
index 000000000..6afba38dd
--- /dev/null
+++ b/main/remmina/libintl-underlink.patch
@@ -0,0 +1,11 @@
+--- ./remmina/CMakeLists.txt.orig
++++ ./remmina/CMakeLists.txt
+@@ -91,7 +91,7 @@
+ add_executable(remmina ${REMMINA_SRCS})
+ 
+ include_directories(${GTK_INCLUDE_DIRS})
+-target_link_libraries(remmina ${GTK_LIBRARIES})
++target_link_libraries(remmina ${GTK_LIBRARIES} -lintl)
+ 
+ find_package(X11)
+ include_directories(${X11_INCLUDE_DIR})
diff --git a/main/remmina/remmina-1.0.0-dsofix.patch b/main/remmina/remmina-1.0.0-dsofix.patch
new file mode 100644
index 000000000..f8e0c21cd
--- /dev/null
+++ b/main/remmina/remmina-1.0.0-dsofix.patch
@@ -0,0 +1,11 @@
+--- a/remmina-plugins/vnc/CMakeLists.txt	2012-06-04 13:03:46.542093149 -0600
++++ b/remmina-plugins/vnc/CMakeLists.txt	2012-06-04 13:03:34.112332497 -0600
+@@ -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} gnutls )
+ 
+ install(TARGETS remmina-plugin-vnc DESTINATION ${REMMINA_PLUGINDIR})
+ 
diff --git a/main/remmina/remmina-1.0.0-fix-library-name.patch b/main/remmina/remmina-1.0.0-fix-library-name.patch
new file mode 100644
index 000000000..1774dd63a
--- /dev/null
+++ b/main/remmina/remmina-1.0.0-fix-library-name.patch
@@ -0,0 +1,25 @@
+From 503a008e4aedc74b775c785f96292b8f5c448137 Mon Sep 17 00:00:00 2001
+From: Andrey <gankov@opensuse.org>
+Date: Sat, 10 Mar 2012 01:00:32 +0400
+Subject: [PATCH] fix library name mistake
+
+---
+ cmake/FindGTK3.cmake |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/cmake/FindGTK3.cmake b/cmake/FindGTK3.cmake
+index c1b019e..f73b64d 100644
+--- a/cmake/FindGTK3.cmake
++++ b/cmake/FindGTK3.cmake
+@@ -48,7 +48,7 @@ find_path(GDKPIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h
+ 	HINTS ${PC_GDKPIXBUF_INCLUDEDIR} ${PC_GDKPIXBUF_INCLUDE_DIRS}
+ 	PATH_SUFFIXES gdk-pixbuf-2.0)
+ 
+-find_library(GDKPIXBUF_LIBRARY NAMES gdk-3
++find_library(GDKPIXBUF_LIBRARY NAMES gdk_pixbuf-2.0
+ 	HINTS ${PC_GDKPIXBUF_LIBDIR} ${PC_GDKPIXBUF_LIBRARY_DIRS})
+ 
+ # Glib
+-- 
+1.7.5.4
+
diff --git a/main/remmina/remmina-1.0.0-linker-error.patch b/main/remmina/remmina-1.0.0-linker-error.patch
new file mode 100644
index 000000000..298767c48
--- /dev/null
+++ b/main/remmina/remmina-1.0.0-linker-error.patch
@@ -0,0 +1,262 @@
+From 13f203672155cd52278655f03da7ff8dcff75c29 Mon Sep 17 00:00:00 2001
+From: Andrey Gankov <gankov@opensuse.org>
+Date: Sat, 10 Mar 2012 02:55:32 +0400
+Subject: [PATCH] Fix Issue #9: linker error
+
+---
+ cmake/FindGLIB2.cmake  |  120 ++++++++++++++++++++++++++++++++++++++++++++++++
+ cmake/FindGTK2.cmake   |   21 ++-------
+ cmake/FindGTK3.cmake   |   24 +++-------
+ remmina/CMakeLists.txt |    9 ++++
+ 4 files changed, 140 insertions(+), 34 deletions(-)
+ create mode 100644 cmake/FindGLIB2.cmake
+
+diff --git a/cmake/FindGLIB2.cmake b/cmake/FindGLIB2.cmake
+new file mode 100644
+index 0000000..8208ded
+--- /dev/null
++++ b/cmake/FindGLIB2.cmake
+@@ -0,0 +1,120 @@
++# Remmina - The GTK+ Remote Desktop Client
++#
++# Copyright (C) 2012 Andrey Gankov
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, 
++# Boston, MA 02111-1307, USA.
++
++set(_GLIB_found_all true)
++
++# Glib
++
++pkg_check_modules(PC_GLIB2 glib-2.0)
++
++if(NOT PC_GLIB2_FOUND)
++	set(_GLIB_found_all false)
++endif()
++
++find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
++	HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
++	PATH_SUFFIXES glib-2.0)
++
++find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
++	HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
++	PATH_SUFFIXES glib-2.0/include)
++
++set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
++
++find_library(GLIB2_LIBRARY NAMES glib-2.0)
++
++# GIO
++
++pkg_check_modules(PC_GIO gio-2.0)
++
++if(NOT PC_GIO_FOUND)
++	set(_GLIB_found_all false)
++endif()
++
++find_path(GIO_INCLUDE_DIR gio/gio.h
++	HINTS ${PC_GIO_INCLUDEDIR} ${PC_GIO_INCLUDE_DIRS}
++	PATH_SUFFIXES gio-2.0)
++
++find_library(GIO_LIBRARY NAMES gio-2.0
++	HINTS ${PC_GIO_LIBDIR} ${PC_GIO_LIBRARY_DIRS})
++
++# gobject
++
++pkg_check_modules(PC_GOBJECT gobject-2.0)
++
++if(NOT PC_GOBJECT_FOUND)
++	set(_GLIB_found_all false)
++endif()
++
++find_path(GOBJECT_INCLUDE_DIR gobject/gobject.h
++	HINTS ${PC_GOBJECT_INCLUDEDIR} ${PC_GOBJECT_INCLUDE_DIRS}
++	PATH_SUFFIXES gobject-2.0)
++
++find_library(GOBJECT_LIBRARY NAMES gobject-2.0
++	HINTS ${PC_GOBJECT_LIBDIR} ${PC_GOBJECT_LIBRARY_DIRS})
++
++# gmodule
++
++pkg_check_modules(PC_GMODULE gmodule-2.0)
++
++if(NOT PC_GMODULE_FOUND)
++	set(_GLIB_found_all false)
++endif()
++
++find_path(GMODULE_INCLUDE_DIR gmodule.h
++	HINTS ${PC_GMODULE_INCLUDEDIR} ${PC_GMODULE_INCLUDE_DIRS}
++	PATH_SUFFIXES gmodule-2.0)
++
++find_library(GMODULE_LIBRARY NAMES gmodule-2.0
++	HINTS ${PC_GMODULE_LIBDIR} ${PC_GMODULE_LIBRARY_DIRS})
++
++# gthread
++
++pkg_check_modules(PC_GTHREAD gthread-2.0)
++
++if(NOT PC_GTHREAD_FOUND)
++	set(_GLIB_found_all false)
++endif()
++
++find_path(GTHREAD_INCLUDE_DIR glib/gthread.h
++	HINTS ${PC_GTHREAD_INCLUDEDIR} ${PC_GTHREAD_INCLUDE_DIRS}
++	PATH_SUFFIXES gthread-2.0)
++
++find_library(GTHREAD_LIBRARY NAMES gthread-2.0
++	HINTS ${PC_GTHREAD_LIBDIR} ${PC_GTHREAD_LIBRARY_DIRS})
++
++# Finalize
++
++if(_GLIB_found_all)
++	include(FindPackageHandleStandardArgs)
++
++	find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARY GLIB2_INCLUDE_DIR)
++
++	set(GLIB2_LIBRARIES ${GLIB2_LIBRARY} ${GIO_LIBRARY} ${GOBJECT_LIBRARY} ${GMODULE_LIBRARY} ${GTHREAD_LIBRARY})
++	set(GLIB2_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${GIO_INCLUDE_DIR} ${GOBJECT_INCLUDE_DIR} ${GMODULE_INCLUDE_DIR} ${GTHREAD_INCLUDE_DIR})
++
++	mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARY)
++
++	set(GLIB_FOUND true)
++else()
++	unset(GLIB2_LIBRARY)
++	unset(GLIB2_INCLUDE_DIR)
++
++	set(GLIB_FOUND false)
++endif()
+diff --git a/cmake/FindGTK2.cmake b/cmake/FindGTK2.cmake
+index b33966e..caf0295 100644
+--- a/cmake/FindGTK2.cmake
++++ b/cmake/FindGTK2.cmake
+@@ -63,24 +63,11 @@ find_library(GDKPIXBUF_LIBRARY NAMES gdk_pixbuf-2.0
+ 
+ # Glib
+ 
+-pkg_check_modules(PC_GLIB2 glib-2.0)
+-
+-if(NOT PC_GLIB2_FOUND)
++find_required_package(GLIB2)
++if(NOT GLIB2_FOUND)
+ 	set(_GTK2_found_all false)
+ endif()
+ 
+-find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
+-	HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
+-	PATH_SUFFIXES glib-2.0)
+-
+-find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
+-	HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
+-	PATH_SUFFIXES glib-2.0/include)
+-
+-set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
+-
+-find_library(GLIB2_LIBRARY NAMES glib-2.0)
+-
+ # Pango
+ 
+ pkg_check_modules(PC_PANGO pango)
+@@ -129,8 +116,8 @@ if(_GTK2_found_all)
+ 
+ 	find_package_handle_standard_args(GTK2 DEFAULT_MSG GTK2_LIBRARY GTK2_INCLUDE_DIR)
+ 
+-	set(GTK2_LIBRARIES ${GTK2_LIBRARY} ${GDK2_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
+-	set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIR} ${GDK2_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
++	set(GTK2_LIBRARIES ${GTK2_LIBRARY} ${GDK2_LIBRARY} ${GLIB2_LIBRARIES} ${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
++	set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIR} ${GDK2_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
+ 
+ 	mark_as_advanced(GTK2_INCLUDE_DIR GTK2_LIBRARY)
+ 
+diff --git a/cmake/FindGTK3.cmake b/cmake/FindGTK3.cmake
+index f73b64d..decb00a 100644
+--- a/cmake/FindGTK3.cmake
++++ b/cmake/FindGTK3.cmake
+@@ -53,24 +53,11 @@ find_library(GDKPIXBUF_LIBRARY NAMES gdk_pixbuf-2.0
+ 
+ # Glib
+ 
+-pkg_check_modules(PC_GLIB2 glib-2.0)
+-
+-if(NOT PC_GLIB2_FOUND)
++find_required_package(GLIB2)
++if(NOT GLIB2_FOUND)
+ 	set(_GTK3_found_all false)
+ endif()
+ 
+-find_path(GLIB2_INCLUDE_DIR_PART1 NAMES glib.h
+-	HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
+-	PATH_SUFFIXES glib-2.0)
+-
+-find_path(GLIB2_INCLUDE_DIR_PART2 NAMES glibconfig.h
+-	HINTS ${PC_GLIB2_INCLUDEDIR} ${PC_GLIB2_INCLUDE_DIRS}
+-	PATH_SUFFIXES glib-2.0/include)
+-
+-set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR_PART1} ${GLIB2_INCLUDE_DIR_PART2})
+-
+-find_library(GLIB2_LIBRARY NAMES glib-2.0)
+-
+ # Pango
+ 
+ pkg_check_modules(PC_PANGO pango)
+@@ -119,14 +106,17 @@ if(_GTK3_found_all)
+ 
+ 	find_package_handle_standard_args(GTK3 DEFAULT_MSG GTK3_LIBRARY GTK3_INCLUDE_DIR)
+ 
+-	set(GTK3_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
+-	set(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
++	set(GTK3_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GLIB2_LIBRARIES} ${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
++	set(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIRS} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
+ 
+ 	mark_as_advanced(GTK3_INCLUDE_DIR GTK3_LIBRARY)
+ 
+ 	set(GTK3_FOUND true)
+ else()
+ 	unset(GTK3_LIBRARY)
++	unset(GTK3_INCLUDE_DIR)
++
++	unset(GDK3_LIBRARY)
+ 	unset(GDK3_INCLUDE_DIR)
+ 
+ 	set(GTK3_FOUND false)
+diff --git a/remmina/CMakeLists.txt b/remmina/CMakeLists.txt
+index 0fe7bbf..9e7c982 100644
+--- a/remmina/CMakeLists.txt
++++ b/remmina/CMakeLists.txt
+@@ -93,6 +93,10 @@ add_executable(remmina ${REMMINA_SRCS})
+ include_directories(${GTK_INCLUDE_DIRS})
+ target_link_libraries(remmina ${GTK_LIBRARIES})
+ 
++find_package(X11)
++include_directories(${X11_INCLUDE_DIR})
++target_link_libraries(remmina ${X11_LIBRARIES})
++
+ find_suggested_package(LIBSSH)
+ if(LIBSSH_FOUND)
+ 	add_definitions(-DHAVE_LIBSSH)
+@@ -100,6 +104,11 @@ if(LIBSSH_FOUND)
+ 	target_link_libraries(remmina ${LIBSSH_LIBRARIES})
+ endif()
+ 
++if(PTHREAD_FOUND)
++	include_directories(${PTHREAD_INCLUDE_DIRS})
++	target_link_libraries(remmina ${PTHREAD_LIBRARIES})
++endif()
++
+ if(GCRYPT_FOUND)
+ 	include_directories(${GCRYPT_INCLUDE_DIRS})
+ 	target_link_libraries(remmina ${GCRYPT_LIBRARIES})
+-- 
+1.7.5.4
+
diff --git a/main/remmina/uclibc-underlinking.patch b/main/remmina/uclibc-underlinking.patch
deleted file mode 100644
index 63fa39a9c..000000000
--- 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})
-