Backport patches for desktop file and optional gnome-keyring.Bugs 403879 and 404235.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

6 files changed, 231 insertions, 5 deletions

diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index 41c689fba203..907a04a8d5ac 100644
--- a/net-misc/remmina/ChangeLog
+++ b/net-misc/remmina/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/remmina
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.19 2012/02/17 05:57:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.20 2012/02/17 15:54:49 floppym Exp $
+
+*remmina-1.0.0-r1 (17 Feb 2012)
+
+  17 Feb 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/remmina-1.0.0-desktop-file.patch,
+  +files/remmina-1.0.0-fix-desktop-file.patch,
+  +files/remmina-1.0.0-optional-gnome-keyring.patch, +remmina-1.0.0-r1.ebuild:
+  Backport patches for desktop file and optional gnome-keyring.Bugs 403879 and
+  404235.
 
   17 Feb 2012; Mike Gilbert <floppym@gentoo.org> remmina-9999.ebuild:
   Make gnome-keyring optional for bug 403879 by haarp.
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 9138c9056783..c06ee151092f 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX remmina-1.0.0-desktop-file.patch 1514 RMD160 7d2e293ae79418fbba650a3334519586c72721cd SHA1 3958914d5d6dc602568b5466a930bde6015af38a SHA256 446fc318eb99a927ae0747e13aae8125ceb8ed449bef7eec6bae9c5972a97195
+AUX remmina-1.0.0-fix-desktop-file.patch 1621 RMD160 2697a2d5a6d871acbc9c5906818778465bc991e4 SHA1 5b8b4ad68619188d9af3da161ce645d6cd6c0cc8 SHA256 5b90530dda689c553af151cfacc2a415c695a80a7c6e0d060d9af3a713dc9997
+AUX remmina-1.0.0-optional-gnome-keyring.patch 1645 RMD160 3363d020f12ef6b8075aca0e6ad697bea346331d SHA1 b2b8a7f0748d221e52f995caa5e8c5472c8db0d0 SHA256 79caf815eac40c9e015228707bb2d20db82330b61efdaa3c91e26e04440e8e64
 DIST Remmina-1.0.0.tar.gz 540568 RMD160 c89da5fe6563afdd25b8db0a9e17299278a6ef99 SHA1 eeaefe53e9770849ed0e11ebae92f54ebffec2de SHA256 7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731
 DIST remmina-0.7.5.tar.gz 633137 RMD160 7dc6c58c3aa027cf3cb9f804e460e721f16c0b53 SHA1 9a407e0ebd5a599dc719f2b77319edb0cd1884d5 SHA256 3e2ea9c57003cf8043378fa797e0f2fd6f8a3c3817ece27fa7b381101ec9000a
 DIST remmina-0.9.3.tar.gz 389744 RMD160 312aefd5781db1223ebe7d14e67fc5055a0784a9 SHA1 51585eb24d297f23bb51a23e3a4a767f9dd00083 SHA256 ea10eba6f60676f7ebfebd285884e41fbb081f3809064588564f53624a3cee82
 EBUILD remmina-0.7.5.ebuild 1395 RMD160 a3d60d4c87654e70f2a6efed4b4e2a38ab615ca0 SHA1 96e68a1bb7ed504ede5b0f974bb8ee709087575f SHA256 a5eb65dabb006949cfcc35570af01fa697ba1973589ef18623edc570de50cf7f
 EBUILD remmina-0.9.3.ebuild 1507 RMD160 07ef041486cfa2cfd248f78ffbd769a5f82731c2 SHA1 603b0eaccbd855c0fc7cf6ee7426671f69d76471 SHA256 0622c90818c093d69307bc4c7bf2181251babf6c9323998782310e50e0abdd5b
+EBUILD remmina-1.0.0-r1.ebuild 1951 RMD160 e33b8851eb1e6c93786e2746d205a9505378c1b2 SHA1 22d1f62745aa8fd68b93320861bad84f529f70ff SHA256 2bf521fe1106aac791a99dfe6dffd2c832177578d31b668bc872dd779ea03795
 EBUILD remmina-1.0.0.ebuild 1726 RMD160 ee11833b2fa1ae851c9609df49720818e1e2e9f1 SHA1 de883a3782e74e98c9ceeb82641f5ff619373280 SHA256 525849af7d8122a4d855ff087d105c3000c889b54158c787dc1d74f7ef1be082
 EBUILD remmina-9999.ebuild 1683 RMD160 1600dc6a5656a3df90ebba8a0be7aa0e20ffc22d SHA1 e5783e9f465619b3678750fb62b2eb32def01e40 SHA256 67939f4deaf667049c08ec6286b17789ca6c0a4cfc78d46ca8ab821c58e4d50b
