From: "Adam Feldman" <np-hardass@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/
Date: Wed, 2 Sep 2020 05:55:44 +0000 (UTC) [thread overview]
Message-ID: <1599026136.2ee9b842eacdd8c5870442e49d32da842422e298.np-hardass@gentoo> (raw)
commit: 2ee9b842eacdd8c5870442e49d32da842422e298
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 05:25:23 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 05:55:36 2020 +0000
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 <NP-Hardass <AT> 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 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.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 0000000..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 <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.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
deleted file mode 100644
index 077a17c..0000000
--- 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 38f90f1..0000000
--- 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
-}
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 95%
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 edec396..a92aa88 100644
--- a/mate-base/mate-applets/mate-applets-1.22.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Applets for the MATE Desktop and Panel"
@@ -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
diff --git a/mate-base/mate-applets/mate-applets-1.24.0.ebuild b/mate-base/mate-applets/mate-applets-1.24.0.ebuild
index 7831931..eec4c6a 100644
--- a/mate-base/mate-applets/mate-applets-1.24.0.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.24.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Applets for the MATE Desktop and Panel"
next reply other threads:[~2020-09-02 5:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 5:55 Adam Feldman [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-09 22:52 [gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/files/, mate-base/mate-applets/ Adam Feldman
2017-09-22 21:17 NP Hardass
2017-09-22 20:59 NP Hardass
2016-11-22 11:11 Ettore Di Giacinto
2016-09-13 22:17 NP Hardass
2016-09-13 21:31 NP Hardass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1599026136.2ee9b842eacdd8c5870442e49d32da842422e298.np-hardass@gentoo \
--to=np-hardass@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox