commit: 98692e4c4ad494b88c4902ca1ab3e6541190bbe8 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun Feb 2 10:01:50 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun Feb 2 10:58:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98692e4c
x11-misc/gtkdialog: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Closes: https://bugs.gentoo.org/show_bug.cgi?id=707840 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../files/gtkdialog-0.8.3-fno-common.patch | 51 ++++++++++++++++++++++ x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild | 3 +- x11-misc/gtkdialog/gtkdialog-99999.ebuild | 5 ++- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch new file mode 100644 index 00000000000..86fa6a9700a --- /dev/null +++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch @@ -0,0 +1,51 @@ +--- a/src/gtkdialog.h ++++ b/src/gtkdialog.h +@@ -40,24 +40,24 @@ + #define GTKD_FUNCTION_SIGNALS_BLOCK (function_signals_block++) + #define GTKD_FUNCTION_SIGNALS_UNBLOCK (function_signals_block--) + #define GTKD_FUNCTION_SIGNALS_RESET (function_signals_block = FALSE) +-gint function_signals_block; ++extern gint function_signals_block; + + /* Thunor: Used to control/override the widget packing expand and fill + * states at the project level */ +-gint project_space_expand; +-gint project_space_fill; ++extern gint project_space_expand; ++extern gint project_space_fill; + + /* The most recently created radiobutton widget (used for grouping) */ +-GtkWidget *lastradiowidget; ++extern GtkWidget *lastradiowidget; + + /* An accumulated list of menu accelerator groups to be added to the window */ +-GList *accel_groups; ++extern GList *accel_groups; + + /* A list of widgets to hide and to show */ +-GList *widget_hide_list, *widget_show_list; ++extern GList *widget_hide_list, *widget_show_list; + + /* An auto-incremented unique id for each window created */ +-gint window_id; ++extern gint window_id; + + void reset_program_source(void); + //Redundant: gint set_program_source(gchar *name); +--- a/src/gtkdialog.c ++++ b/src/gtkdialog.c +@@ -82,6 +82,14 @@ + gint geometry_x = 0; + gint geometry_y = 0; + ++gint function_signals_block; ++gint project_space_expand; ++gint project_space_fill; ++GtkWidget *lastradiowidget; ++GList *accel_groups; ++GList *widget_hide_list, *widget_show_list; ++gint window_id; ++ + static gboolean + get_geometry(const char *argument) + { diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild index bf0610c4fd8..5e5b48165a4 100644 --- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild +++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,6 +26,7 @@ DEPEND=" " PATCHES=( + "${FILESDIR}"/${PN}-0.8.3-fno-common.patch "${FILESDIR}"/${PN}-0.8.3-optdeps.patch ) diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild index d90e208f2ef..0f60150b0f8 100644 --- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild +++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,6 +30,9 @@ DEPEND=" virtual/pkgconfig virtual/yacc " +PATCHES=( + "${FILESDIR}"/${PN}-0.8.3-fno-common.patch +) src_prepare() { default
