diff options
author | NP-Hardass <NP-Hardass@gentoo.org> | 2016-09-11 19:59:26 -0400 |
---|---|---|
committer | NP-Hardass <NP-Hardass@gentoo.org> | 2016-09-11 20:00:29 -0400 |
commit | 3b236e80fcd67bdfe6b17b9776b1e823200a00e2 (patch) | |
tree | b4a3f68b6326f62726b146aaff3b19f6c079eaa9 /mate-base | |
parent | dev-python/zope-interface: version bump to 4.3.2 (diff) | |
download | gentoo-3b236e80fcd67bdfe6b17b9776b1e823200a00e2.tar.gz gentoo-3b236e80fcd67bdfe6b17b9776b1e823200a00e2.tar.bz2 gentoo-3b236e80fcd67bdfe6b17b9776b1e823200a00e2.zip |
mate-base/mate-applets revert backport kernel 4.7 support
This reverts commit cb0ccf6943077fc6fb43396b76a3cbd7fa11085a.
Diffstat (limited to 'mate-base')
-rw-r--r-- | mate-base/mate-applets/files/mate-applets-1.10.4-kernel-4.7.patch | 38 | ||||
-rw-r--r-- | mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild | 97 | ||||
-rw-r--r-- | mate-base/mate-applets/mate-applets-1.12.1-r1.ebuild (renamed from mate-base/mate-applets/mate-applets-1.12.1-r2.ebuild) | 3 |
3 files changed, 0 insertions, 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 afe06dcb8807..000000000000 --- 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 4743098df388..000000000000 --- 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 index bfa64ba80b99..ecc284b8d2b9 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 \ |