gentoo resync : 17.02.2021

3 files changed, 136 insertions, 2 deletions

diff --git a/x11-themes/gtk-engines-experience/Manifest b/x11-themes/gtk-engines-experience/Manifest
index 2b6f1691a0d4..19ea2be4355c 100644
--- a/x11-themes/gtk-engines-experience/Manifest
+++ b/x11-themes/gtk-engines-experience/Manifest
@@ -1,3 +1,4 @@
+AUX gtk-engines-experience-0.10.5-fno-common.patch 4319 BLAKE2B 1fde87f595e5101425b211f8b85a6bcf75371a659db5bfe9be6926187d54eb474bf1e781c928627efb735f606a1bd9e9aa1557d8a72828bcde97dcc52e3e30fb SHA512 944798c2fb9d5a23cef8e32c430e7bca8a4f44044b8857aee171fd56f1a100928a91fc33f29429f0c0fe8a5d034ab98dbaffac43de7e98fbd3c8a2d8e6fd5150
 DIST gtk-engine-experience-0.10.5.tar.bz2 266776 BLAKE2B d4f0e09af661aa486d26711fc563aab581cbef68874a8324d4a30e70649a6666b3a8dd98aab6cb7c13f48f7889747d3f5c0dd74d3c00003b116d4a285914b650 SHA512 c783b5bb19cbdda202cdc5294b27fad5b9854bdebb2ffce28ba675d743ab385dc82fa63dcfc1818207847de4be37daea9177affa179339edcfe622c9fd2a6604
-EBUILD gtk-engines-experience-0.10.5.ebuild 683 BLAKE2B c5dc3f0d3d02dbe51991dbec8290464c924e911171e9ed5261f47e528628cdaec68ef71dd885927bd16d653ae8d4679f5ed812840fc3e65e9ed0d51df9bacbd4 SHA512 c27a19e20394557c865f3da61071ab0eab2231ca27ca4f6b8e0fd163b5f1c962031dd53fdca1cf33de931ec3a065b305c0c9ca159517ea5b25a3a8b7c232087f
+EBUILD gtk-engines-experience-0.10.5.ebuild 732 BLAKE2B 62fc0239ca6afb87f1b49687d25bb0fd5fea93a54708d975e2e583b69ace525aa60e5621375fe48aba2632ce76a0d9f28edfa17d3d41ebc66636c69720e3dbfa SHA512 95c6f945253aa4ec0ab67b48dccf836d742d0cdfca1f71a1bd3a8f4da477ba73706fb978bbf8e4b359a5777e3b44e00f06d9595221e5349bc8223a4354de409b
 MISC metadata.xml 572 BLAKE2B f85f505d2b4a2f3bab87d3ad20b402fbfbd864bacc16d69c057f79e894614642e433730f0ea19ff710a09e2616749ced6708584c2d702eecd3b4b40d7cb8558f SHA512 6d6d6ef0f4f55cc64ba6543acbb4d761ac1e56ea9d646b0f93f2027a0458d0f5a57f1fa17f13679a9f1630bf4d15acdaf28bfc8b2c7afe6ea8a80b0e770c885b
