* [gentoo-commits] proj/gentoo-mate:1.14-bump commit in: mate-base/mate-applets/files/
@ 2016-09-06 2:13 NP Hardass
2016-09-10 18:56 ` [gentoo-commits] proj/gentoo-mate:master " NP Hardass
0 siblings, 1 reply; 2+ messages in thread
From: NP Hardass @ 2016-09-06 2:13 UTC (permalink / raw
To: gentoo-commits
commit: 392b343cf61c37528757f9343b573b833cabff3a
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 02:13:37 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 02:13:37 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=392b343c
mate-base/mate-applets: Drop orphaned patch
Package-Manager: portage-2.3.0
...lets-1.6.2-r1-replace-cpufreq-by-cpupower.patch | 79 ----------------------
1 file changed, 79 deletions(-)
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
deleted file mode 100644
index 880afc7..0000000
--- a/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Obtained from: http://pkgs.fedoraproject.org/cgit/mate-applets.git/plain/cpufreq.patch
-
-diff -upr mate-applets-1.5.0-orig/configure.ac mate-applets-1.5.0/configure.ac
---- mate-applets-1.5.0-orig/configure.ac 2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/configure.ac 2013-01-14 18:04:15.726598991 +0100
-@@ -506,13 +506,13 @@ if test "x$HAVE_POLKIT" = "xyes"; then
- fi
-
- 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=-lcpufreq
-+LIBCPUPOWER_LIBS=
-+if test "x$have_libcpupower" = "xyes"; then
-+ AC_DEFINE([HAVE_LIBCPUPOWER], [1], [Have libcpupower.])
-+ LIBCPUPOWER_LIBS=-lcpupower
- fi
--AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
--AC_SUBST(LIBCPUFREQ_LIBS)
-+AM_CONDITIONAL(HAVE_LIBCPUPOWER, test x$have_libcpupower = xyes)
-+AC_SUBST(LIBCPUPOWER_LIBS)
-
- build_cpufreq_applet=no
-
-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
---- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2013-01-14 19:15:28.432366287 +0100
-@@ -24,7 +24,7 @@
- #include "cpufreq-selector-factory.h"
- #include "cpufreq-selector-sysfs.h"
- #include "cpufreq-selector-procfs.h"
--#ifdef HAVE_LIBCPUFREQ
-+#ifdef HAVE_LIBCPUPOWER
- #include "cpufreq-selector-libcpufreq.h"
- #endif
-
-@@ -33,7 +33,7 @@ cpufreq_selector_factory_create_selector
- {
- CPUFreqSelector *selector = NULL;
-
--#ifdef HAVE_LIBCPUFREQ
-+#ifdef HAVE_LIBCPUPOWER
- selector = cpufreq_selector_libcpufreq_new (cpu);
- #else
- if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
-@@ -41,7 +41,7 @@ cpufreq_selector_factory_create_selector
- } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
- selector = cpufreq_selector_procfs_new (cpu);
- }
--#endif /* HAVE_LIBCPUFREQ */
-+#endif /* HAVE_LIBCPUPOWER */
-
- return selector;
- }
-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
---- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am 2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am 2013-01-14 19:13:27.223180712 +0100
-@@ -16,7 +16,7 @@ if CPUFREQ_SELECTOR_SUID
- endif
-
-
--if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-selector-libcpufreq.c cpufreq-selector-libcpufreq.h
- endif
-
-diff -upr mate-applets-1.5.0-orig/cpufreq/src/Makefile.am mate-applets-1.5.0/cpufreq/src/Makefile.am
---- mate-applets-1.5.0-orig/cpufreq/src/Makefile.am 2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/Makefile.am 2013-01-14 19:14:01.647517888 +0100
-@@ -12,7 +12,7 @@ INCLUDES = \
-
- libexec_PROGRAMS = mate-cpufreq-applet
-
--if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-monitor-libcpufreq.c cpufreq-monitor-libcpufreq.h
- endif
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/
2016-09-06 2:13 [gentoo-commits] proj/gentoo-mate:1.14-bump commit in: mate-base/mate-applets/files/ NP Hardass
@ 2016-09-10 18:56 ` NP Hardass
0 siblings, 0 replies; 2+ messages in thread
From: NP Hardass @ 2016-09-10 18:56 UTC (permalink / raw
To: gentoo-commits
commit: 392b343cf61c37528757f9343b573b833cabff3a
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 02:13:37 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 02:13:37 2016 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=392b343c
mate-base/mate-applets: Drop orphaned patch
Package-Manager: portage-2.3.0
...lets-1.6.2-r1-replace-cpufreq-by-cpupower.patch | 79 ----------------------
1 file changed, 79 deletions(-)
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
deleted file mode 100644
index 880afc7..0000000
--- a/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Obtained from: http://pkgs.fedoraproject.org/cgit/mate-applets.git/plain/cpufreq.patch
-
-diff -upr mate-applets-1.5.0-orig/configure.ac mate-applets-1.5.0/configure.ac
---- mate-applets-1.5.0-orig/configure.ac 2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/configure.ac 2013-01-14 18:04:15.726598991 +0100
-@@ -506,13 +506,13 @@ if test "x$HAVE_POLKIT" = "xyes"; then
- fi
-
- 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=-lcpufreq
-+LIBCPUPOWER_LIBS=
-+if test "x$have_libcpupower" = "xyes"; then
-+ AC_DEFINE([HAVE_LIBCPUPOWER], [1], [Have libcpupower.])
-+ LIBCPUPOWER_LIBS=-lcpupower
- fi
--AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
--AC_SUBST(LIBCPUFREQ_LIBS)
-+AM_CONDITIONAL(HAVE_LIBCPUPOWER, test x$have_libcpupower = xyes)
-+AC_SUBST(LIBCPUPOWER_LIBS)
-
- build_cpufreq_applet=no
-
-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
---- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2013-01-14 19:15:28.432366287 +0100
-@@ -24,7 +24,7 @@
- #include "cpufreq-selector-factory.h"
- #include "cpufreq-selector-sysfs.h"
- #include "cpufreq-selector-procfs.h"
--#ifdef HAVE_LIBCPUFREQ
-+#ifdef HAVE_LIBCPUPOWER
- #include "cpufreq-selector-libcpufreq.h"
- #endif
-
-@@ -33,7 +33,7 @@ cpufreq_selector_factory_create_selector
- {
- CPUFreqSelector *selector = NULL;
-
--#ifdef HAVE_LIBCPUFREQ
-+#ifdef HAVE_LIBCPUPOWER
- selector = cpufreq_selector_libcpufreq_new (cpu);
- #else
- if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
-@@ -41,7 +41,7 @@ cpufreq_selector_factory_create_selector
- } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
- selector = cpufreq_selector_procfs_new (cpu);
- }
--#endif /* HAVE_LIBCPUFREQ */
-+#endif /* HAVE_LIBCPUPOWER */
-
- return selector;
- }
-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
---- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am 2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am 2013-01-14 19:13:27.223180712 +0100
-@@ -16,7 +16,7 @@ if CPUFREQ_SELECTOR_SUID
- endif
-
-
--if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-selector-libcpufreq.c cpufreq-selector-libcpufreq.h
- endif
-
-diff -upr mate-applets-1.5.0-orig/cpufreq/src/Makefile.am mate-applets-1.5.0/cpufreq/src/Makefile.am
---- mate-applets-1.5.0-orig/cpufreq/src/Makefile.am 2012-12-08 22:37:32.000000000 +0100
-+++ mate-applets-1.5.0/cpufreq/src/Makefile.am 2013-01-14 19:14:01.647517888 +0100
-@@ -12,7 +12,7 @@ INCLUDES = \
-
- libexec_PROGRAMS = mate-cpufreq-applet
-
--if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-monitor-libcpufreq.c cpufreq-monitor-libcpufreq.h
- endif
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-10 18:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-06 2:13 [gentoo-commits] proj/gentoo-mate:1.14-bump commit in: mate-base/mate-applets/files/ NP Hardass
2016-09-10 18:56 ` [gentoo-commits] proj/gentoo-mate:master " NP Hardass
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox