* [gentoo-commits] gentoo-x86 commit in net-misc/remmina/files: remmina-1.0.0-optional-gnome-keyring.patch remmina-1.0.0-fix-desktop-file.patch remmina-1.0.0-desktop-file.patch
@ 2012-10-12 22:17 Mike Gilbert (floppym)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2012-10-12 22:17 UTC (permalink / raw
To: gentoo-commits
floppym 12/10/12 22:17:57
Removed: remmina-1.0.0-optional-gnome-keyring.patch
remmina-1.0.0-fix-desktop-file.patch
remmina-1.0.0-desktop-file.patch
Log:
Remove old patches.
(Portage version: 2.2.0_alpha136/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread* [gentoo-commits] gentoo-x86 commit in net-misc/remmina/files: remmina-1.0.0-optional-gnome-keyring.patch remmina-1.0.0-fix-desktop-file.patch remmina-1.0.0-desktop-file.patch
@ 2012-02-17 15:54 Mike Gilbert (floppym)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert (floppym) @ 2012-02-17 15:54 UTC (permalink / raw
To: gentoo-commits
floppym 12/02/17 15:54:49
Added: remmina-1.0.0-optional-gnome-keyring.patch
remmina-1.0.0-fix-desktop-file.patch
remmina-1.0.0-desktop-file.patch
Log:
Backport patches for desktop file and optional gnome-keyring.Bugs 403879 and 404235.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Revision Changes Path
1.1 net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch?rev=1.1&content-type=text/plain
Index: remmina-1.0.0-optional-gnome-keyring.patch
===================================================================
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()
1.1 net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch?rev=1.1&content-type=text/plain
Index: remmina-1.0.0-fix-desktop-file.patch
===================================================================
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
1.1 net-misc/remmina/files/remmina-1.0.0-desktop-file.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/remmina/files/remmina-1.0.0-desktop-file.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/remmina/files/remmina-1.0.0-desktop-file.patch?rev=1.1&content-type=text/plain
Index: remmina-1.0.0-desktop-file.patch
===================================================================
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;
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-12 22:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-12 22:17 [gentoo-commits] gentoo-x86 commit in net-misc/remmina/files: remmina-1.0.0-optional-gnome-keyring.patch remmina-1.0.0-fix-desktop-file.patch remmina-1.0.0-desktop-file.patch Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2012-02-17 15:54 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox