Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-applets
Commits:
-
8a80121f
by Frédéric Bonnard at 2019-08-09T08:58:05Z
-
a29578af
by Mike Gabriel at 2019-08-09T08:59:30Z
5 changed files:
- debian/changelog
- debian/control
- − debian/patches/1000-fix-build-on-linux-4.7-or-newer.patch
- − debian/patches/series
- debian/rules
Changes:
1 |
+mate-applets (1.22.1-2) unstable; urgency=medium
|
|
2 |
+ |
|
3 |
+ [ Frédéric Bonnard ]
|
|
4 |
+ * Switch to libcpupower usage. (Closes: #930783).
|
|
5 |
+ |
|
6 |
+ -- Mike Gabriel <sunweaver@debian.org> Fri, 09 Aug 2019 10:56:01 +0200
|
|
7 |
+ |
|
1 | 8 |
mate-applets (1.22.1-1) unstable; urgency=medium
|
2 | 9 |
|
3 | 10 |
[ Martin Wimpress ]
|
... | ... | @@ -13,7 +13,7 @@ Build-Depends: cdbs, |
13 | 13 |
dh-exec,
|
14 | 14 |
dpkg-dev (>= 1.16.1.1),
|
15 | 15 |
intltool,
|
16 |
- libcpufreq-dev,
|
|
16 |
+ libcpupower-dev,
|
|
17 | 17 |
libdbus-1-dev,
|
18 | 18 |
libdbus-glib-1-dev,
|
19 | 19 |
libglib2.0-dev,
|
1 |
-Description: Fix building on systems with Linux >= 4.7
|
|
2 |
-Author: Martin Wimpress <code@flexion.org>
|
|
3 |
- |
|
4 |
-diff -rupN a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
|
|
5 |
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
|
|
6 |
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
|
|
7 |
-@@ -111,11 +111,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqM
|
|
8 |
- /* Check whether it failed because
|
|
9 |
- * cpu is not online.
|
|
10 |
- */
|
|
11 |
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
|
|
12 |
- if (!cpufreq_cpu_exists (cpu)) {
|
|
13 |
--#else
|
|
14 |
-- if (cpupower_is_cpu_online (cpu)) {
|
|
15 |
--#endif
|
|
16 |
- g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
|
|
17 |
- return TRUE;
|
|
18 |
- }
|
1 |
-1000-fix-build-on-linux-4.7-or-newer.patch
|
... | ... | @@ -23,7 +23,7 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ |
23 | 23 |
--libexecdir=/usr/lib/mate-applets \
|
24 | 24 |
--localstatedir=/var \
|
25 | 25 |
--disable-static \
|
26 |
- --with-cpufreq-lib=cpufreq
|
|
26 |
+ --with-cpufreq-lib=cpupower
|
|
27 | 27 |
|
28 | 28 |
common-install-indep:: remove-cruft
|
29 | 29 |
common-install-arch:: remove-cruft
|