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

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

5 files changed, 223 insertions, 1 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/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
+}