[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/

2020-09-01 Thread Adam Feldman 
commit: 2ee9b842eacdd8c5870442e49d32da842422e298
Author: Adam Feldman  gentoo  org>
AuthorDate: Wed Sep  2 05:25:23 2020 +
Commit: Adam Feldman  gentoo  org>
CommitDate: Wed Sep  2 05:55:36 2020 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=2ee9b842

mate-base/mate-applets: Sync with ::gentoo

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman  gentoo.org>

 mate-base/mate-applets/Manifest|  2 -
 .../mate-applets-1.22.2-gcc-10-fno-common.patch| 45 +++
 mate-base/mate-applets/mate-applets-1.22.0.ebuild  | 86 --
 mate-base/mate-applets/mate-applets-1.22.1.ebuild  | 85 -
 ...1.22.2.ebuild => mate-applets-1.22.2-r1.ebuild} |  6 +-
 mate-base/mate-applets/mate-applets-1.24.0.ebuild  |  2 +-
 6 files changed, 51 insertions(+), 175 deletions(-)

diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index d953a28..9bfa42e 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 
a57ed37d6ddef303e40cbd8f811d1c6be47378a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f
 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.2-gcc-10-fno-common.patch 
b/mate-base/mate-applets/files/mate-applets-1.22.2-gcc-10-fno-common.patch
new file mode 100644
index 000..f768e18
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.22.2-gcc-10-fno-common.patch
@@ -0,0 +1,45 @@
+From c477b6fd2eec63f629ff5934e78c190ea6c73911 Mon Sep 17 00:00:00 2001
+From: rbuj 
+Date: Wed, 29 Jan 2020 17:10:12 +0100
+Subject: [PATCH] Fix build using gcc 10 -fno-common flag
+
+---
+ drivemount/drive-list.c | 4 
+ drivemount/drive-list.h | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/drivemount/drive-list.c b/drivemount/drive-list.c
+index a20e1329..1b3679b3 100644
+--- a/drivemount/drive-list.c
 b/drivemount/drive-list.c
+@@ -32,6 +32,8 @@
+ 
+ G_DEFINE_TYPE (DriveList, drive_list, GTK_TYPE_GRID);
+ 
++GSettings *settings;
++
+ static GVolumeMonitor *volume_monitor = NULL;
+ 
+ static void drive_list_finalize (GObject *object);
+@@ -153,6 +155,8 @@ drive_list_finalize (GObject *object)
+ g_hash_table_destroy (self->volumes);
+ g_hash_table_destroy (self->mounts);
+ 
++g_object_unref (settings);
++
+ if (G_OBJECT_CLASS (drive_list_parent_class)->finalize)
+   (* G_OBJECT_CLASS (drive_list_parent_class)->finalize) (object);
+ }
+diff --git a/drivemount/drive-list.h b/drivemount/drive-list.h
+index c7e844dd..ea55b908 100644
+--- a/drivemount/drive-list.h
 b/drivemount/drive-list.h
+@@ -65,7 +65,7 @@ void   drive_list_set_panel_size  (DriveList *list,
+  int panel_size);
+ void   drive_list_set_transparent (DriveList *self,
+  gboolean transparent);
+-GSettings *settings;
++extern GSettings *settings;
+ void   drive_list_redraw (DriveList *self);
+ void   settings_color_changed (GSettings *settings, gchar *key, DriveList 
*drive_list);
+ 

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 077a17c..000
--- 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} !=  ]]; 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
-

[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/

2020-04-09 Thread Adam Feldman 
commit: 5b22ce234c2c0b7b508398fbd0ee1dc12a718a90
Author: Adam Feldman  gentoo  org>
AuthorDate: Mon Mar 30 17:49:07 2020 +
Commit: Adam Feldman  gentoo  org>
CommitDate: Thu Apr  9 22:49:23 2020 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=5b22ce23

mate-base/mate-applets: Drop old, sync with Gentoo

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman  gentoo.org>

 mate-base/mate-applets/Manifest|   9 +-
 .../files/mate-applets-1.10.4-cpupower-4.7.patch   |  46 -
 .../files/mate-applets-1.14.1-cpupower-4.7.patch   |  44 -
 ...s-1.14.1-revert-upstream-cpupower-4.7-fix.patch |  37 ---
 7.patch => mate-applets-1.22.0-cpupower.patch} |  13 ++-
 .../mate-applets/mate-applets-1.12.1-r4.ebuild | 101 ---
 .../mate-applets/mate-applets-1.12.1-r5.ebuild | 102 
 .../mate-applets/mate-applets-1.14.1-r1.ebuild | 107 -
 .../mate-applets/mate-applets-1.14.1-r2.ebuild | 106 
 .../mate-applets/mate-applets-1.16.0-r1.ebuild | 105 
 mate-base/mate-applets/mate-applets-1.16.0.ebuild  | 106 
 ...1.18.1-r1.ebuild => mate-applets-1.22.0.ebuild} |  50 --
 ...ts-1.18.2.ebuild => mate-applets-1.22.1.ebuild} |  49 --
 ...ts-1.18.2.ebuild => mate-applets-1.22.2.ebuild} |  66 ++---
 ...ts-1.18.2.ebuild => mate-applets-1.24.0.ebuild} |  70 +++---
 mate-base/mate-applets/mate-applets-.ebuild|  65 ++---
 mate-base/mate-applets/metadata.xml|   4 +-
 17 files changed, 149 insertions(+), 931 deletions(-)

diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 27a94c1..d953a28 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,5 +1,4 @@
-DIST mate-applets-1.12.1.tar.xz 6816716 BLAKE2B 
3268a6a4dd1ee1a238a9573315f9450dea4636b40a98f27857dff3cfd9379e5adefa9f2f7f0522837d3bc4fa1c54055d4e65b47165f42cc44400775ed8890b14
 SHA512 
c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234
-DIST mate-applets-1.14.1.tar.xz 7151156 BLAKE2B 
9b3540ea04c4473f8d9ee081a87d399ebfe74d77d96b96f4c5bf11d954dd53a1e764981eefe593d75480aadf3028626917fd21cdd1b45a5b8f14e4381fcd48ae
 SHA512 
f7657a4dbeed5ff161dae33bd915bf868c95626d661b3d7e4eea9b86776f75449c4060c647d9a040ccf8a01556979b62a9b21c988b33e0cd8d5d90fd663a331d
-DIST mate-applets-1.16.0.tar.xz 7150340 BLAKE2B 
0b5554b3e5f250dbc38ec3ecff795dca3d503045fda7f31ea8cb190c8c30a35b5576b990d5005f11b44035b26d6df2ce91e36edd369e983d893bfa2db5e4c00c
 SHA512 
606fd39b95083e7cff2ce95e75b4acb0ec1f3d66621a15fa726891c6d6319f7757b92c8c26efd3ee05da9da3dc315b16a3a9089fd4bb8d420816d4728f8545af
-DIST mate-applets-1.18.1.tar.xz 7158716 BLAKE2B 
9f3698a61cfdcabbe5734d4f1f2c57a4ee11e4072e5bb87fe8f44e0dc6bdf7bb99e7c455ca221c573f0cef5557d4e89a53b7679915f635aa6ab6d257ca478bd6
 SHA512 
3186af69f3b8b54a7f31d3c00a39ed439717200181a1e64d97b28eaf2e75b19ac79fdda44c40401687e9cece06feb1e29f52948cd73afadeb0099f64e672c036
-DIST mate-applets-1.18.2.tar.xz 7163260 BLAKE2B 
58d057d1eded3ef26f33e133f86459a75df2903906f27df555640aaf51ca381e8f57b0b4fe6ed7b2d679e08d2a595fc85a6b0d9c4ad51d3ac01552e2875e00bb
 SHA512 
6644a7dfde1dbf65c38cd3a0f52f862e096030f0b9f324f1fbfc34b6167c04b51071f01c322c3c8382e74843332c877b1340fe2129417d6cf9207c32ef2f70be
+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 
a57ed37d6ddef303e40cbd8f811d1c6be47378a5b56c5eb280d7dba10668678bf9203425f735fb3b356f4ec33eb2369867aa3ab4b446748fe36b80194e8f
+DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B 
cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42
 SHA512 
345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e

diff --git 
a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch 
b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
deleted file mode 100644
index 070b417..000
---

[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/

2017-09-22 Thread NP Hardass 
commit: ec7e48d451844a3663272c0a2ba7dd83ec453593
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Sep 22 21:17:37 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Sep 22 21:17:37 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=ec7e48d4

mate-base/mate-applets:  Fix cpupower patch for 1.16+

Upstream removed a space, rendering old patch broken

Bug: https://bugs.gentoo.org/593470
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 .../files/mate-applets-1.16.0-cpupower-4.7.patch   | 44 ++
 .../mate-applets/mate-applets-1.16.0-r1.ebuild |  2 +-
 .../mate-applets/mate-applets-1.18.1-r1.ebuild |  2 +-
 mate-base/mate-applets/mate-applets-.ebuild|  2 +-
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git 
a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch 
b/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
new file mode 100644
index 000..3f4f4fa
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
@@ -0,0 +1,44 @@
+diff --git a/configure.ac b/configure.ac
+index b49d127..6b87389 100644
+--- a/configure.ac
 b/configure.ac
+@@ -411,6 +411,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 
+  */
+ 
++#include 
++
+ #include 
+ #include 
+ 
+ #include 
+-#include 
+ #include 
++#ifdef HAVE_CPUPOWER_H
++#include 
++#endif
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+ 
+@@ -111,7 +115,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.16.0-r1.ebuild 
b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
index 3540d0a..d9c8b7e 100644
--- a/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
@@ -69,7 +69,7 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"
 
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-cpupower-4.7.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
 
 src_configure() {
mate_src_configure \

diff --git a/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild 
b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
index b62a57f..4db7d9b 100644
--- a/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
@@ -61,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"
 
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-cpupower-4.7.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
 
 src_configure() {
mate_src_configure \

diff --git a/mate-base/mate-applets/mate-applets-.ebuild 
b/mate-base/mate-applets/mate-applets-.ebuild
index b62a57f..4db7d9b 100644
--- a/mate-base/mate-applets/mate-applets-.ebuild
+++ b/mate-base/mate-applets/mate-applets-.ebuild
@@ -61,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"
 
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-cpupower-4.7.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
 
 src_configure() {
mate_src_configure \

[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/

2017-09-22 Thread NP Hardass 
commit: 6bfa389a9bda535026178ba0e61f804bddb2505a
Author: NP-Hardass  gentoo  org>
AuthorDate: Fri Sep 22 20:58:54 2017 +
Commit: NP Hardass  gentoo  org>
CommitDate: Fri Sep 22 20:58:54 2017 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=6bfa389a

mate-base/mate-applets: Fix building with >cpupower-4.9

Bug: https://bugs.gentoo.org/593470
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 .../files/mate-applets-1.10.4-cpupower-4.7.patch   | 46 
 .../files/mate-applets-1.14.1-cpupower-4.7.patch   | 44 +++
 ...s-.ebuild => mate-applets-1.12.1-r5.ebuild} | 49 --
 ...s-.ebuild => mate-applets-1.14.1-r2.ebuild} | 33 +--
 ...s-.ebuild => mate-applets-1.16.0-r1.ebuild} | 30 -
 ...s-.ebuild => mate-applets-1.18.1-r1.ebuild} |  5 +--
 mate-base/mate-applets/mate-applets-.ebuild|  5 +--
 7 files changed, 161 insertions(+), 51 deletions(-)

diff --git 
a/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch 
b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
new file mode 100644
index 000..070b417
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.10.4-cpupower-4.7.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index c867af3..4ff5311 100644
+--- a/configure.ac
 b/configure.ac
+@@ -416,6 +416,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 40c44ba..120693c 100644
+--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
 b/cpufreq/src/cpufreq-monitor-libcpufreq.c
+@@ -19,11 +19,16 @@
+  * Authors : Carlos Garc�a Campos 
+  */
+ 
++#include 
++
+ #include 
+ #include 
+ 
+ #include 
+ #include 
++#ifdef HAVE_CPUPOWER_H
++#include 
++#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.
+*/
++#ifndef HAVE_CPUPOWER_H
+   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/files/mate-applets-1.14.1-cpupower-4.7.patch 
b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
new file mode 100644
index 000..203f158
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.14.1-cpupower-4.7.patch
@@ -0,0 +1,44 @@
+diff --git a/configure.ac b/configure.ac
+index b49d127..6b87389 100644
+--- a/configure.ac
 b/configure.ac
+@@ -411,6 +411,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 
+  */
+ 
++#include 
++
+ #include 
+ #include 
+ 
+ #include 
+-#include 
+ #include 
++#ifdef HAVE_CPUPOWER_H
++#include 
++#endif
+ 
+ #include "cpufreq-monitor-libcpufreq.h"
+ #include "cpufreq-utils.h"
+@@ -112,7 +116,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-.ebuild 
b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
similarity index 67%
copy from mate-base/mate-applets/mate-applets-.ebuild
copy to mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
index d1b6e71..3853add 100644
--- a/mate-base/mate-applets/mate-applets-.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
@@ -15,46 +15,50 @@ DESCRIPTION="Applets for the MATE Desktop and Panel"
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
 
-IUSE="X ipv6 policykit +upower"
+IUSE="X gtk3 ipv6 policykit +upower"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-#cpupower #593470
-COMMON_DEPEND="${PYTHON_DEPS}
+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.17.0
+   >=dev-libs/libmateweather-1.6.1[gtk3(-)=]

[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/

2016-11-22 Thread Ettore Di Giacinto 
commit: 0dd3cb000eea487ceccaeb27dc280f1bc4e9514c
Author: Ettore Di Giacinto  gentoo  org>
AuthorDate: Fri Oct 21 19:20:57 2016 +
Commit: Ettore Di Giacinto  gentoo  org>
CommitDate: Tue Nov 22 11:10:40 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=0dd3cb00

mate-base/mate-applets: Drop 1.10.x

Package-Manager: portage-2.3.1

 mate-base/mate-applets/Manifest|   1 -
 .../mate-applets-1.10.4-drop-icon-theme-dep.patch  |  33 ---
 .../mate-applets/mate-applets-1.10.4-r3.ebuild | 105 -
 3 files changed, 139 deletions(-)

diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index a9583ef..6314ba4 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,3 +1,2 @@
-DIST mate-applets-1.10.4.tar.xz 6850348 SHA256 
e713b4205a901048120d48578dc86e87d2f87a294484110a331acdf77f4f48c2 SHA512 
4e1fd0523cb1f50bf056f6805b048137442360eb8ec8c05b02c3075e48acb79a5150056b1c815439659048958c11def8141fe3df917d5da8d608adfb6c330ee3
 WHIRLPOOL 
ed0cfe389168f01b081852716a3df459bc6ee63de67cd802b56f42daf7a8447e5a524f5dfaf45cae8d7d553ee7bbf8ca3371bd77f174f27bb0b6d1377ad53298
 DIST mate-applets-1.12.1.tar.xz 6816716 SHA256 
0a3bc19e59c69eccdcc2342f29b7837563e51fbefdb232ca1884ca23d8f69c99 SHA512 
c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234
 WHIRLPOOL 
9f3569fcdd610935689a5460015347ac46100b8689f74d0bc37ac227e129edbf06e6f86e3471f7f40454c37c00291382ccc51e95b3dd2fac008b4e865620
 DIST mate-applets-1.14.1.tar.xz 7151156 SHA256 
411dc105afae61b2ee0e3b197ea0a00f8670ceb680dd5a549f8ef586289b9d6a SHA512 
f7657a4dbeed5ff161dae33bd915bf868c95626d661b3d7e4eea9b86776f75449c4060c647d9a040ccf8a01556979b62a9b21c988b33e0cd8d5d90fd663a331d
 WHIRLPOOL 
90d13900c8aaed4a08e6d4f55adf600f1da82900f164d9bf5c7a8a6c9e51452668bacbe5e8ae7ee4ccaa156d70121dffefe1c8cce8bd12ad190e5c04d42b1c0e

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
deleted file mode 100644
index 4137029..000
--- a/mate-base/mate-applets/files/mate-applets-1.10.4-drop-icon-theme-dep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0a9439346e00aded616fe99773ffec2f3f7bcc49 Mon Sep 17 00:00:00 2001
-From: raveit65 
-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/mate-applets-1.10.4-r3.ebuild 
b/mate-base/mate-applets/mate-applets-1.10.4-r3.ebuild
deleted file mode 100644
index a5625b1..000
--- a/mate-base/mate-applets/mate-applets-1.10.4-r3.ebuild
+++ /dev/null
@@ -1,105 +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 autotools 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}"
-
-#cpupower #593470
-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
-

[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/

2016-09-13 Thread NP Hardass 
commit: a6de2268d5e6fbce3636ee170c2260155b140760
Author: mudler  sabayon  org>
AuthorDate: Tue Sep 13 21:42:26 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Tue Sep 13 22:13:24 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=a6de2268

mate-base/mate-applets: revert upstream patch, require  gentoo.org>

 ...s-1.14.1-revert-upstream-cpupower-4.7-fix.patch | 37 ++
 mate-base/mate-applets/mate-applets-1.14.1.ebuild  |  5 ++-
 mate-base/mate-applets/mate-applets-.ebuild|  5 ++-
 3 files changed, 45 insertions(+), 2 deletions(-)

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 000..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 
+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 
+ 
+ #include 
+-#include 
++
+ #include 
+ #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.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.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
+   =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 \

diff --git a/mate-base/mate-applets/mate-applets-.ebuild 
b/mate-base/mate-applets/mate-applets-.ebuild
index 2436612..afe8120 100644
--- a/mate-base/mate-applets/mate-applets-.ebuild
+++ b/mate-base/mate-applets/mate-applets-.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
@@ -30,7 +31,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
+   =x11-libs/libnotify-0.7:0
x11-libs/libX11:0
@@ -70,6 +71,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 \

[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/

2016-09-13 Thread NP Hardass 
commit: 7638e40d2ee72c52308a9f085739dfae053a00a7
Author: NP-Hardass  gentoo  org>
AuthorDate: Mon Sep 12 17:56:42 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Mon Sep 12 17:57:39 2016 +
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 000..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 
+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..000
--- 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 
-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 
- 
- #include 
-+#include 
- #include 
--
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+#include 
-+#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=(
+