From nobody Tue Oct 12 23:30:46 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5F1AF17FB82E; Tue, 12 Oct 2021 23:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HTX3C1crWz4ls6; Tue, 12 Oct 2021 23:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0BAB41D3AE; Tue, 12 Oct 2021 23:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19CNUkgV078526; Tue, 12 Oct 2021 23:30:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19CNUkh5078525; Tue, 12 Oct 2021 23:30:46 GMT (envelope-from git) Date: Tue, 12 Oct 2021 23:30:46 GMT Message-Id: <202110122330.19CNUkh5078525@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eric Turgeon Subject: git: 2b8e2746329e - main - x11/mate-applets: updated to 1.26.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ericbsd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b8e2746329e81543f0502f64c41321bf0447ac7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ericbsd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b8e2746329e81543f0502f64c41321bf0447ac7 commit 2b8e2746329e81543f0502f64c41321bf0447ac7 Author: Eric Turgeon AuthorDate: 2021-10-12 23:21:55 +0000 Commit: Eric Turgeon CommitDate: 2021-10-12 23:30:20 +0000 x11/mate-applets: updated to 1.26.0 --- x11/mate-applets/Makefile | 16 +- x11/mate-applets/distinfo | 6 +- .../files/patch-battstat_power-management.c | 35 +- x11/mate-applets/files/patch-configure | 114 +- x11/mate-applets/files/patch-cpufreq-freebsd | 364 +++-- .../files/patch-cpufreq-selector-freebsd | 207 ++- .../files/patch-cpufreq_src_cpufreq-applet.c | 18 + x11/mate-applets/pkg-plist | 1687 ++++++++++---------- 8 files changed, 1251 insertions(+), 1196 deletions(-) diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile index 3d2701c27188..e68270761f6b 100644 --- a/x11/mate-applets/Makefile +++ b/x11/mate-applets/Makefile @@ -1,5 +1,5 @@ PORTNAME= mate-applets -PORTVERSION= 1.24.1 +PORTVERSION= 1.26.0 CATEGORIES= x11 mate MASTER_SITES= MATE DIST_SUBDIR= mate @@ -32,6 +32,8 @@ USE_GNOME= cairo gtk30 gtksourceview3 intltool libwnck3 libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= OS_SYS="/usr/include" +CONFIGURE_ARGS= --without-nl + INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.mate.drivemount.gschema.xml \ @@ -56,13 +58,13 @@ PLIST_SUB+= BATTERY="" .endif # requires linux libcpufreq library -#.if ${ARCH} != "i386" && ${ARCH} != "amd64" +# .if ${ARCH} != "i386" && ${ARCH} != "amd64" CONFIGURE_ARGS+=--disable-cpufreq PLIST_SUB+= CPUFREQ="@comment " -#.else -#CONFIGURE_ARGS+=--enable-cpufreq -#PLIST_SUB+= CPUFREQ="" -#GLIB_SCHEMAS+= org.mate.panel.applet.cpufreq.gschema.xml -#.endif +# .else +# CONFIGURE_ARGS+=--enable-cpufreq +# PLIST_SUB+= CPUFREQ="" +# GLIB_SCHEMAS+= org.mate.panel.applet.cpufreq.gschema.xml +# .endif .include diff --git a/x11/mate-applets/distinfo b/x11/mate-applets/distinfo index 4160b8479b8a..fbcbe452642b 100644 --- a/x11/mate-applets/distinfo +++ b/x11/mate-applets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601840518 -SHA256 (mate/mate-applets-1.24.1.tar.xz) = d76f6be9aa19451b52b4f354d9f846a572810c40c27eb2df3d01cc353a89e040 -SIZE (mate/mate-applets-1.24.1.tar.xz) = 8222540 +TIMESTAMP = 1633998272 +SHA256 (mate/mate-applets-1.26.0.tar.xz) = b7e0439b4e0c754233c2988644faa3f6ab6270970061b7a0c635d68d236fc977 +SIZE (mate/mate-applets-1.26.0.tar.xz) = 8442720 diff --git a/x11/mate-applets/files/patch-battstat_power-management.c b/x11/mate-applets/files/patch-battstat_power-management.c index 256365e2add2..c99254f7c28a 100644 --- a/x11/mate-applets/files/patch-battstat_power-management.c +++ b/x11/mate-applets/files/patch-battstat_power-management.c @@ -1,6 +1,6 @@ ---- battstat/power-management.c.orig 2015-01-22 10:16:53.000000000 +0100 -+++ battstat/power-management.c 2015-01-22 17:29:57.507849366 +0100 -@@ -67,6 +67,10 @@ +--- battstat/power-management.c.orig 2021-08-07 11:25:17 UTC ++++ battstat/power-management.c +@@ -63,6 +63,10 @@ static const char *apm_readinfo (BatteryStatus *status); static int pm_initialised; @@ -11,7 +11,7 @@ #ifdef HAVE_UPOWER static int using_upower; #endif -@@ -178,16 +182,40 @@ +@@ -174,38 +178,69 @@ apm_readinfo (BatteryStatus *status) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) @@ -52,19 +52,22 @@ static const char * apm_readinfo (BatteryStatus *status) { -@@ -195,21 +223,27 @@ - - if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + int fd; +- ++ gboolean read_error; + if (DEBUG) g_print ("apm_readinfo () (FreeBSD)\n"); - if (using_acpi) { + if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { if (acpi_count <= 0) { acpi_count = 30; -- acpi_process_event(&acpiinfo); +- acpi_process_event (&acpiinfo); +- if (acpi_freebsd_read (&apminfo, &acpiinfo) == FALSE) ++ acpi_process_event(&acpiinfo, &read_error); + if (!acpiinfo.event_inited) { + acpi_freebsd_update(&acpiinfo); + } - if (acpi_freebsd_read(&apminfo, &acpiinfo) == FALSE) ++ if (acpi_freebsd_read(&apminfo, &acpiinfo) == FALSE) return ERR_FREEBSD_ACPI; } acpi_count--; @@ -79,18 +82,18 @@ + if (acpi_freebsd_init(&acpiinfo)) { + acpiwatch = g_io_add_watch (acpiinfo.channel, + G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); ++ acpi_callback, NULL); + acpi_freebsd_read(&apminfo, &acpiinfo); + } + } + else { +#if defined(__i386__) - fd = open(APMDEVICE, O_RDONLY); + fd = open (APMDEVICE, O_RDONLY); if (fd == -1) { return ERR_OPEN_APMDEV; -@@ -222,6 +256,9 @@ +@@ -218,6 +253,9 @@ apm_readinfo (BatteryStatus *status) - if(apminfo.ai_status == 0) + if (apminfo.ai_status == 0) return ERR_APM_E; +#else + return ERR_OPEN_APMDEV; @@ -98,7 +101,7 @@ } status->present = TRUE; -@@ -483,6 +520,12 @@ +@@ -484,6 +522,12 @@ power_management_initialise (void (*callback) (void)) } else using_acpi = FALSE; @@ -111,13 +114,13 @@ #endif pm_initialised = 1; -@@ -516,6 +559,9 @@ +@@ -517,6 +561,9 @@ power_management_cleanup (void) } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) if (using_acpi) { + if (acpiwatch != 0) + g_source_remove(acpiwatch); + acpiwatch = 0; - acpi_freebsd_cleanup(&acpiinfo); + acpi_freebsd_cleanup (&acpiinfo); } #endif diff --git a/x11/mate-applets/files/patch-configure b/x11/mate-applets/files/patch-configure index a1e27fb886e6..eec0292184ca 100644 --- a/x11/mate-applets/files/patch-configure +++ b/x11/mate-applets/files/patch-configure @@ -1,6 +1,78 @@ ---- configure.orig 2016-02-01 10:05:32.777229000 +0100 -+++ configure 2016-02-01 10:05:56.624276000 +0100 -@@ -16587,7 +16587,7 @@ +--- configure.orig 2021-08-07 11:28:45 UTC ++++ configure +@@ -9534,7 +9534,7 @@ $as_echo_n "checking whether the $compiler linker ($LD + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no +- link_all_deplibs=unknown ++ link_all_deplibs=no + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= +@@ -9833,7 +9833,7 @@ _LT_EOF + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' + fi + ;; + +@@ -9852,7 +9852,7 @@ _LT_EOF + _LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -9881,7 +9881,7 @@ _LT_EOF + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -9899,7 +9899,7 @@ _LT_EOF + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' +- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib' + else + ld_shlibs=no + fi +@@ -10547,7 +10547,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' ++ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' + else +@@ -11396,7 +11396,7 @@ freebsd* | dragonfly*) + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ++ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no +@@ -12531,7 +12531,7 @@ striplib= + old_striplib= + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 + $as_echo_n "checking whether stripping libraries is possible... " >&6; } +-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +@@ -17173,7 +17173,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -9,7 +81,7 @@ ac_define_dir=`eval echo $ac_define_dir` MATELOCALEDIR="$ac_define_dir" -@@ -17434,7 +17434,7 @@ +@@ -17595,7 +17595,7 @@ fi ;; # list of supported OS cores that do not use libapm @@ -18,16 +90,7 @@ if test -n "${OS_SYS}"; then ACPIINC="-I${OS_SYS}" else -@@ -17949,7 +17952,7 @@ - - test "x$prefix" = xNONE && prefix="$ac_default_prefix" - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -- ac_define_dir=`eval echo $"${iconsdir}"` -+ ac_define_dir=`eval echo $iconsdir` - ac_define_dir=`eval echo $ac_define_dir` - MATE_ICONDIR="$ac_define_dir" - -@@ -17962,7 +17965,7 @@ +@@ -18421,7 +18421,7 @@ pkgdatadir="${datadir}/mate-applets" test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -36,7 +99,7 @@ ac_define_dir=`eval echo $ac_define_dir` MATE_PIXMAPSDIR="$ac_define_dir" -@@ -17975,7 +17978,7 @@ +@@ -18434,7 +18434,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -45,16 +108,7 @@ ac_define_dir=`eval echo $ac_define_dir` PKGDATADIR="$ac_define_dir" -@@ -17988,7 +17991,7 @@ - - test "x$prefix" = xNONE && prefix="$ac_default_prefix" - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -- ac_define_dir=`eval echo $"${builderdir}"` -+ ac_define_dir=`eval echo $builderdir` - ac_define_dir=`eval echo $ac_define_dir` - GTK_BUILDERDIR="$ac_define_dir" - -@@ -18001,7 +18004,7 @@ +@@ -18447,7 +18447,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -63,7 +117,7 @@ ac_define_dir=`eval echo $ac_define_dir` DATADIR="$ac_define_dir" -@@ -18014,7 +18017,7 @@ +@@ -18460,7 +18460,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -72,7 +126,7 @@ ac_define_dir=`eval echo $ac_define_dir` PKG_DATA_DIR="$ac_define_dir" -@@ -18027,7 +18030,7 @@ +@@ -18473,7 +18473,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -81,7 +135,7 @@ ac_define_dir=`eval echo $ac_define_dir` SYSCONFDIR="$ac_define_dir" -@@ -18040,7 +18043,7 @@ +@@ -18486,7 +18486,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -90,7 +144,7 @@ ac_define_dir=`eval echo $ac_define_dir` LIBDIR="$ac_define_dir" -@@ -18053,7 +18056,7 @@ +@@ -18499,7 +18499,7 @@ _ACEOF test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -99,7 +153,7 @@ ac_define_dir=`eval echo $ac_define_dir` PREFIX="$ac_define_dir" -@@ -18066,7 +18069,7 @@ +@@ -18512,7 +18512,7 @@ _ACEOF EXP_VAR=DATADIR diff --git a/x11/mate-applets/files/patch-cpufreq-freebsd b/x11/mate-applets/files/patch-cpufreq-freebsd index d10859f40719..7380792d9f7f 100644 --- a/x11/mate-applets/files/patch-cpufreq-freebsd +++ b/x11/mate-applets/files/patch-cpufreq-freebsd @@ -1,6 +1,26 @@ ---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Jun 15 01:01:54 2006 -+++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sat Jun 17 13:48:19 2006 -@@ -22,6 +22,10 @@ +--- cpufreq/src/Makefile.am.orig 2021-08-07 11:25:17 UTC ++++ cpufreq/src/Makefile.am +@@ -33,6 +33,8 @@ else + mate_cpufreq_applet_SOURCES += \ + cpufreq-monitor-cpuinfo.c \ + cpufreq-monitor-cpuinfo.h \ ++ cpufreq-monitor-sysctl.c \ ++ cpufreq-monitor-sysctl.h \ + cpufreq-monitor-sysfs.c \ + cpufreq-monitor-sysfs.h + endif +--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig 2021-08-07 11:25:17 UTC ++++ cpufreq/src/cpufreq-monitor-cpuinfo.c +@@ -16,7 +16,7 @@ + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * +- * Authors : Carlos García Campos ++ * Authors : Carlos Garcia Campos + */ + + #ifdef HAVE_CONFIG_H +@@ -26,6 +26,10 @@ #include #include @@ -11,214 +31,98 @@ #include #include -@@ -59,15 +63,20 @@ cpufreq_monitor_cpuinfo_new (guint cpu) +@@ -62,15 +66,19 @@ cpufreq_monitor_cpuinfo_new (guint cpu) static gboolean cpufreq_monitor_cpuinfo_run (CPUFreqMonitor *monitor) { +#ifndef __FreeBSD__ - gchar *file; - gchar **lines; - gchar *buffer = NULL; - gchar *p; + gchar *file; + gchar **lines; + gchar *buffer = NULL; + gchar *p; +#else -+ size_t len; ++ size_t len; +#endif /* __FreeBSD__ */ - gint cpu, i; - gint cur_freq, max_freq; - gchar *governor; - GError *error = NULL; - + gint cpu, i; + gint cur_freq, max_freq; + gchar *governor; + GError *error = NULL; +- +#ifndef __FreeBSD__ - file = g_strdup ("/proc/cpuinfo"); - if (!g_file_get_contents (file, &buffer, NULL, &error)) { - g_warning (error->message); -@@ -112,6 +121,12 @@ cpufreq_monitor_cpuinfo_run (CPUFreqMoni + file = g_strdup ("/proc/cpuinfo"); + if (!cpufreq_file_get_contents (file, &buffer, NULL, &error)) { + g_warning ("%s", error->message); +@@ -115,7 +123,12 @@ cpufreq_monitor_cpuinfo_run (CPUFreqMonitor *monitor) - g_strfreev (lines); - g_free (buffer); + g_strfreev (lines); + g_free (buffer); +#else -+ len = sizeof (cpu); -+ -+ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) -+ return FALSE; ++ len = sizeof (cpu); + ++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) ++ return FALSE; +#endif /* __FreeBSD__ */ - - governor = g_strdup (_("Frequency Scaling Unsupported")); - cur_freq = cpu * 1000; ---- cpufreq/src/cpufreq-applet.c.orig 2016-04-01 10:54:10.000000000 +0200 -+++ cpufreq/src/cpufreq-applet.c 2016-04-19 13:56:00.550008000 +0200 + governor = g_strdup (_("Frequency Scaling Unsupported")); + cur_freq = cpu * 1000; + max_freq = cur_freq; +--- cpufreq/src/cpufreq-monitor-factory.c.orig 2021-08-07 11:25:17 UTC ++++ cpufreq/src/cpufreq-monitor-factory.c @@ -17,6 +17,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - * Authors : Carlos García Campos -+ * Joe Marcus Clarke - */ - - #ifdef HAVE_CONFIG_H -@@ -678,6 +679,7 @@ - { - static const gchar *const authors[] = { - "Carlos Garcia Campos ", -+ "Joe Marcus Clarke (FreeBSD support)", - NULL - }; - static const gchar *const documenters[] = { ---- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sat Jun 17 14:05:37 2006 -+++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Jun 17 14:14:13 2006 -@@ -0,0 +1,49 @@ -+/* -+ * Copyright (C) 2001, 2002 Free Software Foundation -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public -+ * License along with this library; if not, write to the Free -+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * Authors : Joe Marcus Clarke -+ */ -+ -+#ifndef __CPUFREQ_MONITOR_SYSCTL_H__ -+#define __CPUFREQ_MONITOR_SYSCTL_H__ -+ -+#include -+ -+#include "cpufreq-monitor.h" -+ -+#define TYPE_CPUFREQ_MONITOR_SYSCTL (cpufreq_monitor_sysctl_get_type ()) -+#define CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctl)) -+#define CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass)) -+#define IS_CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL)) -+#define IS_CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_MONITOR_SYSCTL)) -+#define CPUFREQ_MONITOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass)) -+ -+typedef struct _CPUFreqMonitorSysctl CPUFreqMonitorSysctl; -+typedef struct _CPUFreqMonitorSysctlClass CPUFreqMonitorSysctlClass; -+ -+struct _CPUFreqMonitorSysctl { -+ CPUFreqMonitor parent; -+}; -+ -+struct _CPUFreqMonitorSysctlClass { -+ CPUFreqMonitorClass parent_class; -+}; -+ -+GType cpufreq_monitor_sysctl_get_type (void) G_GNUC_CONST; -+CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); -+ -+#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-monitor-factory.c.orig Sat Jun 17 06:28:02 2006 -+++ cpufreq/src/cpufreq-monitor-factory.c Sat Jun 24 01:45:54 2006 -@@ -17,6 +17,7 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * * Authors : Carlos García Campos + * Joe Marcus Clarke */ #ifdef HAVE_CONFIG_H -@@ -25,11 +26,18 @@ - +@@ -26,8 +27,16 @@ #include #include + +#ifdef __FreeBSD__ +#include +#include +#endif /* __FreeBSD__ */ - ++ #include "cpufreq-applet.h" #include "cpufreq-utils.h" - #include "cpufreq-monitor-sysfs.h" - #include "cpufreq-monitor-procfs.h" +#ifdef __FreeBSD__ +#include "cpufreq-monitor-sysctl.h" +#endif /* __FreeBSD__ */ - #include "cpufreq-monitor-cpuinfo.h" + #include "cpufreq-monitor-factory.h" #ifdef HAVE_LIBCPUFREQ #include "cpufreq-monitor-libcpufreq.h" -@@ -40,6 +48,7 @@ CPUFreqMonitor * - cpufreq_monitor_factory_create_monitor (guint cpu) - { - CPUFreqMonitor *monitor = NULL; +@@ -43,7 +52,7 @@ cpufreq_monitor_factory_create_monitor (guint cpu) + return cpufreq_monitor_libcpufreq_new (cpu); + #else + CPUFreqMonitor *monitor = NULL; +- +#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { + monitor = cpufreq_monitor_sysfs_new (cpu); + } else if (g_file_test ("/proc/cpuinfo", G_FILE_TEST_EXISTS)) { +@@ -59,7 +68,19 @@ cpufreq_monitor_factory_create_monitor (guint cpu) - #ifdef HAVE_LIBCPUFREQ - monitor = cpufreq_monitor_libcpufreq_new (cpu); -@@ -63,6 +72,19 @@ cpufreq_monitor_factory_create_monitor ( - - monitor = cpufreq_monitor_cpuinfo_new (cpu); - } + monitor = cpufreq_monitor_cpuinfo_new (cpu); + } +#else -+ size_t len; -+ -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ monitor = cpufreq_monitor_sysctl_new (cpu); -+ } else { -+ cpufreq_utils_display_error (_("CPU frequency scaling unsupported"), -+ _("You will not be able to modify the frequency of your machine. " -+ "Your machine may be misconfigured or not have hardware support " -+ "for CPU frequency scaling.")); -+ monitor = cpufreq_monitor_cpuinfo_new (cpu); -+ } -+#endif /* __FreeBSD__ */ - - return monitor; - } ---- cpufreq/src/cpufreq-utils.c.orig Sat Aug 12 21:26:50 2006 -+++ cpufreq/src/cpufreq-utils.c Tue Aug 22 11:07:32 2006 -@@ -22,6 +22,9 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif - #include - #include - #include -@@ -30,6 +33,24 @@ - - #include "cpufreq-utils.h" ++ size_t len; -+#ifdef __FreeBSD__ -+guint -+cpufreq_utils_get_n_cpus (void) -+{ -+ size_t len; -+ static guint n_cpus = 0; -+ -+ if (n_cpus > 0) -+ return n_cpus; -+ -+ len = sizeof (n_cpus); -+ if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) { -+ return 1; -+ } -+ -+ return n_cpus; -+} -+#else - guint - cpufreq_utils_get_n_cpus (void) - { -@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void) - - return 1; - } ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ monitor = cpufreq_monitor_sysctl_new (cpu); ++ } else { ++ cpufreq_utils_display_error (_("CPU frequency scaling unsupported"), ++ ("You will not be able to modify the frequency of your machine. " ++ "Your machine may be misconfigured or not have hardware support " ++ "for CPU frequency scaling.")); ++ monitor = cpufreq_monitor_cpuinfo_new (cpu); ++ } +#endif /* __FreeBSD__ */ - - void - cpufreq_utils_display_error (const gchar *message, ---- cpufreq/src/cpufreq-monitor-sysctl.c.orig 2010-05-13 11:27:57.000000000 +0200 -+++ cpufreq/src/cpufreq-monitor-sysctl.c 2010-05-13 11:36:13.000000000 +0200 + return monitor; + #endif + } +--- cpufreq/src/cpufreq-monitor-sysctl.c.orig 2021-10-12 00:51:41 UTC ++++ cpufreq/src/cpufreq-monitor-sysctl.c @@ -0,0 +1,184 @@ +/* + * Copyright (C) 2001, 2002 Free Software Foundation @@ -404,15 +308,103 @@ + return list; +} +#endif /* __FreeBSD__ */ ---- cpufreq/src/Makefile.am.orig 2012-07-29 15:37:51.000000000 -0500 -+++ cpufreq/src/Makefile.am 2012-07-29 15:40:00.000000000 -0500 -@@ -27,7 +27,8 @@ - cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ - cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ - $(cpufreq_files) \ -- cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h -+ cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h \ -+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h +--- cpufreq/src/cpufreq-monitor-sysctl.h.orig 2021-10-12 00:51:41 UTC ++++ cpufreq/src/cpufreq-monitor-sysctl.h +@@ -0,0 +1,49 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke ++ */ ++ ++#ifndef __CPUFREQ_MONITOR_SYSCTL_H__ ++#define __CPUFREQ_MONITOR_SYSCTL_H__ ++ ++#include ++ ++#include "cpufreq-monitor.h" ++ ++#define TYPE_CPUFREQ_MONITOR_SYSCTL (cpufreq_monitor_sysctl_get_type ()) ++#define CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctl)) ++#define CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass)) ++#define IS_CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL)) ++#define IS_CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_MONITOR_SYSCTL)) ++#define CPUFREQ_MONITOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass)) ++ ++typedef struct _CPUFreqMonitorSysctl CPUFreqMonitorSysctl; ++typedef struct _CPUFreqMonitorSysctlClass CPUFreqMonitorSysctlClass; ++ ++struct _CPUFreqMonitorSysctl { ++ CPUFreqMonitor parent; ++}; ++ ++struct _CPUFreqMonitorSysctlClass { ++ CPUFreqMonitorClass parent_class; ++}; ++ ++GType cpufreq_monitor_sysctl_get_type (void) G_GNUC_CONST; ++CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); ++ ++#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ +--- cpufreq/src/cpufreq-utils.c.orig 2021-08-07 11:25:17 UTC ++++ cpufreq/src/cpufreq-utils.c +@@ -24,6 +24,9 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include + #include + #include +@@ -36,9 +39,27 @@ + #include + #endif /* HAVE_POLKIT */ - cpufreq_applet_LDADD = \ - $(MATE_APPLETS3_LIBS) \ ++#ifdef __FreeBSD__ + guint + cpufreq_utils_get_n_cpus (void) + { ++ size_t len; ++ static guint n_cpus = 0; ++ ++ if (n_cpus > 0) ++ return n_cpus; ++ ++ len = sizeof (n_cpus); ++ if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) { ++ return 1; ++ } ++ ++ return n_cpus; ++} ++#else ++guint ++cpufreq_utils_get_n_cpus (void) ++{ + gint mcpu = -1; + gchar *file = NULL; + static guint n_cpus = 0; +@@ -78,6 +99,7 @@ cpufreq_utils_get_n_cpus (void) + + return 1; + } ++#endif /* __FreeBSD__ */ + + void + cpufreq_utils_display_error (const gchar *message, diff --git a/x11/mate-applets/files/patch-cpufreq-selector-freebsd b/x11/mate-applets/files/patch-cpufreq-selector-freebsd index 1ab5faa0542b..f625994ebf07 100644 --- a/x11/mate-applets/files/patch-cpufreq-selector-freebsd +++ b/x11/mate-applets/files/patch-cpufreq-selector-freebsd @@ -1,61 +1,50 @@ ---- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h.orig Sat Jun 24 01:52:35 2006 -+++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h Sat Jun 24 02:13:05 2006 -@@ -0,0 +1,53 @@ -+/* -+ * Copyright (C) 2001, 2002 Free Software Foundation -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public -+ * License along with this library; if not, write to the Free -+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * Authors : Joe Marcus Clarke -+ */ -+ -+#ifndef __CPUFREQ_SELECTOR_SYSCTL_H__ -+#define __CPUFREQ_SELECTOR_SYSCTL_H__ -+ -+#include -+ -+#include "cpufreq-selector.h" -+ -+G_BEGIN_DECLS -+ -+#define CPUFREQ_TYPE_SELECTOR_SYSCTL (cpufreq_selector_sysctl_get_type ()) -+#define CPUFREQ_SELECTOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfs)) -+#define CPUFREQ_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass)) -+#define CPUFREQ_IS_SELECTOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL)) -+#define CPUFREQ_IS_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL)) -+#define CPUFREQ_SELECTOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass)) -+ -+typedef struct _CPUFreqSelectorSysctl CPUFreqSelectorSysctl; -+typedef struct _CPUFreqSelectorSysctlClass CPUFreqSelectorSysctlClass; -+ -+struct _CPUFreqSelectorSysctl { -+ CPUFreqSelector parent; -+}; -+ -+struct _CPUFreqSelectorSysctlClass { -+ CPUFreqSelectorClass parent_class; -+}; -+ -+GType cpufreq_selector_sysctl_get_type (void) G_GNUC_CONST; -+CPUFreqSelector *cpufreq_selector_sysctl_new (guint cpu); -+ -+G_END_DECLS -+ -+#endif /* __CPUFREQ_SELECTOR_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c.orig Wed Jul 26 01:34:18 2006 -+++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c Wed Jul 26 01:42:00 2006 +--- cpufreq/src/cpufreq-selector/Makefile.am.orig 2021-08-07 11:25:17 UTC ++++ cpufreq/src/cpufreq-selector/Makefile.am +@@ -24,7 +24,7 @@ mate_cpufreq_selector_SOURCES = \ + $(service_files) \ + cpufreq-selector-factory.c cpufreq-selector-factory.h \ + $(BUILT_SOURCES) \ +- main.c ++ main.c cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h + + if HAVE_LIBCPUFREQ + mate_cpufreq_selector_SOURCES += \ +--- cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c.orig 2021-08-07 11:25:17 UTC ++++ cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c +@@ -27,19 +27,29 @@ + #else + #include "cpufreq-selector-sysfs.h" + #endif ++#ifdef __FreeBSD__ ++#include "cpufreq-selector-sysctl.h" ++#endif /* __FreeBSD__ */ + + CPUFreqSelector * + cpufreq_selector_factory_create_selector (guint cpu) + { ++#ifdef __FreeBSD__ ++ size_t len; ++#endif + #ifdef HAVE_LIBCPUFREQ + return cpufreq_selector_libcpufreq_new (cpu); + #else + CPUFreqSelector *selector = NULL; +- ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { + selector = cpufreq_selector_sysfs_new (cpu); + } +- ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ selector = cpufreq_selector_sysctl_new (cpu); ++ } ++#endif /* __FreeBSD__ */ + return selector; + #endif /* HAVE_LIBCPUFREQ */ + } +--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c.orig 2021-10-12 01:37:36 UTC ++++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2001, 2002 Free Software Foundation @@ -144,49 +133,59 @@ + + return TRUE; +} ---- cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c.orig 2008-06-16 14:33:25.000000000 -0400 -+++ cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2008-06-16 14:35:28.000000000 -0400 -@@ -27,20 +27,32 @@ - #ifdef HAVE_LIBCPUFREQ - #include "cpufreq-selector-libcpufreq.h" - #endif -+#ifdef __FreeBSD__ -+#include "cpufreq-selector-sysctl.h" -+#endif /* __FreeBSD__ */ - - CPUFreqSelector * - cpufreq_selector_factory_create_selector (guint cpu) - { - CPUFreqSelector *selector = NULL; -+#ifdef __FreeBSD__ -+ size_t len; -+#endif - - #ifdef HAVE_LIBCPUFREQ - selector = cpufreq_selector_libcpufreq_new (cpu); - #else -+#ifndef __FreeBSD__ - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - selector = cpufreq_selector_sysfs_new (cpu); - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ - selector = cpufreq_selector_procfs_new (cpu); - } -+#else -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ selector = cpufreq_selector_sysctl_new (cpu); -+ } -+#endif /* __FreeBSD__ */ - #endif /* HAVE_LIBCPUFREQ */ - - return selector; ---- cpufreq/src/cpufreq-selector/Makefile.am.orig 2012-07-29 15:41:47.000000000 -0500 -+++ cpufreq/src/cpufreq-selector/Makefile.am 2012-07-29 15:42:08.000000000 -0500 -@@ -32,7 +32,7 @@ - $(service_files) \ - cpufreq-selector-factory.c cpufreq-selector-factory.h \ - $(BUILT_SOURCES) \ -- main.c -+ main.c cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h - - mate_cpufreq_selector_LDADD = \ - $(CPUFREQ_SELECTOR_LIBS) \ +--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h.orig 2021-10-12 01:37:36 UTC ++++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h +@@ -0,0 +1,53 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke ++ */ ++ ++#ifndef __CPUFREQ_SELECTOR_SYSCTL_H__ ++#define __CPUFREQ_SELECTOR_SYSCTL_H__ ++ ++#include ++ ++#include "cpufreq-selector.h" ++ ++G_BEGIN_DECLS ++ ++#define CPUFREQ_TYPE_SELECTOR_SYSCTL (cpufreq_selector_sysctl_get_type ()) ++#define CPUFREQ_SELECTOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfs)) ++#define CPUFREQ_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass)) ++#define CPUFREQ_IS_SELECTOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL)) ++#define CPUFREQ_IS_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL)) ++#define CPUFREQ_SELECTOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass)) ++ ++typedef struct _CPUFreqSelectorSysctl CPUFreqSelectorSysctl; ++typedef struct _CPUFreqSelectorSysctlClass CPUFreqSelectorSysctlClass; ++ ++struct _CPUFreqSelectorSysctl { ++ CPUFreqSelector parent; ++}; ++ ++struct _CPUFreqSelectorSysctlClass { *** 2587 LINES SKIPPED ***