gentoo resync : 25.11.2020

3 files changed, 61 insertions, 6 deletions

diff --git a/media-plugins/gimp-lqr/Manifest b/media-plugins/gimp-lqr/Manifest
index 99b07b1d9792..b82a03f2c775 100644
--- a/media-plugins/gimp-lqr/Manifest
+++ b/media-plugins/gimp-lqr/Manifest
@@ -1,3 +1,4 @@
+AUX gimp-lqr-0.7.2-gcc-10-fno-common.patch 1734 BLAKE2B f024f2c67fb8cbff11de0a867987635d004dc3d49f322390e3f839c4daff875f428c91c4f8787952d91dd6e4081d7dfb78a8bca72cece7924c8243d9efb0e6fd SHA512 cbc66bd44c46b045e032bf7926a8acf7a9ff62beeb79584236fcd28f9fed54de201b3a68b1eb400aa78e655695acab05097bae05ad6a65774ccad292e1c165ee
 DIST gimp-lqr-plugin-0.7.2.tar.bz2 784455 BLAKE2B 699557848a2503fb64f428ca404fa2c9b1c114bb11b1664e2f2690496b0acb3fb6d3903979c5f7cd4f0972211284f8d7bcf914b339db90184d38e628706b3156 SHA512 bcbd72aa8e31a86261a2de35c0d9acdbe6bef9f612281a32239578e0bbd74ba154a5b7fe2b8bfee4ef3301333c0ebb749a12732497d82452720bf9be271048c4
-EBUILD gimp-lqr-0.7.2.ebuild 487 BLAKE2B 3cc21f6e29efd747c6f273734689f024955a035032a2d1ca2d645fd388c9629c4c198dd264b81c412473fa1609e0ca55f503bfc955e72ae29d626ede79690b9d SHA512 1acc677db70fb835215287660c85823665bda302cefd6fd38cee41dbf2ec2a929e2cf080db60534e5ecada06359bd2c78c6e3ce0f63d60cc95b36cf6354efd3c
+EBUILD gimp-lqr-0.7.2-r1.ebuild 543 BLAKE2B 9388ed3375a7ebc7b5a00ad532e8c19f2806d52b0b5bed015f53daadc2c5e37fd0cad6dcfa52016d206dc57f8efa6bd68f1aa8f2d8c7cdf40bd9c17f8d5d4c42 SHA512 5553e9e9479da98c9ce447dc70913501727265ed80f069d59e0b6ed04bb3d1e9d3a009a723ab395470f83520639c35244322e15028b12fadc0ab5c017a8d483d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
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
new file mode 100644
index 000000000000..2f253cb0ac52
--- /dev/null
+++ b/media-plugins/gimp-lqr/files/gimp-lqr-0.7.2-gcc-10-fno-common.patch
@@ -0,0 +1,52 @@
+https://bugs.gentoo.org/708520
+https://github.com/carlobaldassi/gimp-lqr-plugin/issues/7
+--- a/src/interface_aux.c	2013-08-05 06:06:03.000000000 -0700
++++ b/src/interface_aux.c	2020-10-06 10:44:45.349564022 -0700
+@@ -48,11 +48,11 @@
+ 
+ gint dialog_aux_response = GTK_RESPONSE_OK;
+ 
+-PlugInUIVals *ui_state;
+-PlugInVals *state;
+-PlugInDialogVals *dialog_state;
++extern PlugInUIVals *ui_state;
++extern PlugInVals *state;
++extern PlugInDialogVals *dialog_state;
+ 
+-GtkWidget *dlg;
++extern GtkWidget *dlg;
+ 
+ /***  Public functions  ***/
+ 
+--- a/src/interface_I.c	2013-08-05 06:06:03.000000000 -0700
++++ b/src/interface_I.c	2020-10-06 10:44:45.349564022 -0700
+@@ -65,13 +65,13 @@
+ 
+ gint dialog_I_response = GTK_RESPONSE_OK;
+ 
+-PlugInUIVals *ui_state;
+-PlugInVals *state;
+-PlugInDialogVals *dialog_state;
+-gboolean features_are_sensitive;
++extern PlugInUIVals *ui_state;
++extern PlugInVals *state;
++extern PlugInDialogVals *dialog_state;
++extern gboolean features_are_sensitive;
+ InterfaceIData interface_I_data;
+ 
+-GtkWidget *dlg;
++extern GtkWidget *dlg;
+ GtkWidget *coordinates;
+ 
+ gulong size_changed = 0;
+--- a/src/main.c	2013-08-05 06:06:03.000000000 -0700
++++ a/src/main.c	2020-10-06 10:44:45.349564022 -0700
+@@ -179,7 +179,7 @@
+   {GIMP_PDB_INT32, "resize_aux_layers",
+    "Whether to resize auxiliary layers"},
+   {GIMP_PDB_INT32, "resize_canvas", "Whether to resize canvas"},
+-  {GIMP_PDB_INT32, "output target", "Output target (same layer, new layer, new image)"},
++  {GIMP_PDB_INT32, "output_target", "Output target (same layer, new layer, new image)"},
+   {GIMP_PDB_INT32, "seams", "Whether to output the seam map"},
+   {GIMP_PDB_INT32, "nrg_func", "Energy function to use"},
+   {GIMP_PDB_INT32, "res_order", "Resize order"},
diff --git a/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild b/media-plugins/gimp-lqr/gimp-lqr-0.7.2-r1.ebuild
index cd048f5af6a8..d1a681c7ced1 100644
--- a/media-plugins/gimp-lqr/gimp-lqr-0.7.2.ebuild
+++ b/media-plugins/gimp-lqr/gimp-lqr-0.7.2-r1.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 MY_P="${PN}-plugin-${PV}"
 
 DESCRIPTION="Content-aware resizing for the GIMP"
 HOMEPAGE="http://liquidrescale.wikidot.com/"
 SRC_URI="http://liquidrescale.wikidot.com/local--files/en:download-page-sources/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
-	>=media-gfx/gimp-2.8
+	>=media-gfx/gimp-2.8:0/2
 	media-libs/liblqr"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.2-gcc-10-fno-common.patch"
+)