| 1 |
commit: f2e63030ebfbcf3efea6a9a4bffe40acb4df454f |
| 2 |
Author: Alexandra Parker <alex.iris.parker <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Oct 7 18:27:33 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 7 18:46:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e63030 |
| 7 |
|
| 8 |
media-plugins/gimp-lqr: fix GCC 10 (-fno-common) build |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/708520 |
| 11 |
Signed-off-by: Alexandra Parker <alex.iris.parker <AT> gmail.com> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/gimp-lqr-0.7.2-gcc-10-fno-common.patch | 52 ++++++++++++++++++++++ |
| 15 |
media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild | 4 ++ |
| 16 |
2 files changed, 56 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-plugins/gimp-lqr/files/gimp-lqr-0.7.2-gcc-10-fno-common.patch b/media-plugins/gimp-lqr/files/gimp-lqr-0.7.2-gcc-10-fno-common.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..2f253cb0ac5 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-plugins/gimp-lqr/files/gimp-lqr-0.7.2-gcc-10-fno-common.patch |
| 23 |
@@ -0,0 +1,52 @@ |
| 24 |
+https://bugs.gentoo.org/708520 |
| 25 |
+https://github.com/carlobaldassi/gimp-lqr-plugin/issues/7 |
| 26 |
+--- a/src/interface_aux.c 2013-08-05 06:06:03.000000000 -0700 |
| 27 |
++++ b/src/interface_aux.c 2020-10-06 10:44:45.349564022 -0700 |
| 28 |
+@@ -48,11 +48,11 @@ |
| 29 |
+ |
| 30 |
+ gint dialog_aux_response = GTK_RESPONSE_OK; |
| 31 |
+ |
| 32 |
+-PlugInUIVals *ui_state; |
| 33 |
+-PlugInVals *state; |
| 34 |
+-PlugInDialogVals *dialog_state; |
| 35 |
++extern PlugInUIVals *ui_state; |
| 36 |
++extern PlugInVals *state; |
| 37 |
++extern PlugInDialogVals *dialog_state; |
| 38 |
+ |
| 39 |
+-GtkWidget *dlg; |
| 40 |
++extern GtkWidget *dlg; |
| 41 |
+ |
| 42 |
+ /*** Public functions ***/ |
| 43 |
+ |
| 44 |
+--- a/src/interface_I.c 2013-08-05 06:06:03.000000000 -0700 |
| 45 |
++++ b/src/interface_I.c 2020-10-06 10:44:45.349564022 -0700 |
| 46 |
+@@ -65,13 +65,13 @@ |
| 47 |
+ |
| 48 |
+ gint dialog_I_response = GTK_RESPONSE_OK; |
| 49 |
+ |
| 50 |
+-PlugInUIVals *ui_state; |
| 51 |
+-PlugInVals *state; |
| 52 |
+-PlugInDialogVals *dialog_state; |
| 53 |
+-gboolean features_are_sensitive; |
| 54 |
++extern PlugInUIVals *ui_state; |
| 55 |
++extern PlugInVals *state; |
| 56 |
++extern PlugInDialogVals *dialog_state; |
| 57 |
++extern gboolean features_are_sensitive; |
| 58 |
+ InterfaceIData interface_I_data; |
| 59 |
+ |
| 60 |
+-GtkWidget *dlg; |
| 61 |
++extern GtkWidget *dlg; |
| 62 |
+ GtkWidget *coordinates; |
| 63 |
+ |
| 64 |
+ gulong size_changed = 0; |
| 65 |
+--- a/src/main.c 2013-08-05 06:06:03.000000000 -0700 |
| 66 |
++++ a/src/main.c 2020-10-06 10:44:45.349564022 -0700 |
| 67 |
+@@ -179,7 +179,7 @@ |
| 68 |
+ {GIMP_PDB_INT32, "resize_aux_layers", |
| 69 |
+ "Whether to resize auxiliary layers"}, |
| 70 |
+ {GIMP_PDB_INT32, "resize_canvas", "Whether to resize canvas"}, |
| 71 |
+- {GIMP_PDB_INT32, "output target", "Output target (same layer, new layer, new image)"}, |
| 72 |
++ {GIMP_PDB_INT32, "output_target", "Output target (same layer, new layer, new image)"}, |
| 73 |
+ {GIMP_PDB_INT32, "seams", "Whether to output the seam map"}, |
| 74 |
+ {GIMP_PDB_INT32, "nrg_func", "Energy function to use"}, |
| 75 |
+ {GIMP_PDB_INT32, "res_order", "Resize order"}, |
| 76 |
|
| 77 |
diff --git a/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild b/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild |
| 78 |
index 83a4ea2f875..d040db2f7e3 100644 |
| 79 |
--- a/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild |
| 80 |
+++ b/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild |
| 81 |
@@ -18,3 +18,7 @@ RDEPEND=" |
| 82 |
>=media-gfx/gimp-2.8 |
| 83 |
media-libs/liblqr" |
| 84 |
DEPEND="${RDEPEND}" |
| 85 |
+ |
| 86 |
+PATCHES=( |
| 87 |
+ "${FILESDIR}/${PN}-0.7.2-gcc-10-fno-common.patch" |
| 88 |
+) |
Archives