commit: 7638e40d2ee72c52308a9f085739dfae053a00a7 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Mon Sep 12 17:56:42 2016 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Mon Sep 12 17:57:39 2016 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=7638e40d
mate-base/mate-applets: Sync with gentoo, #593474 Package-Manager: portage-2.3.0 .../mate-applets-1.10.4-drop-icon-theme-dep.patch | 33 +++++++++++++++++++ .../files/mate-applets-1.10.4-kernel-4.7.patch | 38 ---------------------- .../mate-applets/mate-applets-1.10.4-r2.ebuild | 15 ++++++--- 3 files changed, 44 insertions(+), 42 deletions(-) diff --git a/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch b/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch new file mode 100644 index 0000000..4137029 --- /dev/null +++ b/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch @@ -0,0 +1,33 @@ +From 0a9439346e00aded616fe99773ffec2f3f7bcc49 Mon Sep 17 00:00:00 2001 +From: raveit65 <chat-to...@raveit.de> +Date: Thu, 1 Oct 2015 00:27:53 +0200 +Subject: [PATCH] drop dpendency to mate-icon-theme + +The dependency is not really needed; depending on GTK+ should be enough +to guarantee the presence of a spec-compliant icon theme. +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b69e1a4..284dba7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,7 +20,6 @@ LIBNOTIFY_REQUIRED=0.7.0 + UPOWER_REQUIRED=0.9.4 + DBUS_REQUIRED=1.1.2 + DBUS_GLIB_REQUIRED=0.74 +-MATE_ICON_THEME_REQUIRED=1.1.0 + LIBXML_REQUIRED=2.5.0 + POLKIT_REQUIRED=0.92 + dnl *************************************************************************** +@@ -122,9 +121,6 @@ dnl *************************************************************************** + dnl *** Use pkg-config to check for dependancies *** + dnl *************************************************************************** + +-dnl -- Check for mate-icon-theme (required) ---------------------------------- +-PKG_CHECK_MODULES(GIT, mate-icon-theme >= $MATE_ICON_THEME_REQUIRED) +- + dnl -- check for gio (required) ------------------------------------------ + PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED gio-unix-2.0) + AC_SUBST(GIO_CFLAGS) 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..0000000 --- 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 <leigh123li...@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 index 4743098..fdde0c2 100644 --- a/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild +++ b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild @@ -7,7 +7,7 @@ EAPI="5" GCONF_DEBUG="no" PYTHON_COMPAT=( python2_7 ) -inherit eutils gnome2 python-single-r1 versionator +inherit eutils gnome2 python-single-r1 autotools versionator MATE_BRANCH="$(get_version_component_range 1-2)" @@ -45,7 +45,6 @@ RDEPEND="${PYTHON_DEPS} 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 )" @@ -57,10 +56,18 @@ DEPEND="${RDEPEND} 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" ) +PATCHES=( + "${FILESDIR}/${PN}-1.10.4-cpupower-4.7.patch" + "${FILESDIR}/${PN}-1.10.4-drop-icon-theme-dep.patch" +) + +src_prepare() { + epatch ${PATCHES[@]} + eautoreconf + gnome2_src_prepare +} src_configure() { gnome2_src_configure \