| 1 |
commit: 20a697ec94dd5f167b50a970bba0bffccbd70775 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 11 10:12:31 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 11 10:12:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a697ec |
| 7 |
|
| 8 |
media-gfx/fotoxx: tweak for gcc-11 |
| 9 |
|
| 10 |
Reported-by: Kobboi |
| 11 |
Closes: https://bugs.gentoo.org/768207 |
| 12 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
...otoxx-15.05.patch => fotoxx-15.05-docdir.patch} | 1 - |
| 16 |
media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch | 31 ++++++++++++++++++++++ |
| 17 |
media-gfx/fotoxx/fotoxx-15.05.ebuild | 7 +++-- |
| 18 |
3 files changed, 36 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05.patch b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch |
| 21 |
similarity index 85% |
| 22 |
rename from media-gfx/fotoxx/files/fotoxx-15.05.patch |
| 23 |
rename to media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch |
| 24 |
index 15fdaa9abac..8cab49ff51e 100644 |
| 25 |
--- a/media-gfx/fotoxx/files/fotoxx-15.05.patch |
| 26 |
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch |
| 27 |
@@ -1,4 +1,3 @@ |
| 28 |
-diff -r -U1 fotoxx-14.10.2.orig/Makefile fotoxx-14.10.2/Makefile |
| 29 |
--- fotoxx-14.10.2.orig/Makefile 2014-10-09 15:17:09.000000000 +0700 |
| 30 |
+++ fotoxx-14.10.2/Makefile 2014-10-13 20:44:55.061728475 +0700 |
| 31 |
@@ -16,3 +16,3 @@ |
| 32 |
|
| 33 |
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch |
| 34 |
new file mode 100644 |
| 35 |
index 00000000000..5d84e687d39 |
| 36 |
--- /dev/null |
| 37 |
+++ b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch |
| 38 |
@@ -0,0 +1,31 @@ |
| 39 |
+Fix 'smart_erase_blur' declaration and definition mismatch. |
| 40 |
+ |
| 41 |
+https://bugs.gentoo.org/768207 |
| 42 |
+--- a/f.repair.cc |
| 43 |
++++ b/f.repair.cc |
| 44 |
+@@ -2265,7 +2265,7 @@ void smart_erase_func(int mode) |
| 45 |
+ |
| 46 |
+ // add blur to the erased area to help mask the side-effects |
| 47 |
+ |
| 48 |
+-int smart_erase_blur(float radius) |
| 49 |
++void smart_erase_blur(float radius) |
| 50 |
+ { |
| 51 |
+ int ii, px, py, dx, dy, adx, ady; |
| 52 |
+ float blur_weight[12][12]; // up to blur radius = 10 |
| 53 |
+@@ -2274,7 +2274,7 @@ int smart_erase_blur(float radius) |
| 54 |
+ float red, green, blue; |
| 55 |
+ float *pix9, *pix3, *pixN; |
| 56 |
+ |
| 57 |
+- if (sa_stat != 3) return 0; |
| 58 |
++ if (sa_stat != 3) return; |
| 59 |
+ |
| 60 |
+ rad = radius - 0.2; |
| 61 |
+ rad2 = rad * rad; |
| 62 |
+@@ -2342,7 +2342,6 @@ int smart_erase_blur(float radius) |
| 63 |
+ CEF->Fmods++; |
| 64 |
+ CEF->Fsaved = 0; |
| 65 |
+ Fpaint2(); // update window |
| 66 |
+- return 0; |
| 67 |
+ } |
| 68 |
+ |
| 69 |
+ |
| 70 |
|
| 71 |
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild |
| 72 |
index b0b0b1e0275..b15710b3982 100644 |
| 73 |
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild |
| 74 |
+++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2020 Gentoo Authors |
| 77 |
+# Copyright 1999-2021 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=6 |
| 81 |
@@ -25,7 +25,10 @@ RDEPEND="${DEPEND} |
| 82 |
media-libs/exiftool |
| 83 |
x11-misc/xdg-utils" |
| 84 |
|
| 85 |
-PATCHES=( "${FILESDIR}"/${P}.patch ) |
| 86 |
+PATCHES=( |
| 87 |
+ "${FILESDIR}"/${P}-docdir.patch |
| 88 |
+ "${FILESDIR}"/${P}-gcc-11.patch |
| 89 |
+) |
| 90 |
|
| 91 |
src_compile() { |
| 92 |
tc-export CXX |
Archives