Gentoo Archives: gentoo-commits

From: NP Hardass <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-mate:1.14-bump commit in: mate-base/mate-applets/files/
Date: Tue, 06 Sep 2016 02:13:51
Message-Id: 1473128017.392b343cf61c37528757f9343b573b833cabff3a.np-hardass@gentoo
1 commit: 392b343cf61c37528757f9343b573b833cabff3a
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 6 02:13:37 2016 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 6 02:13:37 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=392b343c
7
8 mate-base/mate-applets: Drop orphaned patch
9
10 Package-Manager: portage-2.3.0
11
12 ...lets-1.6.2-r1-replace-cpufreq-by-cpupower.patch | 79 ----------------------
13 1 file changed, 79 deletions(-)
14
15 diff --git a/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
16 deleted file mode 100644
17 index 880afc7..0000000
18 --- a/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
19 +++ /dev/null
20 @@ -1,79 +0,0 @@
21 -Obtained from: http://pkgs.fedoraproject.org/cgit/mate-applets.git/plain/cpufreq.patch
22 -
23 -diff -upr mate-applets-1.5.0-orig/configure.ac mate-applets-1.5.0/configure.ac
24 ---- mate-applets-1.5.0-orig/configure.ac 2012-12-08 22:37:32.000000000 +0100
25 -+++ mate-applets-1.5.0/configure.ac 2013-01-14 18:04:15.726598991 +0100
26 -@@ -506,13 +506,13 @@ if test "x$HAVE_POLKIT" = "xyes"; then
27 - fi
28 -
29 - AC_CHECK_HEADER(cpufreq.h, have_libcpufreq=yes, have_libcpufreq=no)
30 --LIBCPUFREQ_LIBS=
31 --if test "x$have_libcpufreq" = "xyes"; then
32 -- AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
33 -- LIBCPUFREQ_LIBS=-lcpufreq
34 -+LIBCPUPOWER_LIBS=
35 -+if test "x$have_libcpupower" = "xyes"; then
36 -+ AC_DEFINE([HAVE_LIBCPUPOWER], [1], [Have libcpupower.])
37 -+ LIBCPUPOWER_LIBS=-lcpupower
38 - fi
39 --AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
40 --AC_SUBST(LIBCPUFREQ_LIBS)
41 -+AM_CONDITIONAL(HAVE_LIBCPUPOWER, test x$have_libcpupower = xyes)
42 -+AC_SUBST(LIBCPUPOWER_LIBS)
43 -
44 - build_cpufreq_applet=no
45 -
46 -diff -upr mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c
47 ---- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2012-12-08 22:37:32.000000000 +0100
48 -+++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2013-01-14 19:15:28.432366287 +0100
49 -@@ -24,7 +24,7 @@
50 - #include "cpufreq-selector-factory.h"
51 - #include "cpufreq-selector-sysfs.h"
52 - #include "cpufreq-selector-procfs.h"
53 --#ifdef HAVE_LIBCPUFREQ
54 -+#ifdef HAVE_LIBCPUPOWER
55 - #include "cpufreq-selector-libcpufreq.h"
56 - #endif
57 -
58 -@@ -33,7 +33,7 @@ cpufreq_selector_factory_create_selector
59 - {
60 - CPUFreqSelector *selector = NULL;
61 -
62 --#ifdef HAVE_LIBCPUFREQ
63 -+#ifdef HAVE_LIBCPUPOWER
64 - selector = cpufreq_selector_libcpufreq_new (cpu);
65 - #else
66 - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
67 -@@ -41,7 +41,7 @@ cpufreq_selector_factory_create_selector
68 - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
69 - selector = cpufreq_selector_procfs_new (cpu);
70 - }
71 --#endif /* HAVE_LIBCPUFREQ */
72 -+#endif /* HAVE_LIBCPUPOWER */
73 -
74 - return selector;
75 - }
76 -diff -upr mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am
77 ---- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am 2012-12-08 22:37:32.000000000 +0100
78 -+++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am 2013-01-14 19:13:27.223180712 +0100
79 -@@ -16,7 +16,7 @@ if CPUFREQ_SELECTOR_SUID
80 - endif
81 -
82 -
83 --if HAVE_LIBCPUFREQ
84 -+if HAVE_LIBCPUPOWER
85 - cpufreq_files=cpufreq-selector-libcpufreq.c cpufreq-selector-libcpufreq.h
86 - endif
87 -
88 -diff -upr mate-applets-1.5.0-orig/cpufreq/src/Makefile.am mate-applets-1.5.0/cpufreq/src/Makefile.am
89 ---- mate-applets-1.5.0-orig/cpufreq/src/Makefile.am 2012-12-08 22:37:32.000000000 +0100
90 -+++ mate-applets-1.5.0/cpufreq/src/Makefile.am 2013-01-14 19:14:01.647517888 +0100
91 -@@ -12,7 +12,7 @@ INCLUDES = \
92 -
93 - libexec_PROGRAMS = mate-cpufreq-applet
94 -
95 --if HAVE_LIBCPUFREQ
96 -+if HAVE_LIBCPUPOWER
97 - cpufreq_files=cpufreq-monitor-libcpufreq.c cpufreq-monitor-libcpufreq.h
98 - endif
99 -