|
 |
ecd4e2 |
Combination of the following two patches.
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
commit d247110e60d3ba009c038a74e1f2b70bb1ba6a01
|
|
|
ecd4e2 |
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
|
ecd4e2 |
Date: Wed Aug 20 00:24:19 2014 +0200
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
Add hwloc-ls.desktop file for start menu integration in gnome/KDE
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
commit 04c67994f0410a5c6eda61fdb3e89e75e00848ba
|
|
|
ecd4e2 |
Author: Brice Goglin <Brice.Goglin@inria.fr>
|
|
|
ecd4e2 |
Date: Wed Oct 8 11:27:12 2014 +0200
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
Change hwloc-ls.desktop in lstopo.desktop and only install if graphical
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
hwloc-ls doesn't always point to a graphical lstopo, while hwloc-ls.desktop
|
|
|
ecd4e2 |
wants a graphical application. Use lstopo instead (the change is invisible
|
|
|
ecd4e2 |
from the menu) and don't install it unless lstopo has Cairo support.
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
By the way, fix some issues in the desktop file (Categories Application
|
|
|
ecd4e2 |
is deprecated, comment should be Comment).
|
|
|
ecd4e2 |
Thanks to Jirka Hladky for reporting these issues.
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
diff -Nrup hwloc-1.7.orig/utils/lstopo.desktop hwloc-1.7/utils/lstopo.desktop
|
|
|
ecd4e2 |
--- hwloc-1.7.orig/utils/lstopo.desktop 1969-12-31 19:00:00.000000000 -0500
|
|
|
ecd4e2 |
+++ hwloc-1.7/utils/lstopo.desktop 2015-07-14 16:08:07.451934042 -0400
|
|
|
ecd4e2 |
@@ -0,0 +1,10 @@
|
|
|
ecd4e2 |
+# should only be used when lstopo is built with Cairo/X11 support
|
|
|
ecd4e2 |
+# so that no terminal is required
|
|
|
ecd4e2 |
+[Desktop Entry]
|
|
|
ecd4e2 |
+Name=Hardware Locality lstopo
|
|
|
ecd4e2 |
+Comment=Show hardware topology
|
|
|
ecd4e2 |
+Exec=lstopo
|
|
|
ecd4e2 |
+Terminal=false
|
|
|
ecd4e2 |
+Type=Application
|
|
|
ecd4e2 |
+Categories=System;
|
|
|
ecd4e2 |
+Keywords=System;Utility;
|
|
|
ecd4e2 |
diff -Nrup hwloc-1.7.orig/utils/Makefile.am hwloc-1.7/utils/Makefile.am
|
|
|
ecd4e2 |
--- hwloc-1.7.orig/utils/Makefile.am 2015-07-14 16:06:07.752411827 -0400
|
|
|
ecd4e2 |
+++ hwloc-1.7/utils/Makefile.am 2015-07-14 16:08:07.451934042 -0400
|
|
|
ecd4e2 |
@@ -70,6 +70,13 @@ if HWLOC_HAVE_LINUX
|
|
|
ecd4e2 |
nodist_man_MANS += $(hgt_page)
|
|
|
ecd4e2 |
endif HWLOC_HAVE_LINUX
|
|
|
ecd4e2 |
|
|
|
ecd4e2 |
+if HWLOC_HAVE_CAIRO
|
|
|
ecd4e2 |
+# only installed when lstopo is built with Cairo/X11 support
|
|
|
ecd4e2 |
+# so that no terminal is required
|
|
|
ecd4e2 |
+APPLICATIONSdir = @datarootdir@/applications
|
|
|
ecd4e2 |
+dist_APPLICATIONS_DATA = lstopo.desktop
|
|
|
ecd4e2 |
+endif
|
|
|
ecd4e2 |
+
|
|
|
ecd4e2 |
.1in.1:
|
|
|
ecd4e2 |
@ echo Creating $@ man page...
|
|
|
ecd4e2 |
@ $(SED) -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
|