* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/, mate-base/mate-applets/files/
@ 2016-09-12 17:48 NP Hardass
0 siblings, 0 replies; 4+ messages in thread
From: NP Hardass @ 2016-09-12 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 2d40752985d61f765c23ef4f5ba60e172e8972cc
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 17:47:25 2016 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Sep 12 17:48:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d407529
mate-base/mate-applets: Drop mate-icon-theme requirement, #593474
Package-Manager: portage-2.3.0
.../mate-applets-1.10.4-drop-icon-theme-dep.patch | 33 ++++++++++++++++++++++
...0.4-r1.ebuild => mate-applets-1.10.4-r2.ebuild} | 16 +++++++++--
2 files changed, 46 insertions(+), 3 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 00000000..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-me@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/mate-applets-1.10.4-r1.ebuild b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
similarity index 88%
rename from mate-base/mate-applets/mate-applets-1.10.4-r1.ebuild
rename to mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
index ebfebd0..fdde0c2 100644
--- a/mate-base/mate-applets/mate-applets-1.10.4-r1.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)"
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="X ipv6 policykit +upower"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -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 )"
@@ -59,6 +58,17 @@ DEPEND="${RDEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"
+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 \
--libexecdir=/usr/libexec/mate-applets \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/, mate-base/mate-applets/files/
@ 2016-11-24 22:22 Ettore Di Giacinto
0 siblings, 0 replies; 4+ messages in thread
From: Ettore Di Giacinto @ 2016-11-24 22:22 UTC (permalink / raw
To: gentoo-commits
commit: e7e4bc05583a6a10c80d5682d8b480f590a00191
Author: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 19:20:57 2016 +0000
Commit: Ettore Di Giacinto <mudler <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 22:21:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e4bc05
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-r1.ebuild | 94 -------------------
.../mate-applets/mate-applets-1.10.4-r2.ebuild | 104 ---------------------
4 files changed, 232 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 9f3569fcdd610935689a54600153bbbb47ac46100b8689f74d0bc37ac227e129edbf06e6f86e3471f7f40454c37c00291382ccc51e95b3dd2fac008b4e865620
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..00000000
--- 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 <chat-to-me@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/mate-applets-1.10.4-r1.ebuild b/mate-base/mate-applets/mate-applets-1.10.4-r1.ebuild
deleted file mode 100644
index ebfebd0..00000000
--- a/mate-base/mate-applets/mate-applets-1.10.4-r1.ebuild
+++ /dev/null
@@ -1,94 +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:*
- virtual/pkgconfig:*"
-
-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.10.4-r2.ebuild b/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
deleted file mode 100644
index fdde0c2..00000000
--- a/mate-base/mate-applets/mate-applets-1.10.4-r2.ebuild
+++ /dev/null
@@ -1,104 +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}"
-
-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
- 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:*
- virtual/pkgconfig:*"
-
-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 \
- --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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/, mate-base/mate-applets/files/
@ 2017-09-22 21:27 NP Hardass
0 siblings, 0 replies; 4+ messages in thread
From: NP Hardass @ 2017-09-22 21:27 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: 16313 bytes --]
commit: 53fd275242b53169b20f487efd38698e54e9c32c
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 21:26:40 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 21:26:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53fd2752
mate-base/mate-applets: Fix compilation with >=cpupower-4.7
Closes: 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 +++++++++
.../files/mate-applets-1.16.0-cpupower-4.7.patch | 44 +++++++++
.../mate-applets/mate-applets-1.12.1-r5.ebuild | 102 ++++++++++++++++++++
.../mate-applets/mate-applets-1.14.1-r2.ebuild | 106 +++++++++++++++++++++
.../mate-applets/mate-applets-1.16.0-r1.ebuild | 105 ++++++++++++++++++++
.../mate-applets/mate-applets-1.18.1-r1.ebuild | 96 +++++++++++++++++++
7 files changed, 543 insertions(+)
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 00000000000..070b41754ed
--- /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 <carlosgc@gnome.org>
+ */
+
++#include <config.h>
++
+ #include <glib.h>
+ #include <glib/gi18n.h>
+
+ #include <stdlib.h>
+ #include <cpufreq.h>
++#ifdef HAVE_CPUPOWER_H
++#include <cpupower.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.
+ */
++#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 00000000000..203f1589a1b
--- /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 <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"
+@@ -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/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 00000000000..3f4f4fa519f
--- /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 <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"
+
+@@ -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.12.1-r5.ebuild b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
new file mode 100644
index 00000000000..3853add0fe5
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.12.1-r5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 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.6.1[gtk3(-)=]
+ >=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
+ >=sys-apps/dbus-1.1.2:0
+ sys-power/cpupower
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/libnotify-0.7:0
+ x11-libs/libX11:0
+ x11-libs/pango: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
+ )
+ )"
+
+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-libs/libxslt:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.10.4-cpupower-4.7.patch" )
+
+src_configure() {
+ mate_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)
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ emake check
+}
+
+src_install() {
+ python_fix_shebang invest-applet
+ mate_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.14.1-r2.ebuild b/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
new file mode 100644
index 00000000000..900d9034092
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.14.1-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${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/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(-)=]
+ >=net-wireless/wireless-tools-28_pre9:0
+ >=sys-apps/dbus-1.1.2:0
+ sys-power/cpupower
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/libnotify-0.7:0
+ x11-libs/libX11:0
+ x11-libs/pango: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
+ )
+ )
+ !!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:0
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.50.1:*
+ dev-libs/libxslt:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.14.1-cpupower-4.7.patch" )
+
+src_configure() {
+ mate_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)
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ emake check
+}
+
+src_install() {
+ python_fix_shebang invest-applet
+ mate_src_install
+
+ local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+ geyes invest-applet 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.16.0-r1.ebuild b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
new file mode 100644
index 00000000000..d9c8b7e52da
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.16.0-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${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/libxml2-2.5:2
+ dev-python/pygobject:3
+ >=gnome-base/libgtop-2.11.92:2=
+ >=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/gdk-pixbuf:2
+ >=x11-libs/libnotify-0.7:0
+ x11-libs/libX11:0
+ x11-libs/pango: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.97:0 )
+ upower? (
+ || (
+ >=sys-power/upower-0.9.23
+ >=sys-power/upower-pm-utils-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:0
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.50.1:*
+ dev-libs/libxslt:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
+
+src_configure() {
+ mate_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)
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ emake check
+}
+
+src_install() {
+ python_fix_shebang invest-applet
+ mate_src_install
+
+ local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+ geyes invest-applet 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.18.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
new file mode 100644
index 00000000000..4db7d9bb26f
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X ipv6 policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ 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/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:0
+ sys-power/cpupower
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.14:3
+ x11-libs/gtksourceview:3.0
+ >=x11-libs/libnotify-0.7:0
+ x11-libs/libX11:0
+ >=x11-libs/libwnck-3.0:3
+ x11-libs/pango:0
+ virtual/libintl:0
+ policykit? ( >=sys-auth/polkit-0.97:0 )
+ upower? (
+ || (
+ >=sys-power/upower-0.9.23
+ >=sys-power/upower-pm-utils-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:0
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.50.1:*
+ dev-libs/libxslt:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.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() {
+ python_fix_shebang invest-applet
+ mate_src_install
+
+ local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+ geyes invest-applet 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] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/, mate-base/mate-applets/files/
@ 2020-04-06 22:15 Adam Feldman
0 siblings, 0 replies; 4+ messages in thread
From: Adam Feldman @ 2020-04-06 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 75e98f8f74bffdaffea7b488313c4a6299d059d2
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 6 20:29:36 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Apr 6 22:14:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e98f8f
mate-base/mate-applets: Fix #707616
Closes: https://bugs.gentoo.org/707616
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
.../mate-applets-1.22.2-gcc-10-fno-common.patch | 45 ++++++++++++++++++++++
...1.22.2.ebuild => mate-applets-1.22.2-r1.ebuild} | 4 ++
2 files changed, 49 insertions(+)
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 00000000000..f768e18c61d
--- /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 <robert.buj@gmail.com>
+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.2.ebuild b/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
similarity index 97%
rename from mate-base/mate-applets/mate-applets-1.22.2.ebuild
rename to mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
index edec396dcf2..97fbd7bd56c 100644
--- a/mate-base/mate-applets/mate-applets-1.22.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
@@ -55,6 +55,10 @@ DEPEND="${COMMON_DEPEND}
sys-devel/gettext:*
virtual/pkgconfig:*"
+PATCHES=(
+ "${FILESDIR}/${P}-gcc-10-fno-common.patch"
+)
+
src_configure() {
# configure.ac logic is a little hinky
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-06 22:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-12 17:48 [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-applets/, mate-base/mate-applets/files/ NP Hardass
-- strict thread matches above, loose matches on Subject: below --
2016-11-24 22:22 Ettore Di Giacinto
2017-09-22 21:27 NP Hardass
2020-04-06 22:15 Adam Feldman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox