| 1 |
commit: 98692e4c4ad494b88c4902ca1ab3e6541190bbe8 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 2 10:01:50 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 2 10:58:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98692e4c |
| 7 |
|
| 8 |
x11-misc/gtkdialog: Fix CFLAGS=-fno-common |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 11 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707840 |
| 12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/gtkdialog-0.8.3-fno-common.patch | 51 ++++++++++++++++++++++ |
| 15 |
x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild | 3 +- |
| 16 |
x11-misc/gtkdialog/gtkdialog-99999.ebuild | 5 ++- |
| 17 |
3 files changed, 57 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..86fa6a9700a |
| 22 |
--- /dev/null |
| 23 |
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fno-common.patch |
| 24 |
@@ -0,0 +1,51 @@ |
| 25 |
+--- a/src/gtkdialog.h |
| 26 |
++++ b/src/gtkdialog.h |
| 27 |
+@@ -40,24 +40,24 @@ |
| 28 |
+ #define GTKD_FUNCTION_SIGNALS_BLOCK (function_signals_block++) |
| 29 |
+ #define GTKD_FUNCTION_SIGNALS_UNBLOCK (function_signals_block--) |
| 30 |
+ #define GTKD_FUNCTION_SIGNALS_RESET (function_signals_block = FALSE) |
| 31 |
+-gint function_signals_block; |
| 32 |
++extern gint function_signals_block; |
| 33 |
+ |
| 34 |
+ /* Thunor: Used to control/override the widget packing expand and fill |
| 35 |
+ * states at the project level */ |
| 36 |
+-gint project_space_expand; |
| 37 |
+-gint project_space_fill; |
| 38 |
++extern gint project_space_expand; |
| 39 |
++extern gint project_space_fill; |
| 40 |
+ |
| 41 |
+ /* The most recently created radiobutton widget (used for grouping) */ |
| 42 |
+-GtkWidget *lastradiowidget; |
| 43 |
++extern GtkWidget *lastradiowidget; |
| 44 |
+ |
| 45 |
+ /* An accumulated list of menu accelerator groups to be added to the window */ |
| 46 |
+-GList *accel_groups; |
| 47 |
++extern GList *accel_groups; |
| 48 |
+ |
| 49 |
+ /* A list of widgets to hide and to show */ |
| 50 |
+-GList *widget_hide_list, *widget_show_list; |
| 51 |
++extern GList *widget_hide_list, *widget_show_list; |
| 52 |
+ |
| 53 |
+ /* An auto-incremented unique id for each window created */ |
| 54 |
+-gint window_id; |
| 55 |
++extern gint window_id; |
| 56 |
+ |
| 57 |
+ void reset_program_source(void); |
| 58 |
+ //Redundant: gint set_program_source(gchar *name); |
| 59 |
+--- a/src/gtkdialog.c |
| 60 |
++++ b/src/gtkdialog.c |
| 61 |
+@@ -82,6 +82,14 @@ |
| 62 |
+ gint geometry_x = 0; |
| 63 |
+ gint geometry_y = 0; |
| 64 |
+ |
| 65 |
++gint function_signals_block; |
| 66 |
++gint project_space_expand; |
| 67 |
++gint project_space_fill; |
| 68 |
++GtkWidget *lastradiowidget; |
| 69 |
++GList *accel_groups; |
| 70 |
++GList *widget_hide_list, *widget_show_list; |
| 71 |
++gint window_id; |
| 72 |
++ |
| 73 |
+ static gboolean |
| 74 |
+ get_geometry(const char *argument) |
| 75 |
+ { |
| 76 |
|
| 77 |
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild |
| 78 |
index bf0610c4fd8..5e5b48165a4 100644 |
| 79 |
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild |
| 80 |
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild |
| 81 |
@@ -1,4 +1,4 @@ |
| 82 |
-# Copyright 1999-2017 Gentoo Foundation |
| 83 |
+# Copyright 1999-2020 Gentoo Authors |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
EAPI=6 |
| 87 |
@@ -26,6 +26,7 @@ DEPEND=" |
| 88 |
" |
| 89 |
|
| 90 |
PATCHES=( |
| 91 |
+ "${FILESDIR}"/${PN}-0.8.3-fno-common.patch |
| 92 |
"${FILESDIR}"/${PN}-0.8.3-optdeps.patch |
| 93 |
) |
| 94 |
|
| 95 |
|
| 96 |
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild |
| 97 |
index d90e208f2ef..0f60150b0f8 100644 |
| 98 |
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild |
| 99 |
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild |
| 100 |
@@ -1,4 +1,4 @@ |
| 101 |
-# Copyright 1999-2018 Gentoo Foundation |
| 102 |
+# Copyright 1999-2020 Gentoo Authors |
| 103 |
# Distributed under the terms of the GNU General Public License v2 |
| 104 |
|
| 105 |
EAPI=6 |
| 106 |
@@ -30,6 +30,9 @@ DEPEND=" |
| 107 |
virtual/pkgconfig |
| 108 |
virtual/yacc |
| 109 |
" |
| 110 |
+PATCHES=( |
| 111 |
+ "${FILESDIR}"/${PN}-0.8.3-fno-common.patch |
| 112 |
+) |
| 113 |
|
| 114 |
src_prepare() { |
| 115 |
default |
Archives