diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-07-06 20:50:38 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-07-06 20:50:38 +0000 |
| commit | 5cef944be29565b0a376df6612483b0e6f773314 (patch) | |
| tree | 2095fe6138b4e89fa0ab4582b27f49b8eb102432 /x11 | |
| parent | Fix a couple bugs and remove the IGNORE variable: (diff) | |
Only one dev.cpu.X.freq sysctl is instantiated (instance 0) so trying to
monitor or change other instances will result in a crash. For the time being,
force all monitoring to happen on instance 0.
Reported by: barbara <barbara.xxx175@libero.it>
Notes
Notes:
svn path=/head/; revision=195102
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-applets/Makefile | 2 | ||||
| -rw-r--r-- | x11/gnome-applets/files/patch-cpufreq-freebsd | 4 | ||||
| -rw-r--r-- | x11/gnome-applets/files/patch-cpufreq-selector-freebsd | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index bb4a0bba0163..885b47ad9e7b 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-applets PORTVERSION= 2.18.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd index e7f0e210d28d..5c7f4dfa71d6 100644 --- a/x11/gnome-applets/files/patch-cpufreq-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-freebsd @@ -307,7 +307,7 @@ + + g_object_get (G_OBJECT (monitor), "cpu", &mon_cpu, NULL); + len = sizeof (ifreq); -+ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", mon_cpu); ++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", 0); + + if (sysctlbyname (freq_oid, &ifreq, &len, NULL, 0) == -1) { + g_free (freq_oid); @@ -346,7 +346,7 @@ + g_object_get (G_OBJECT (monitor), "cpu", &mon_cpu, NULL); + + levels_oid = g_strdup_printf ("dev.cpu.%d.freq_levels", -+ mon_cpu); ++ 0); + len = 4; + sysctlnametomib (levels_oid, mib, &len); + len = sizeof (levels); diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd index 8d459fdeef11..0647e375d529 100644 --- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd @@ -183,7 +183,7 @@ + g_object_get (G_OBJECT (selector), "cpu", &cpu, NULL); + + frequency = (guint) ((gdouble) frequency / 1000); /* Convert back to MHz*/ -+ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", (gint) cpu); ++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", (gint) 0); + + sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency)); + g_free (freq_oid); |