* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/
@ 2016-11-21 11:02 Ettore Di Giacinto
0 siblings, 0 replies; 5+ messages in thread
From: Ettore Di Giacinto @ 2016-11-21 11:02 UTC (permalink / raw
To: gentoo-commits
commit: e6d9cc91405bdf581c1f4a2c104e9cf29a154bc4
Author: mudler <mudler <AT> sabayon <DOT> org>
AuthorDate: Tue Sep 13 21:42:26 2016 +0000
Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 11:00:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d9cc91
mate-base/mate-applets: revert upstream patch, require <cpupower-4.7 #593470
...s-1.14.1-revert-upstream-cpupower-4.7-fix.patch | 37 ++++++++++++++++++++++
...1.14.1.ebuild => mate-applets-1.14.1-r1.ebuild} | 5 ++-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
new file mode 100644
index 00000000..85c2b24
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.14.1-revert-upstream-cpupower-4.7-fix.patch
@@ -0,0 +1,37 @@
+From e82b68edbfa8d6e209b9ad7b3e6392a928da776e Mon Sep 17 00:00:00 2001
+From: mudler <mudler@sabayon.org>
+Date: Tue, 13 Sep 2016 23:33:58 +0200
+Subject: [PATCH] fix 1.14.1 on kernel-headers >=4.7
+
+---
+ cpufreq/src/cpufreq-monitor-libcpufreq.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 228a890..587e316 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -23,7 +23,7 @@
+ #include <glib/gi18n.h>
+
+ #include <stdlib.h>
+-#include <linux/version.h>
++
+ #include <cpufreq.h>
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+@@ -111,11 +111,7 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
+ /* Check whether it failed because
+ * cpu is not online.
+ */
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+ if (!cpufreq_cpu_exists (cpu)) {
+-#else
+- if (cpupower_is_cpu_online (cpu)) {
+-#endif
+ g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
+ return TRUE;
+ }
+--
+2.9.2
+
diff --git a/mate-base/mate-applets/mate-applets-1.14.1.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
similarity index 95%
rename from mate-base/mate-applets/mate-applets-1.14.1.ebuild
rename to mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
index 9cf3b30..63f8833 100644
--- a/mate-base/mate-applets/mate-applets-1.14.1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.14.1-r1.ebuild
@@ -19,6 +19,7 @@ SLOT="0"
IUSE="X gtk3 ipv6 policykit +upower"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+#cpupower #593470
COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/atk:0
>=dev-libs/dbus-glib-0.74:0
@@ -31,7 +32,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=mate-base/mate-panel-1.7[gtk3(-)=]
>=net-wireless/wireless-tools-28_pre9:0
>=sys-apps/dbus-1.1.2:0
- sys-power/cpupower
+ <sys-power/cpupower-4.7
x11-libs/gdk-pixbuf:2
>=x11-libs/libnotify-0.7:0
x11-libs/libX11:0
@@ -71,6 +72,8 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"
+PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
+
src_configure() {
mate_src_configure \
--libexecdir=/usr/libexec/mate-applets \
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/
@ 2020-05-08 4:45 Adam Feldman
0 siblings, 0 replies; 5+ messages in thread
From: Adam Feldman @ 2020-05-08 4:45 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 8557 bytes --]
commit: 53818829a0af53a5ec1975e9fdd6cd8fd746471e
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 04:14:18 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri May 8 04:44:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53818829
mate-base/mate-applets: Drop old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
mate-base/mate-applets/Manifest | 2 -
.../files/mate-applets-1.22.0-cpupower.patch | 53 -------------
mate-base/mate-applets/mate-applets-1.22.0.ebuild | 86 ----------------------
mate-base/mate-applets/mate-applets-1.22.1.ebuild | 85 ---------------------
4 files changed, 226 deletions(-)
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index d953a28a8e2..9bfa42e070b 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,4 +1,2 @@
-DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
-DIST mate-applets-1.22.1.tar.xz 7602112 BLAKE2B 22dc076d188cddf9c5160d7ecaddb14ecc41a575abac91b72959054f3fe1c961c80b1aa9171150e7c4ce61ccee0783572726386319312dc97f64d4f9266c1a6d SHA512 d132c8b5e433a557785745032235a5792d04edd7c249269d9a4066fb345b76955bdca71164f7b321f41f566803694d85d9cd7690fbd699daa54788572f0eb986
DIST mate-applets-1.22.2.tar.xz 7648744 BLAKE2B 85235f12c1436c3caaa6429aabd16822ae34c5c4bd7a575aa9be2c2e9080734b39180e34b22fdf265a64b5ebffb24071d8768b99f55736631403da02882e45fe SHA512 a57ed37d6ddef303e40cbd8f811d1c6be473eeee78a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f
DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42 SHA512 345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e
diff --git a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
deleted file mode 100644
index 9c1a80e9375..00000000000
--- a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -370,6 +370,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
-
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
-
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 4fa9d4c..ba52fde 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,12 +19,16 @@
- * Authors : Carlos García Campos <carlosgc@gnome.org>
- */
-
-+#include <config.h>
-+
- #include <glib.h>
- #include <glib/gi18n.h>
-
- #include <stdlib.h>
--#include <linux/version.h>
- #include <cpufreq.h>
-+#ifdef HAVE_CPUPOWER_H
-+#include <cpupower.h>
-+#endif
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-
-@@ -98,7 +102,7 @@
- return CPUFREQ_MONITOR (monitor);
- }
-
--#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- extern int cpupower_is_cpu_online (unsigned int cpu);
- #endif
-
-@@ -115,7 +119,7 @@
- /* Check whether it failed because
- * cpu is not online.
- */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- if (!cpufreq_cpu_exists (cpu)) {
- #else
- if (cpupower_is_cpu_online (cpu)) {
diff --git a/mate-base/mate-applets/mate-applets-1.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
deleted file mode 100644
index 077a17c344d..00000000000
--- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-
-COMMON_DEPEND="dev-libs/atk
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.50:2
- >=dev-libs/libmateweather-1.17.0
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.12.0:2=
- >=gnome-extra/gucharmap-3.0:2.90
- >=mate-base/mate-panel-1.17.0
- >=net-wireless/wireless-tools-28_pre9:0
- >=sys-apps/dbus-1.1.2
- sys-power/cpupower
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7
- x11-libs/libX11
- >=x11-libs/libwnck-3.0:3
- x11-libs/pango
- virtual/libintl
- policykit? ( >=sys-auth/polkit-0.97:0 )
- upower? ( >=sys-power/upower-0.9.23 )
- !!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
- >=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- >=dev-util/intltool-0.50.1
- dev-libs/libxslt
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}"/${P}-cpupower.patch )
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- $(use_with X x) \
- $(use_with upower) \
- $(use_enable ipv6) \
- $(use_enable policykit polkit)
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
-}
-
-src_install() {
- mate_src_install
-
- local APPLETS="accessx-status battstat charpick command cpufreq drivemount
- geyes mateweather multiload netspeed stickynotes
- timerapplet trashapplet"
-
- for applet in ${APPLETS}; do
- docinto ${applet}
-
- for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
- [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
- done
- done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.22.1.ebuild b/mate-base/mate-applets/mate-applets-1.22.1.ebuild
deleted file mode 100644
index 38f90f1bdb0..00000000000
--- a/mate-base/mate-applets/mate-applets-1.22.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-
-COMMON_DEPEND="dev-libs/atk
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.50:2
- >=dev-libs/libmateweather-1.17.0
- >=dev-libs/libxml2-2.5:2
- >=gnome-base/libgtop-2.12.0:2=
- >=gnome-extra/gucharmap-3.0:2.90
- >=mate-base/mate-panel-1.17.0
- >=net-wireless/wireless-tools-28_pre9:0
- >=sys-apps/dbus-1.1.2
- sys-power/cpupower
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7
- x11-libs/libX11
- >=x11-libs/libwnck-3.0:3
- x11-libs/pango
- virtual/libintl
- policykit? ( >=sys-auth/polkit-0.97:0 )
- upower? ( >=sys-power/upower-0.9.23 )
- !!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
- >=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- >=dev-util/intltool-0.50.1
- dev-libs/libxslt
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.22.0-cpupower.patch )
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- $(use_with X x) \
- $(use_with upower) \
- $(use_enable ipv6) \
- $(use_enable policykit polkit)
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
-}
-
-src_install() {
- mate_src_install
-
- local APPLETS="accessx-status battstat charpick command cpufreq drivemount
- geyes mateweather multiload netspeed stickynotes
- timerapplet trashapplet"
-
- for applet in ${APPLETS}; do
- docinto ${applet}
-
- for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
- [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
- done
- done
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/
@ 2019-03-19 9:42 Mikle Kolyada
0 siblings, 0 replies; 5+ messages in thread
From: Mikle Kolyada @ 2019-03-19 9:42 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 2912 bytes --]
commit: ea97b37dd8393df4c055f829e49eeeb07cbdad77
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 09:41:39 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 09:42:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea97b37d
mate-base/mate-applets: fix cpufreq patch
Closes: https://bugs.gentoo.org/680870
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
.../files/mate-applets-1.22.0-cpupower.patch | 53 ++++++++++++++++++++++
mate-base/mate-applets/mate-applets-1.22.0.ebuild | 2 +-
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
new file mode 100644
index 00000000000..9c1a80e9375
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.22.0-cpupower.patch
@@ -0,0 +1,53 @@
+diff --git a/configure.ac b/configure.ac
+index b49d127..6b87389 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -370,6 +370,8 @@ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)
+
++AC_CHECK_HEADERS([cpupower.h])
++
+ build_cpufreq_applet=no
+
+ if test x$disable_cpufreq = xno; then
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 4fa9d4c..ba52fde 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -19,12 +19,16 @@
+ * Authors : Carlos García Campos <carlosgc@gnome.org>
+ */
+
++#include <config.h>
++
+ #include <glib.h>
+ #include <glib/gi18n.h>
+
+ #include <stdlib.h>
+-#include <linux/version.h>
+ #include <cpufreq.h>
++#ifdef HAVE_CPUPOWER_H
++#include <cpupower.h>
++#endif
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+
+@@ -98,7 +102,7 @@
+ return CPUFREQ_MONITOR (monitor);
+ }
+
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0)
++#ifndef HAVE_CPUPOWER_H
+ extern int cpupower_is_cpu_online (unsigned int cpu);
+ #endif
+
+@@ -115,7 +119,7 @@
+ /* Check whether it failed because
+ * cpu is not online.
+ */
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
++#ifndef HAVE_CPUPOWER_H
+ if (!cpufreq_cpu_exists (cpu)) {
+ #else
+ if (cpupower_is_cpu_online (cpu)) {
diff --git a/mate-base/mate-applets/mate-applets-1.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
index c6c54c6e728..1a1b62dec8c 100644
--- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
@@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
+PATCHES=( "${FILESDIR}"/${P}-cpupower.patch )
src_configure() {
mate_src_configure \
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/
@ 2016-09-12 0:00 NP Hardass
0 siblings, 0 replies; 5+ messages in thread
From: NP Hardass @ 2016-09-12 0:00 UTC (permalink / raw
To: gentoo-commits
commit: 3b236e80fcd67bdfe6b17b9776b1e823200a00e2
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 23:59:26 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 00:00:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b236e80
mate-base/mate-applets revert backport kernel 4.7 support
This reverts commit cb0ccf6943077fc6fb43396b76a3cbd7fa11085a.
.../files/mate-applets-1.10.4-kernel-4.7.patch | 38 ---------
.../mate-applets/mate-applets-1.10.4-r2.ebuild | 97 ----------------------
...2.1-r2.ebuild => mate-applets-1.12.1-r1.ebuild} | 3 -
3 files changed, 138 deletions(-)
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch
deleted file mode 100644
index afe06dc..00000000
--- a/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1b4478eab642787c43601259611f7b27e0bb473b Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux@googlemail.com>
-Date: Thu, 9 Jun 2016 10:06:34 +0100
-Subject: [PATCH] fix build with kernel-4.7
-
----
- cpufreq/src/cpufreq-monitor-libcpufreq.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 40c44ba..5fe79fb 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -23,8 +23,11 @@
- #include <glib/gi18n.h>
-
- #include <stdlib.h>
-+#include <linux/version.h>
- #include <cpufreq.h>
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+#include <cpuidle.h>
-+#endif
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-
-@@ -111,7 +114,11 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
- /* Check whether it failed because
- * cpu is not online.
- */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- if (!cpufreq_cpu_exists (cpu)) {
-+#else
-+ if (cpupower_is_cpu_online (cpu)) {
-+#endif
- g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
- return TRUE;
- }
diff --git a/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
deleted file mode 100644
index 4743098..00000000
--- a/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2 python-single-r1 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- app-text/rarian:0
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.74:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libmateweather-1.10:0
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.11.92:2=
- >=gnome-extra/gucharmap-2.32.1:0
- >=mate-base/mate-desktop-1.10:0
- >=mate-base/mate-panel-1.10:0
- >=mate-base/mate-settings-daemon-1.10:0
- >=sys-apps/dbus-1.1.2:0
- sys-power/cpupower
- upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.24:2
- x11-libs/gtksourceview:2.0
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
- >=x11-libs/libwnck-2.30:1
- x11-libs/pango:0
- >=x11-themes/mate-icon-theme-1.10:0
- virtual/libintl:0
- policykit? ( >=sys-auth/polkit-0.92:0 )"
-
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.3
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- >=dev-util/intltool-0.35:*
- dev-libs/libxslt:0
- >=mate-base/mate-common-1.10:0
- sys-devel/gettext:*
- sys-kernel/linux-headers
- virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.10.4-kernel-4.7.patch" )
-
-src_configure() {
- gnome2_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- $(use_enable ipv6) \
- $(use_enable policykit polkit) \
- $(use_with upower) \
- $(use_with X x)
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_install() {
- python_fix_shebang invest-applet
- gnome2_src_install
-
- local APPLETS="accessx-status battstat charpick command cpufreq drivemount
- geyes invest-applet mateweather multiload null_applet stickynotes
- timerapplet trashapplet"
-
- for applet in ${APPLETS}; do
- docinto ${applet}
-
- for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
- [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
- done
- done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
similarity index 96%
rename from mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild
rename to mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
index bfa64ba..ecc284b 100644
--- a/mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
@@ -65,11 +65,8 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.50.1:*
dev-libs/libxslt:0
sys-devel/gettext:*
- sys-kernel/linux-headers
virtual/pkgconfig:*"
-PATCHES=( "${FILESDIR}/${PN}-1.10.4-kernel-4.7.patch" )
-
src_configure() {
mate_src_configure \
--libexecdir=/usr/libexec/mate-applets \
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/
@ 2016-09-10 19:35 NP Hardass
0 siblings, 0 replies; 5+ messages in thread
From: NP Hardass @ 2016-09-10 19:35 UTC (permalink / raw
To: gentoo-commits
commit: cb0ccf6943077fc6fb43396b76a3cbd7fa11085a
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 02:13:06 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 19:35:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0ccf69
mate-base/mate-applets: backport kernel 4.7 support
Package-Manager: portage-2.3.0
.../files/mate-applets-1.10.4-kernel-4.7.patch | 38 ++++++++++++
...2.1-r1.ebuild => mate-applets-1.10.4-r2.ebuild} | 68 ++++++++++------------
...2.1-r1.ebuild => mate-applets-1.12.1-r2.ebuild} | 3 +
3 files changed, 73 insertions(+), 36 deletions(-)
diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch
new file mode 100644
index 00000000..afe06dc
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch
@@ -0,0 +1,38 @@
+From 1b4478eab642787c43601259611f7b27e0bb473b Mon Sep 17 00:00:00 2001
+From: leigh123linux <leigh123linux@googlemail.com>
+Date: Thu, 9 Jun 2016 10:06:34 +0100
+Subject: [PATCH] fix build with kernel-4.7
+
+---
+ cpufreq/src/cpufreq-monitor-libcpufreq.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+index 40c44ba..5fe79fb 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
++++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -23,8 +23,11 @@
+ #include <glib/gi18n.h>
+
+ #include <stdlib.h>
++#include <linux/version.h>
+ #include <cpufreq.h>
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
++#include <cpuidle.h>
++#endif
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+
+@@ -111,7 +114,11 @@ cpufreq_monitor_libcpufreq_run (CPUFreqMonitor *monitor)
+ /* Check whether it failed because
+ * cpu is not online.
+ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
+ if (!cpufreq_cpu_exists (cpu)) {
++#else
++ if (cpupower_is_cpu_online (cpu)) {
++#endif
+ g_object_set (G_OBJECT (monitor), "online", FALSE, NULL);
+ return TRUE;
+ }
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
similarity index 58%
copy from mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
copy to mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
index ecc284b..4743098 100644
--- a/mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
@@ -2,21 +2,24 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=6
+EAPI="5"
+GCONF_DEBUG="no"
PYTHON_COMPAT=( python2_7 )
-inherit mate python-single-r1
+inherit eutils gnome2 python-single-r1 versionator
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
+MATE_BRANCH="$(get_version_component_range 1-2)"
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
DESCRIPTION="Applets for the MATE Desktop and Panel"
+HOMEPAGE="http://mate-desktop.org"
+
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
-IUSE="X gtk3 ipv6 policykit +upower"
+IUSE="X ipv6 policykit +upower"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
@@ -24,58 +27,49 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/atk:0
>=dev-libs/dbus-glib-0.74:0
>=dev-libs/glib-2.36:2
- >=dev-libs/libmateweather-1.6.1[gtk3(-)=]
+ >=dev-libs/libmateweather-1.10:0
>=dev-libs/libxml2-2.5:2
dev-python/pygobject:3
>=gnome-base/libgtop-2.11.92:2=
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- >=mate-base/mate-panel-1.7[gtk3(-)=]
- >=mate-base/mate-settings-daemon-1.6
+ >=gnome-extra/gucharmap-2.32.1:0
+ >=mate-base/mate-desktop-1.10:0
+ >=mate-base/mate-panel-1.10:0
+ >=mate-base/mate-settings-daemon-1.10:0
>=sys-apps/dbus-1.1.2:0
sys-power/cpupower
+ upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/gtksourceview:2.0
>=x11-libs/libnotify-0.7:0
x11-libs/libX11:0
+ >=x11-libs/libwnck-2.30:1
x11-libs/pango:0
+ >=x11-themes/mate-icon-theme-1.10:0
virtual/libintl:0
- !gtk3? (
- >=gnome-extra/gucharmap-2.32.1:0
- >=x11-libs/gtk+-2.24:2
- x11-libs/gtksourceview:2.0
- >=x11-libs/libwnck-2.30:1
- )
- gtk3? (
- >=gnome-extra/gucharmap-3.0:2.90
- >=x11-libs/gtk+-3.0:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libwnck-3.0:3
- )
- policykit? ( >=sys-auth/polkit-0.92:0 )
- upower? (
- || (
- >=sys-power/upower-0.9.23
- >=sys-power/upower-pm-utils-0.9.23
- )
- )"
+ policykit? ( >=sys-auth/polkit-0.92:0 )"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.3
>=app-text/scrollkeeper-dtd-1:1.0
app-text/yelp-tools:0
- >=dev-util/intltool-0.50.1:*
+ >=dev-util/intltool-0.35:*
dev-libs/libxslt:0
+ >=mate-base/mate-common-1.10:0
sys-devel/gettext:*
+ sys-kernel/linux-headers
virtual/pkgconfig:*"
+PATCHES=( "${FILESDIR}/${PN}-1.10.4-kernel-4.7.patch" )
+
src_configure() {
- mate_src_configure \
+ gnome2_src_configure \
--libexecdir=/usr/libexec/mate-applets \
--with-cpufreq-lib=cpupower \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_with X x) \
- $(use_with upower) \
$(use_enable ipv6) \
- $(use_enable policykit polkit)
+ $(use_enable policykit polkit) \
+ $(use_with upower) \
+ $(use_with X x)
}
src_test() {
@@ -83,9 +77,11 @@ src_test() {
emake check
}
+DOCS="AUTHORS ChangeLog NEWS README"
+
src_install() {
python_fix_shebang invest-applet
- mate_src_install
+ gnome2_src_install
local APPLETS="accessx-status battstat charpick command cpufreq drivemount
geyes invest-applet mateweather multiload null_applet stickynotes
diff --git a/mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild
similarity index 96%
rename from mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
rename to mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild
index ecc284b..bfa64ba 100644
--- a/mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild
@@ -65,8 +65,11 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.50.1:*
dev-libs/libxslt:0
sys-devel/gettext:*
+ sys-kernel/linux-headers
virtual/pkgconfig:*"
+PATCHES=( "${FILESDIR}/${PN}-1.10.4-kernel-4.7.patch" )
+
src_configure() {
mate_src_configure \
--libexecdir=/usr/libexec/mate-applets \
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-08 4:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-21 11:02 [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/ Ettore Di Giacinto
-- strict thread matches above, loose matches on Subject: below --
2020-05-08 4:45 Adam Feldman
2019-03-19 9:42 Mikle Kolyada
2016-09-12 0:00 NP Hardass
2016-09-10 19:35 NP Hardass
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox