gentoo (valentine's day) resync : 14.02.2021

4 files changed, 39 insertions, 5 deletions

diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index c1aedbda5c44..1521a79097d9 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,4 +1,5 @@
-AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b
+AUX fotoxx-15.05-docdir.patch 395 BLAKE2B b0fb1bdd0e56f29569b49ca6b6d2acd205a1272924ab955d5778ffb7150400193ee12052a169ee9a2e0e07dd6b40c0ccb0f62e84463c651577447d32109fa273 SHA512 9204f4712ced994b22137b8f5fc80976120835ea5bde14b5caaa5db604b10de7a7b6ea743333603a1887a8012d806a5af8cf0ffea26f8ea8eb74d228fb822c1e
+AUX fotoxx-15.05-gcc-11.patch 925 BLAKE2B ac27fa95bc877b66607f5aca75c44462c0a8c39ee3acc117c9f6949a9d4975728156470dc04dce9b8a95582c72e5c236b68e4d2f01508246bdef0ac23b087621 SHA512 19801bf47e796953d148a12cdeb1eb5dbac23f4d54b41782923c61096f9dabf791b6d7afbc529f2c4214f940d83ba6807816afb0f8303b3ab514330bc01dfb63
 DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
-EBUILD fotoxx-15.05.ebuild 1158 BLAKE2B e2885489ef78b828f1141a268876333168088c3a042208cbcedbf068613711e47526ca8fb79121d61f067030d6cb2cc7cb671161c8d2a26a5e6480c7915965f7 SHA512 374c9c7e979a9427003ed76f36aa0b7233667407fc2a7ee1498e7bbba9e351ba3202efaaa676eed84ddb5997a9d0cba1f5f38ee878c3f75aac5054d7ba8100d8
+EBUILD fotoxx-15.05.ebuild 1199 BLAKE2B deaad80fe616d8691961775ca86ac57c93fad6920a5f7bd46b97163ec83f7d8450bb7d3d5b925b26402c9817be6d8c94b7ab365bb649093a5db6a3f34c30615b SHA512 cb0117567b401365354eb10b3554363afa48400f6b4412468897fca144921c849be45d7839eb47dcdae25dd4488fac212b1ba1370fa31fde88f25c2859dbd57d
 MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05.patch b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
index 15fdaa9abacf..8cab49ff51ea 100644
--- a/media-gfx/fotoxx/files/fotoxx-15.05.patch
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
@@ -1,4 +1,3 @@
-diff -r -U1 fotoxx-14.10.2.orig/Makefile fotoxx-14.10.2/Makefile
 --- fotoxx-14.10.2.orig/Makefile	2014-10-09 15:17:09.000000000 +0700
 +++ fotoxx-14.10.2/Makefile	2014-10-13 20:44:55.061728475 +0700
 @@ -16,3 +16,3 @@
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
new file mode 100644
index 000000000000..5d84e687d397
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
@@ -0,0 +1,31 @@
+Fix 'smart_erase_blur' declaration and definition mismatch.
+
+https://bugs.gentoo.org/768207
+--- a/f.repair.cc
++++ b/f.repair.cc
+@@ -2265,7 +2265,7 @@ void smart_erase_func(int mode)
+ 
+ //  add blur to the erased area to help mask the side-effects
+ 
+-int smart_erase_blur(float radius)
++void smart_erase_blur(float radius)
+ {
+    int         ii, px, py, dx, dy, adx, ady;
+    float       blur_weight[12][12];                                        //  up to blur radius = 10
+@@ -2274,7 +2274,7 @@ int smart_erase_blur(float radius)
+    float       red, green, blue;
+    float       *pix9, *pix3, *pixN;
+ 
+-   if (sa_stat != 3) return 0;
++   if (sa_stat != 3) return;
+ 
+    rad = radius - 0.2;
+    rad2 = rad * rad;
+@@ -2342,7 +2342,6 @@ int smart_erase_blur(float radius)
+    CEF->Fmods++;
+    CEF->Fsaved = 0;
+    Fpaint2();                                                              //  update window
+-   return 0;
+ }
+ 
+ 
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
index b0b0b1e02756..b15710b39828 100644
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,10 @@ RDEPEND="${DEPEND}
 	media-libs/exiftool
 	x11-misc/xdg-utils"
 
-PATCHES=( "${FILESDIR}"/${P}.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
+)
 
 src_compile() {
 	tc-export CXX