diff --git a/mate-applets-1.22.2.tar.xz b/mate-applets-1.22.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..6f4dd9a6ee260624f593272db0f73fd4e9e16fb8 Binary files /dev/null and b/mate-applets-1.22.2.tar.xz differ diff --git a/mate-applets.spec b/mate-applets.spec new file mode 100644 index 0000000000000000000000000000000000000000..cc2821fd795b1534c931d434376066bdda5e935b --- /dev/null +++ b/mate-applets.spec @@ -0,0 +1,418 @@ +# Conditional for release and snapshot builds. Uncomment for release-builds. +%global rel_build 1 + +# This is needed, because src-url contains branched part of versioning-scheme. +%global branch 1.22 + +# Settings used for build from snapshots. +%{!?rel_build:%global commit c3b48ea39ab358b45048e300deafaa3f569748ad} +%{!?rel_build:%global commit_date 20140211} +%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} +%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}} +%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}} +%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} + +Name: mate-applets +Version: %{branch}.2 +%if 0%{?rel_build} +Release: 1%{?dist} +%else +Release: 0.11%{?git_rel}%{?dist} +%endif +Summary: MATE Desktop panel applets +License: GPLv2+ and LGPLv2+ +URL: http://mate-desktop.org + +# for downloading the tarball use 'spectool -g -R mate-applets.spec' +# Source for release-builds. +%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz} +# Source for snapshot-builds. +%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} + +# fix build for s390x arch +Patch1: mate-applets_0001-Revert-Make-cpufreq-builds-independent-from-kernel-h.patch + +BuildRequires: gucharmap-devel +BuildRequires: libgtop2-devel +BuildRequires: libnotify-devel +BuildRequires: libmateweather-devel +BuildRequires: libwnck3-devel +BuildRequires: libxml2-devel +BuildRequires: libICE-devel +BuildRequires: libSM-devel +BuildRequires: mate-common +BuildRequires: mate-settings-daemon-devel +BuildRequires: mate-notification-daemon +BuildRequires: mate-panel-devel +BuildRequires: polkit-devel +BuildRequires: startup-notification-devel +Buildrequires: upower-devel +Buildrequires: gtksourceview3-devel +BuildRequires: wireless-tools-devel +%ifnarch s390 s390x sparc64 +BuildRequires: kernel-tools-libs-devel +%endif + +Provides: mate-netspeed%{?_isa} = %{version}-%{release} +Provides: mate-netspeed = %{version}-%{release} +Obsoletes: mate-netspeed < %{version}-%{release} + + +%description +MATE Desktop panel applets + +%prep +%if 0%{?rel_build} +%autosetup -p1 +%else +%autosetup -n %{name}-%{commit} -p1 +%endif + +%if 0%{?rel_build} +#NOCONFIGURE=1 ./autogen.sh +%else # 0%{?rel_build} +# needed for git snapshots +NOCONFIGURE=1 ./autogen.sh +%endif # 0%{?rel_build} + +# Patch1 +NOCONFIGURE=1 ./autogen.sh + +%build +%configure \ + --disable-schemas-compile \ + --disable-static \ + --with-x \ + --enable-polkit \ + --enable-ipv6 \ + --enable-stickynotes \ + --libexecdir=%{_libexecdir}/mate-applets \ + --with-cpufreq-lib=cpupower + +make %{?_smp_mflags} V=1 + +%install +%{make_install} + +%find_lang %{name} --with-gnome --all-name + + +%files -f %{name}.lang +%doc AUTHORS COPYING README +%{_bindir}/mate-cpufreq-selector +%{_libexecdir}/mate-applets +%config(noreplace) %{_sysconfdir}/sound/events/mate-battstat_applet.soundlist +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.mate.CPUFreqSelector.conf +%{_datadir}/mate-applets +%{_datadir}/mate-panel/applets +%{_datadir}/dbus-1/services/org.mate.panel.applet.CommandAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.TimerAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.AccessxStatusAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.BattstatAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.CharpickerAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.DriveMountAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.GeyesAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.StickyNotesAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.TrashAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.MateWeatherAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.MultiLoadAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.NetspeedAppletFactory.service +%{_datadir}/dbus-1/services/org.mate.panel.applet.CPUFreqAppletFactory.service +%{_datadir}/dbus-1/system-services/org.mate.CPUFreqSelector.service +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.battstat.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.charpick.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.drivemount.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.geyes.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.multiload.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.stickynotes.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.cpufreq.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.command.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.timer.gschema.xml +%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.netspeed.gschema.xml +%{_datadir}/polkit-1/actions/org.mate.cpufreqselector.policy +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/hicolor/*/devices/*.png +%{_datadir}/icons/hicolor/*/status/*.png +%{_datadir}/icons/hicolor/scalable/apps/*.svg +%{_mandir}/man1/* +%{_datadir}/mate/ui/accessx-status-applet-menu.xml +%{_datadir}/mate/ui/battstat-applet-menu.xml +%{_datadir}/mate/ui/charpick-applet-menu.xml +%{_datadir}/mate/ui/drivemount-applet-menu.xml +%{_datadir}/mate/ui/geyes-applet-menu.xml +%{_datadir}/mate/ui/stickynotes-applet-menu.xml +%{_datadir}/mate/ui/trashapplet-menu.xml +%{_datadir}/mate/ui/mateweather-applet-menu.xml +%{_datadir}/mate/ui/multiload-applet-menu.xml +%{_datadir}/mate/ui/cpufreq-applet-menu.xml +%{_datadir}/mate/ui/netspeed-menu.xml +%{_datadir}/pixmaps/mate-cpufreq-applet + + +%changelog +* Thu Sep 19 2019 Wolfgang Ulbrich - 1.22.2-1 +- update 1.22.2 release +- revert https://github.com/mate-desktop/mate-applets/commit/bd0cf4 +- to fix build for s390x arch + +* Thu Jul 25 2019 Fedora Release Engineering - 1.22.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 16 2019 Wolfgang Ulbrich - 1.22.1-3 +- bump version + +* Thu May 09 2019 Wolfgang Ulbrich - 1.22.1-2 +- multiload-applet, filter out non local disks and mounts +- fix https://github.com/mate-desktop/mate-applets/issues/395 +- cpufreq, add support for kernel-5.1.0 + +* Fri Apr 26 2019 Wolfgang Ulbrich - 1.22.1-1 +- update to 1.22.1 + +* Mon Mar 04 2019 Wolfgang Ulbrich - 1.22.0-1 +- update to 1.22.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.20.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 28 2019 Wolfgang Ulbrich - 1.20.3-2 +- fix https://github.com/mate-desktop/mate-applets/issues/230 +- fix rhbz (#1355867) +- use https://github.com/mate-desktop/mate-applets/commit/3b5b33a + +* Mon Dec 17 2018 Wolfgang Ulbrich - 1.20.3-1 +- update to 1.20.3 + +* Fri Jul 13 2018 Fedora Release Engineering - 1.20.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 01 2018 Wolfgang Ulbrich - 1.20.2-1 +- update to 1.20.2 + +* Tue Mar 27 2018 Wolfgang Ulbrich - 1.20.1-1 +- update to 1.20.1 + +* Mon Feb 12 2018 Wolfgang Ulbrich - 1.20.0-1 +- uppdate to 1.20.0 +- drop GSettings Schema rpm scriptlet +- drop IconCache rpm scriptlet +- switch to using autosetup + +* Thu Feb 08 2018 Fedora Release Engineering - 1.19.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 16 2018 Wolfgang Ulbrich - 1.19.4-1 +- update to 1.19.4 +- fix for https://github.com/mate-desktop/libmateweather/issues/51 +- fixing clock-applet crashes, rhbz (#1529899), (#1529897) +- drop invest applet + +* Tue Jan 16 2018 Wolfgang Ulbrich - 1.19.2-3 +- fixing clock-applet crashes, rhbz (#1529899), (#1529897) + +* Thu Nov 09 2017 Wolfgang Ulbrich - 1.19.2-2 +- add some upstream patches +- https://github.com/mate-desktop/mate-applets/commit/99f9632 +- https://github.com/mate-desktop/mate-applets/commit/d0abc32 +- https://github.com/mate-desktop/mate-applets/commit/721ebf7 + +* Tue Sep 12 2017 Wolfgang Ulbrich - 1.19.2-1 +- update to 1.19.2 release + +* Tue Sep 12 2017 Wolfgang Ulbrich - 1.19.1-2 +- use https://github.com/mate-desktop/mate-applets/commit/29c3ce44 + +* Sun Sep 10 2017 Wolfgang Ulbrich - 1.19.1-1 +- update to 1.19.1 release + +* Thu Aug 03 2017 Fedora Release Engineering - 1.19.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jul 24 2017 Wolfgang Ulbrich - 1.19.0-1 +- update to 1.19.0 release + +* Tue Jun 13 2017 Kalev Lember - 1.18.1-2 +- Rebuilt for libgtop2 soname bump + +* Fri Apr 07 2017 Wolfgang Ulbrich - 1.18.1-1 +- update 1.18.1 +- use cpufreq: set frequency on all cores from upstream + +* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 +- update to 1.18.0 release + +* Fri Feb 10 2017 Fedora Release Engineering - 1.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jan 14 2017 Wolfgang Ulbrich - 1.17.0-2 +- enable cpufreq-applet again + +* Tue Dec 06 2016 Wolfgang Ulbrich - 1.17.0-1 +- update 1.17.0 release +- disable cpufreq-applet temporary for kernel-4.9 + +* Thu Sep 22 2016 Wolfgang Ulbrich - 1.16.0-1 +- update to 1.16.0 release + +* Fri Sep 02 2016 Wolfgang Ulbrich - 1.15.2-1 +- update to 1.15.2 release + +* Mon Aug 01 2016 Wolfgang Ulbrich - 1.15.1-1 +- update to 1.15.1 release +- drop BR mate-desktop + +* Tue Jul 19 2016 Fedora Release Engineering - 1.15.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Jun 09 2016 Wolfgang Ulbrich - 1.15.0-1 +- update to 1.15.0 release +- switch to gtk+3 + +* Tue Apr 05 2016 Wolfgang Ulbrich - 1.14.0-1 +- update to 1.14.0 release + +* Fri Apr 01 2016 Wolfgang Ulbrich - 1.13.1-1 +- update to 1.13.1 release + +* Sun Feb 07 2016 Wolfgang Ulbrich - 1.13.0-1 +- update to 1.13.0 release + +* Thu Feb 04 2016 Fedora Release Engineering - 1.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Dec 02 2015 Wolfgang Ulbrich - 1.12.1-11 +- update to 1.12.1 release + +* Fri Nov 06 2015 Wolfgang Ulbrich - 1.12.0-1 +- update to 1.12.0 release + +* Thu Oct 22 2015 Wolfgang Ulbrich - 1.11.0-1 +- update to 1.11.0 release + +* Thu Jul 16 2015 Wolfgang Ulbrich - 1.10.3.1 +- update to 1.10.3 release + +* Tue Jul 14 2015 Wolfgang Ulbrich - 1.10.2.1 +- update to 1.10.2 release + +* Thu Jun 25 2015 Wolfgang Ulbrich - 1.10.1-1 +- update to 1.10.1 release + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue May 05 2015 Wolfgang Ulbrich - 1.10.0-1 +- update to 1.10.0 release + +* Sun Apr 05 2015 Wolfgang Ulbrich - 1.9.90-1 +- update to 1.9.90 release +- remove cpu-freq patch +- add --with-cpufreq-lib=cpupower flag + +* Thu Jan 22 2015 Wolfgang Ulbrich - 1.9.1-1 +- update to 1.9.1 release + +* Mon Aug 18 2014 Kalev Lember - 1.9.0-3 +- Rebuilt for upower 0.99.1 soname bump + +* Sun Aug 17 2014 Fedora Release Engineering - 1.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jul 12 2014 Wolfgang Ulbrich - 1.9.0-1 +- update to 1.9.0 release +- remove gucharmap BR for GTK2 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Apr 30 2014 Wolfgang Ulbrich - 1.8.0-2 +- rebuild for libgtop2 soname bump + +* Wed Mar 05 2014 Dan Mashal - 1.8.0-1 +- Update to 1.8.0 + +* Wed Feb 19 2014 Wolfgang Ulbrich - 1.7.90-1 +- update to 1.7.90 + +* Tue Feb 11 2014 Wolfgang Ulbrich 1.7.2-0.1.git20140211.c3b48ea +- update to git snapshot from 2014.02.11 +- add improved snapshot usage +- add gtksourceview2-devel BR for stickynotes +- update configure flags +- sort file section + +* Sun Feb 09 2014 Dan Mashal 1.7.1-1 +- Update to 1.7.1 + +* Mon Jan 20 2014 Wolfgang Ulbrich 1.7.0-1 +- update to 1.7.0 release +- update BR's +- add --with-gnome --all-name for find language +- use modern 'make install' macro +- clean up file section +- build without gucharmap support +- update configure flags + +* Wed Jan 1 2014 Wolfgang Ulbrich - 1.6.2-1 +- update to 1.6.2 release +- remove upstreamed upower patches + +* Sun Nov 10 2013 Wolfgang Ulbrich - 1.6.1-8 +- improve upower-1.0 adjustments + +* Thu Nov 07 2013 Wolfgang Ulbrich - 1.6.1-7 +- add patch for build against upower-1.0 +- clean up BRs + +* Fri Nov 01 2013 Wolfgang Ulbrich - 1.6.1-6 +- disable upower BR > f20, until we know to handle upower-1.0 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Jun 02 2013 Dan Horák - 1.6.1-4 +- kernel-tools-libs-devel isn't built on s390(x) and sparc64 + +* Sun Jun 02 2013 Wolfgang Ulbrich - 1.6.1-3 +- bump version + +* Sun Jun 02 2013 Wolfgang Ulbrich - 1.6.1-2 +- activate cpufreq applet +- build against mate-character-map instead of gurchmap +- remove stickynotes-applet.convert gsettings convert file +- add runtime require hicolor-icon-theme +- use polkit-devel as BR +- add BR libICE-devel and libSM-devel +- sort files section + +* Sat Apr 13 2013 Dan Mashal - 1.6.1-1 +- Update to latest upstream release + +* Wed Apr 03 2013 Dan Mashal - 1.6.0-1 +- Update to latest 1.6.0 stable release. + +* Tue Mar 12 2013 Dan Mashal - 1.5.2-2 +- Add libnotify-devel and hard requires on libnotify. mate-notification-daemon was switched to libnotify. + +* Mon Mar 11 2013 Dan Mashal - 1.5.2-1 +- Update to latest upstream release + +* Sun Feb 03 2013 - Dan Mashal - 1.5.1-5 +- Fix conflicts with gnome by adding libexec configure flag + +* Sun Feb 03 2013 - Dan Mashal - 1.5.1-4 +- Fix dist tag +- Remove duplicate files +- Sort BRs in alphabetical order + +* Sat Jan 26 2013 - Dan Mashal - 1.5.1-3 +- bump + +* Sat Jan 26 2013 Dan Mashal - 1.5.1-2 +- Add missing BR + +* Fri Jan 25 2013 - Dan Mashal - 1.5.1-1 +- Initial build diff --git a/mate-applets_0001-Revert-Make-cpufreq-builds-independent-from-kernel-h.patch b/mate-applets_0001-Revert-Make-cpufreq-builds-independent-from-kernel-h.patch new file mode 100644 index 0000000000000000000000000000000000000000..ce2f67a7ad694c81b23eadd1384fc73ae4816f85 --- /dev/null +++ b/mate-applets_0001-Revert-Make-cpufreq-builds-independent-from-kernel-h.patch @@ -0,0 +1,185 @@ +From 429c3ab30e69eec68f18ba9c7210ee9e417cdea5 Mon Sep 17 00:00:00 2001 +From: raveit65 +Date: Thu, 19 Sep 2019 19:17:43 +0200 +Subject: [PATCH] Revert "Make cpufreq builds independent from kernel header + version." + +This reverts commit bd0cf4893b267762cd35fb68f900b4be9de81138. +Try fixing fedora build for s390x arch +--- + configure.ac | 72 +++++++------------ + cpufreq/src/cpufreq-monitor-libcpufreq.c | 15 ++-- + .../cpufreq-selector-libcpufreq.c | 10 +-- + 3 files changed, 36 insertions(+), 61 deletions(-) + +diff --git a/configure.ac b/configure.ac +index af66e0ea..def3d96e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -357,51 +357,33 @@ if test "x$HAVE_POLKIT" = "xyes"; then + enable_suid=no + fi + +-build_cpufreq_applet=yes +-AS_IF([test "x$disable_cpufreq" = "xno"], [ +- case "${host}" in +- *linux*) +- AC_CHECK_HEADER([cpufreq.h], [ +- AC_CHECK_LIB([cpupower], [cpupower_is_cpu_online], [ +- AC_DEFINE([HAVE_IS_CPU_ONLINE], 1, +- [Define to 1 if cpupower_is_cpu_online() is available]) +- cpufreq_lib="cpupower" +- +- AC_CHECK_LIB([cpupower], [cpufreq_get_frequencies], [ +- AC_DEFINE([HAVE_GET_FREQUENCIES], 1, +- [Define to 1 if cpufreq_get_frequencies() is available]) +- ]) +- ], [ +- AC_CHECK_LIB([cpupower], [cpufreq_cpu_exists], [ +- cpufreq_lib="cpupower" +- ], [ +- AC_CHECK_LIB([cpufreq], [cpufreq_cpu_exists], [ +- cpufreq_lib="cpufreq" +- ], [cpufreq_lib=]) +- ]) +- ]) +- +- AS_IF([test "x$cpufreq_lib" != "x"], [ +- LIBCPUFREQ_LIBS="-l$cpufreq_lib" +- AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.]) +- AC_SUBST([LIBCPUFREQ_LIBS]) +- ], [ +- AC_MSG_WARN([*** cpufreq applet will not be built ***]) +- build_cpufreq_applet=no +- ]) +- ], [ +- AC_MSG_WARN([*** can't find cpufreq.h, cpufreq applet will not be built ***]) +- build_cpufreq_applet=no +- ]) +- ;; +- *) +- AC_MSG_WARN([${host} is not supported by cpufreq applet, not building]) +- build_cpufreq_applet=no +- ;; +- esac +-], [build_cpufreq_applet=no]) +- +-AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$cpufreq_lib != x) ++AC_ARG_WITH([cpufreq-lib], ++ AS_HELP_STRING([--with-cpufreq-lib=lib], [library to use for cpufreq applet @<:@default=cpufreq@:>@]), ++ [with_cpufreq_lib=$withval], [with_cpufreq_lib="cpupower"]) ++ ++AC_CHECK_HEADER(cpufreq.h, have_libcpufreq=yes, have_libcpufreq=no) ++LIBCPUFREQ_LIBS= ++if test "x$have_libcpufreq" = "xyes"; then ++ AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.]) ++ LIBCPUFREQ_LIBS="-l$with_cpufreq_lib" ++fi ++AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes) ++AC_SUBST(LIBCPUFREQ_LIBS) ++ ++build_cpufreq_applet=no ++ ++if test x$disable_cpufreq = xno; then ++ case "${host}" in ++ *linux*) ++ build_cpufreq_applet=yes ++ ;; ++ *) ++ AC_MSG_WARN([${host} is not supported by cpufreq applet, not building]) ++ build_cpufreq_applet=no ++ ;; ++ esac ++fi ++ + AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes) + AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes) + AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$enable_suid = xyes) +diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c +index dd2722ba..9821f2da 100644 +--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c ++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c +@@ -19,14 +19,11 @@ + * Authors : Carlos García Campos + */ + +-#ifdef HAVE_CONFIG_H +-#include "config.h" +-#endif +- + #include + #include + + #include ++#include + #include + #include "cpufreq-monitor-libcpufreq.h" + #include "cpufreq-utils.h" +@@ -39,12 +36,12 @@ static GList *cpufreq_monitor_libcpufreq_get_available_governors (CPUFreqMon + + G_DEFINE_TYPE (CPUFreqMonitorLibcpufreq, cpufreq_monitor_libcpufreq, CPUFREQ_TYPE_MONITOR) + +-#ifdef HAVE_GET_FREQUENCIES ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) ++typedef struct cpufreq_available_frequencies CPUFreqFrequencyList; ++#else + typedef struct cpufreq_frequencies CPUFreqFrequencyList; + #define cpufreq_get_available_frequencies(cpu) cpufreq_get_frequencies ("available", cpu) + #define cpufreq_put_available_frequencies(first) cpufreq_put_frequencies (first) +-#else +-typedef struct cpufreq_available_frequencies CPUFreqFrequencyList; + #endif + + typedef struct cpufreq_policy CPUFreqPolicy; +@@ -108,7 +105,7 @@ cpufreq_monitor_libcpufreq_new (guint cpu) + return CPUFREQ_MONITOR (monitor); + } + +-#ifdef HAVE_IS_CPU_ONLINE ++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0) + extern int cpupower_is_cpu_online (unsigned int cpu); + #endif + +@@ -125,7 +122,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor) + /* Check whether it failed because + * cpu is not online. + */ +-#ifndef HAVE_IS_CPU_ONLINE ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + if (!cpufreq_cpu_exists (cpu)) { + #else + if (cpupower_is_cpu_online (cpu)) { +diff --git a/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c b/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c +index d2fda2bf..f3d76e7e 100644 +--- a/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c ++++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-libcpufreq.c +@@ -19,10 +19,6 @@ + * Authors : Carlos García Campos + */ + +-#ifdef HAVE_CONFIG_H +-#include "config.h" +-#endif +- + #include + #include + #include +@@ -43,12 +39,12 @@ static gboolean cpufreq_selector_libcpufreq_set_governor (CPUFreqSelector + + G_DEFINE_TYPE (CPUFreqSelectorLibcpufreq, cpufreq_selector_libcpufreq, CPUFREQ_TYPE_SELECTOR) + +-#ifdef HAVE_GET_FREQUENCIES ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) ++typedef struct cpufreq_available_frequencies CPUFreqFrequencyList; ++#else + typedef struct cpufreq_frequencies CPUFreqFrequencyList; + #define cpufreq_get_available_frequencies(cpu) cpufreq_get_frequencies ("available", cpu) + #define cpufreq_put_available_frequencies(first) cpufreq_put_frequencies (first) +-#else +-typedef struct cpufreq_available_frequencies CPUFreqFrequencyList; + #endif + + typedef struct cpufreq_policy CPUFreqPolicy; +-- +2.21.0 +