diff --git a/x11-themes/gtk-engines-experience/files/gtk-engines-experience-0.10.5-fno-common.patch b/x11-themes/gtk-engines-experience/files/gtk-engines-experience-0.10.5-fno-common.patch
new file mode 100644
index 000000000000..f93fc1c3b3ce
--- /dev/null
+++ b/x11-themes/gtk-engines-experience/files/gtk-engines-experience-0.10.5-fno-common.patch
@@ -0,0 +1,131 @@
+--- a/src/experience.h
++++ b/src/experience.h
+@@ -39,17 +39,18 @@
+ 
+ #define CLAMP_COLOR(color) CLAMP(color, 0, GDK_COLOR_MAX)
+ 
+-enum {
++typedef enum {
+ 	NONE,
+ 	PARSING,
+ 	RUNNING
+-} experience_engine_state EXPERIENCE_INTERNAL;
++} experience_engine_state_type;
++extern experience_engine_state_type experience_engine_state EXPERIENCE_INTERNAL;
+ 
+-GQuark experience_g_quark EXPERIENCE_INTERNAL;
++extern GQuark experience_g_quark EXPERIENCE_INTERNAL;
+ 
+-gboolean experience_print_widget_path EXPERIENCE_INTERNAL;
++extern gboolean experience_print_widget_path EXPERIENCE_INTERNAL;
+ /* gboolean warn_invalid_gtype; */
+-gboolean experience_parser_error EXPERIENCE_INTERNAL;
++extern gboolean experience_parser_error EXPERIENCE_INTERNAL;
+ 
+ /* All GTK drawing functions: */
+ typedef enum {
+--- a/src/fill.c
++++ b/src/fill.c
+@@ -22,6 +22,8 @@
+ #include <string.h>
+ #include "fill.h"
+ 
++eXperienceDrawableClass * experience_fill_class EXPERIENCE_INTERNAL;
++
+ void
+ experience_fill_set_color (eXperienceFill * fill, eXperienceDynamicColor color)
+ {
+--- a/src/fill.h
++++ b/src/fill.h
+@@ -25,7 +25,7 @@
+ #include "drawable.h"
+ #include "dynamic_color.h"
+ 
+-eXperienceDrawableClass * experience_fill_class EXPERIENCE_INTERNAL;
++extern eXperienceDrawableClass * experience_fill_class EXPERIENCE_INTERNAL;
+ 
+ typedef struct {
+ 	eXperienceDrawable drawable;
+--- a/src/image.c
++++ b/src/image.c
+@@ -26,6 +26,8 @@
+ #include "filter.h"
+ #include "image_loading.h"
+ 
++eXperienceDrawableClass * experience_image_class EXPERIENCE_INTERNAL;
++
+ #define CHECK_AND_SET_OPTION(image, option, message) { \
+ 	if (image->options_set & option) { \
+ 			g_printerr ("Error in image #%i in group %s: %s\n", image->drawable.number, image->drawable.group_name, message); \
+--- a/src/image.h
++++ b/src/image.h
+@@ -25,7 +25,7 @@
+ #include <gdk/gdk.h>
+ #include "drawable.h"
+ 
+-eXperienceDrawableClass * experience_image_class EXPERIENCE_INTERNAL;
++extern eXperienceDrawableClass * experience_image_class EXPERIENCE_INTERNAL;
+ 
+ typedef enum
+ {
+--- a/src/main.c
++++ b/src/main.c
+@@ -29,6 +29,10 @@
+ #include "image.h"
+ #include "fill.h"
+ 
++GQuark experience_g_quark EXPERIENCE_INTERNAL;
++gboolean experience_parser_error EXPERIENCE_INTERNAL;
++gboolean experience_print_widget_path EXPERIENCE_INTERNAL;
++
+ G_MODULE_EXPORT void theme_init (GTypeModule *module);
+ G_MODULE_EXPORT void theme_exit (void);
+ G_MODULE_EXPORT GtkRcStyle * theme_create_rc_style (void);
+--- a/src/rcstyle.c
++++ b/src/rcstyle.c
+@@ -31,6 +31,9 @@
+ #include "image_loading.h"
+ #include "render.h"
+ 
++GType experience_type_rc_style EXPERIENCE_INTERNAL;
++experience_engine_state_type experience_engine_state EXPERIENCE_INTERNAL;
++
+ static void      experience_rc_style_init         (eXperienceRcStyle      *style);
+ static void      experience_rc_style_class_init   (eXperienceRcStyleClass *klass);
+ static GtkStyle *experience_rc_style_create_style (GtkRcStyle         *rc_style);
+--- a/src/rcstyle.h
++++ b/src/rcstyle.h
+@@ -29,7 +29,7 @@
+ typedef struct _eXperienceRcStyle eXperienceRcStyle;
+ typedef struct _eXperienceRcStyleClass eXperienceRcStyleClass;
+ 
+-GType experience_type_rc_style EXPERIENCE_INTERNAL;
++extern GType experience_type_rc_style EXPERIENCE_INTERNAL;
+ 
+ #define EXPERIENCE_TYPE_RC_STYLE              experience_type_rc_style
+ #define EXPERIENCE_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), EXPERIENCE_TYPE_RC_STYLE, eXperienceRcStyle))
+--- a/src/style.c
++++ b/src/style.c
+@@ -24,6 +24,9 @@
+ #include "style.h"
+ #include "drawing_functions.h"
+ 
++GType experience_type_style EXPERIENCE_INTERNAL;
++GtkStyleClass *experience_style_parent_class EXPERIENCE_INTERNAL;
++
+ static void
+ experience_style_class_init (eXperienceStyleClass * klass)
+ {
+--- a/src/style.h
++++ b/src/style.h
+@@ -25,8 +25,8 @@
+ typedef struct _eXperienceStyle eXperienceStyle;
+ typedef struct _eXperienceStyleClass eXperienceStyleClass;
+ 
+-GType experience_type_style EXPERIENCE_INTERNAL;
+-GtkStyleClass *experience_style_parent_class EXPERIENCE_INTERNAL;
++extern GType experience_type_style EXPERIENCE_INTERNAL;
++extern GtkStyleClass *experience_style_parent_class EXPERIENCE_INTERNAL;
+ 
+ #define EXPERIENCE_TYPE_STYLE              experience_type_style
+ #define EXPERIENCE_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), EXPERIENCE_TYPE_STYLE, eXperienceStyle))
diff --git a/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild b/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
index 87addbca4a19..452ed2e297de 100644
--- a/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
+++ b/x11-themes/gtk-engines-experience/gtk-engines-experience-0.10.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,8 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_prepare() {
 	default
 	eautoreconf # need new libtool for interix