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@gentoo.org>

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 (file)
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.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 edec396dcf2c5ed196889615770a0817be9b5379..97fbd7bd56cfa660d889247e8e5aa54b3d3f1154 100644 (file)
--- 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