-MISC ChangeLog 2823 RMD160 5b841c3fc631f966df22a6760fd4b301b2b06dbd SHA1 5bc209b06f621dcac4fef2e7348094710d8fdb82 SHA256 7435c3527ec6d0e7b51aff23aac4f657ac531490b29d45cbb72fc4068a6a1813
+MISC ChangeLog 3164 RMD160 8f7d2bddc836bdd67df771863506e53028ba58cb SHA1 843341ef139bb660cb2977ff6d11ba015cbb0ea5 SHA256 1889ddc5b6ae6437343338e9fc63ccb3797a94961a613a5a88e5f5753670aabe
 MISC metadata.xml 920 RMD160 5af2652dac630a7ad94c01dad098e33675fb763d SHA1 50c5ed732898c48527ffb2f1423b207a5b0dc429 SHA256 cbf2e988f49d9606c4bd6faf4ad74ca7334d692cfc44f0ebcb0df6c5a9fdeaea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk897DgACgkQC77qH+pIQ6Sf1gEAqDeQFHqmP4W14n/pxmlUGUkc
-DQfx11aoaNFaehhiW44A/1PCS+lKq4OlsBGvD1GO+0sczDr8THVhO4dxN2KLAZBQ
-=vK8b
+iF4EAREIAAYFAk8+eE4ACgkQC77qH+pIQ6RRNwEAjRhjP8xzk8UBlqxEesgNmZnV
+l6aXprgQK7JAQDX7U/8BAMsSUwlQO313cbikyTFvLGQH7FtMguwc8APjL9hcciwO
+=exiC
 -----END PGP SIGNATURE-----
diff --git a/net-misc/remmina/files/remmina-1.0.0-desktop-file.patch b/net-misc/remmina/files/remmina-1.0.0-desktop-file.patch
new file mode 100644
index 000000000000..e684f420413f
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.0.0-desktop-file.patch
@@ -0,0 +1,51 @@
+commit 569d9bb702d06c061dfbbf3c590d57ea83a04369
+Author: Jeremy Bicha <jbicha@ubuntu.com>
+Date:   Sat Feb 11 22:48:36 2012 -0500
+
+    remmina: install .desktop file
+
+diff --git a/remmina/desktop/CMakeLists.txt b/remmina/desktop/CMakeLists.txt
+index c528fc5..f3b7cee 100644
+--- a/remmina/desktop/CMakeLists.txt
++++ b/remmina/desktop/CMakeLists.txt
+@@ -38,3 +38,4 @@ install(FILES ${ICON32_DATA} DESTINATION ${ICON32_DIR})
+ install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR})
+ install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR})
+ 
++install(FILES remmina.desktop DESTINATION share/applications/remmina.desktop)
+diff --git a/remmina/desktop/remmina.desktop b/remmina/desktop/remmina.desktop
+new file mode 100644
+index 0000000..a1f6443
+--- /dev/null
++++ b/remmina/desktop/remmina.desktop
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++Version=1.0
++_Name=Remmina Remote Desktop Client
++_Comment=Connect to remote desktops
++TryExec=remmina
++Exec=remmina
++Icon=remmina
++Terminal=false
++Type=Application
++Actions=
++Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
++
+diff --git a/remmina/desktop/remmina.desktop.in b/remmina/desktop/remmina.desktop.in
+deleted file mode 100644
+index a1f6443..0000000
+--- a/remmina/desktop/remmina.desktop.in
++++ /dev/null
+@@ -1,12 +0,0 @@
+-[Desktop Entry]
+-Version=1.0
+-_Name=Remmina Remote Desktop Client
+-_Comment=Connect to remote desktops
+-TryExec=remmina
+-Exec=remmina
+-Icon=remmina
+-Terminal=false
+-Type=Application
+-Actions=
+-Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
+-
diff --git a/net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch b/net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch
new file mode 100644
index 000000000000..50d8c83313f8
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch
@@ -0,0 +1,43 @@
+commit f7d1038ba358a295fb46c681db5c47e4ead97306
+Author: Mike Gilbert <floppym@gentoo.org>
+Date:   Wed Feb 15 13:36:06 2012 -0500
+
+    Fix installation of desktop file and related icons.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 465e905..13e82d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,7 +78,7 @@ include_directories(.)
+ include_directories(remmina/include)
+ 
+ set(REMMINA_VERSION "0.9.99.1")
+-set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share/remmina")
++set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+ set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
+ set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins")
+ 
+diff --git a/remmina/desktop/CMakeLists.txt b/remmina/desktop/CMakeLists.txt
+index f3b7cee..103b090 100644
+--- a/remmina/desktop/CMakeLists.txt
++++ b/remmina/desktop/CMakeLists.txt
+@@ -38,4 +38,4 @@ install(FILES ${ICON32_DATA} DESTINATION ${ICON32_DIR})
+ install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR})
+ install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR})
+ 
+-install(FILES remmina.desktop DESTINATION share/applications/remmina.desktop)
++install(FILES remmina.desktop DESTINATION "${REMMINA_DATADIR}/applications")
+diff --git a/remmina/desktop/remmina.desktop b/remmina/desktop/remmina.desktop
+index a1f6443..3136316 100644
+--- a/remmina/desktop/remmina.desktop
++++ b/remmina/desktop/remmina.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Version=1.0
+-_Name=Remmina Remote Desktop Client
+-_Comment=Connect to remote desktops
++Name=Remmina Remote Desktop Client
++Comment=Connect to remote desktops
+ TryExec=remmina
+ Exec=remmina
+ Icon=remmina
diff --git a/net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch b/net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch
new file mode 100644
index 000000000000..2dcc655fb13f
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch
@@ -0,0 +1,45 @@
+commit 16e255b047e140fca29fea192792d9f3b639a607
+Author: Mike Gilbert <floppym@gentoo.org>
+Date:   Fri Feb 17 00:41:12 2012 -0500
+
+    Make Gnome Keyring an optional dependency.
+
+diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt
+index a631063..4f3ce61 100644
+--- a/remmina-plugins-gnome/CMakeLists.txt
++++ b/remmina-plugins-gnome/CMakeLists.txt
+@@ -17,21 +17,20 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, 
+ # Boston, MA 02111-1307, USA.
+ 
+-set(REMMINA_PLUGINS_GNOME_SRCS
+-	src/gkeyring_plugin.c
+-	)
++find_suggested_package(GNOMEKEYRING)
++if(GNOMEKEYRING_FOUND)
++	set(REMMINA_PLUGINS_GNOME_SRCS
++		src/gkeyring_plugin.c
++		)
+ 
+-add_library(remmina-plugins-gnome ${REMMINA_PLUGINS_GNOME_SRCS})
+-set_target_properties(remmina-plugins-gnome PROPERTIES PREFIX "")
++	add_library(remmina-plugins-gnome ${REMMINA_PLUGINS_GNOME_SRCS})
++	set_target_properties(remmina-plugins-gnome PROPERTIES PREFIX "")
+ 
+-include_directories(${GTK_INCLUDE_DIRS})
+-target_link_libraries(remmina-plugins-gnome ${GTK_LIBRARY_DIRS})
++	include_directories(${GTK_INCLUDE_DIRS})
++	target_link_libraries(remmina-plugins-gnome ${GTK_LIBRARY_DIRS})
+ 
+-find_required_package(GNOMEKEYRING)
+-if(GNOMEKEYRING_FOUND)
+-	include_directories(${GNOMEKEYRING_INCLUDE_DIRS})
+-	target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES})
+-endif()
+-
+-install(TARGETS remmina-plugins-gnome DESTINATION ${REMMINA_PLUGINDIR})
++		include_directories(${GNOMEKEYRING_INCLUDE_DIRS})
++		target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES})
+ 
++	install(TARGETS remmina-plugins-gnome DESTINATION ${REMMINA_PLUGINDIR})
++endif()
diff --git a/net-misc/remmina/remmina-1.0.0-r1.ebuild b/net-misc/remmina/remmina-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..5c3151f9a3e7
--- /dev/null
+++ b/net-misc/remmina/remmina-1.0.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0-r1.ebuild,v 1.1 2012/02/17 15:54:49 floppym Exp $
+
+EAPI="4"
+
+inherit gnome2-utils cmake-utils
+
+DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
+HOMEPAGE="http://remmina.sourceforge.net/"
+SRC_URI="https://github.com/downloads/FreeRDP/Remmina/Remmina-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy unique vte"
+
+# net-libs/libvncserver is bundled; add dep for next release
+RDEPEND="x11-libs/gtk+:3
+	x11-libs/libxkbfile
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	ayatana? ( dev-libs/libappindicator )
+	avahi? ( net-dns/avahi[gtk3] )
+	crypt? ( dev-libs/libgcrypt )
+	freerdp? ( >=net-misc/freerdp-1.0 )
+	ssh? ( net-libs/libssh[sftp] )
+	telepathy? ( net-libs/telepathy-glib )
+	!net-misc/remmina-plugins
+	vte? ( x11-libs/vte:2.90 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( README )
+
+src_unpack() {
+	default
+	mv FreeRDP-Remmina-* "${S}" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-desktop-file.patch"
+	epatch "${FILESDIR}/${P}-fix-desktop-file.patch"
+	epatch "${FILESDIR}/${P}-optional-gnome-keyring.patch"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with ayatana APPINDICATOR)
+		$(cmake-utils_use_with avahi AVAHI)
+		$(cmake-utils_use_with crypt GCRYPT)
+		$(cmake-utils_use_with freerdp FREERDP)
+		$(cmake-utils_use_with gnome-keyring GNOMEKEYRING)
+		$(cmake-utils_use_with ssh LIBSSH)
+		$(cmake-utils_use_with telepathy TELEPATHY)
+		$(cmake-utils_use_with vte VTE)
+		-DREMMINA_PLUGINDIR="/usr/$(get_libdir)/remmina/plugins"
+		-DHAVE_PTHREAD=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}