summaryrefslogtreecommitdiffstats
path: root/sysutils/gnome-system-monitor/files
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2007-02-13 00:43:06 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2007-02-13 00:43:06 +0800
commit67a0a597f5c272feeeb502389b165fb6214c3dac (patch)
tree876d27a5a2145ace872c1bdf83522ef4a66f10d5 /sysutils/gnome-system-monitor/files
parentbe1093e8c63a0888329077b2e8bf6618a17fea91 (diff)
downloadmarcuscom-ports-67a0a597f5c272feeeb502389b165fb6214c3dac.tar
marcuscom-ports-67a0a597f5c272feeeb502389b165fb6214c3dac.tar.gz
marcuscom-ports-67a0a597f5c272feeeb502389b165fb6214c3dac.tar.bz2
marcuscom-ports-67a0a597f5c272feeeb502389b165fb6214c3dac.tar.lz
marcuscom-ports-67a0a597f5c272feeeb502389b165fb6214c3dac.tar.xz
marcuscom-ports-67a0a597f5c272feeeb502389b165fb6214c3dac.tar.zst
marcuscom-ports-67a0a597f5c272feeeb502389b165fb6214c3dac.zip
Update to 2.17.91
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8301 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-system-monitor/files')
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp30
1 files changed, 18 insertions, 12 deletions
diff --git a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp
index 059b33942..3169745ec 100644
--- a/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp
+++ b/sysutils/gnome-system-monitor/files/patch-src_sysinfo.cpp
@@ -1,16 +1,21 @@
---- src/sysinfo.cpp.orig Mon Jan 22 12:01:12 2007
-+++ src/sysinfo.cpp Sun Jan 28 21:10:13 2007
-@@ -13,6 +13,9 @@
- #include <sys/socket.h>
+--- src/sysinfo.cpp.orig Sat Feb 10 09:00:25 2007
++++ src/sysinfo.cpp Mon Feb 12 11:37:25 2007
+@@ -14,11 +14,13 @@
#include <sys/wait.h>
#include <math.h>
+ #include <errno.h>
+-
+ #include <string>
+ #include <vector>
+ #include <fstream>
+ #include <sstream>
+#ifdef __FreeBSD__
+#include <sys/utsname.h>
+#endif
- #include <string>
- #include <vector>
-@@ -195,6 +198,29 @@ namespace {
+ #include "sysinfo.h"
+ #include "util.h"
+@@ -240,6 +242,29 @@
}
};
@@ -40,16 +45,17 @@
SysInfo* get_sysinfo()
{
-@@ -202,8 +228,11 @@ namespace {
+@@ -247,9 +272,12 @@
g_free(p);
return new LSBSysInfo;
}
--
+#ifdef __FreeBSD__
-+ return new UnameSysInfo;
++ return new UnameSysInfo;
+#else
- return new SysInfo(_("Unknown distribution"));
+ else if (g_file_test("/etc/release", G_FILE_TEST_EXISTS))
+ return new SolarisSysInfo;
+-
+#endif
+ return new SysInfo(_("Unknown distribution"));
}
}
-