[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/

[Andreas Sturmlechner]

commit:     56b5e63cb2a7677345ef6fe565e6c2c59ab1dad9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  4 15:35:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 15:41:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b5e63c

media-gfx/ufraw: Drop unused patch

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/ufraw/files/ufraw-0.20-gimp.patch | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/media-gfx/ufraw/files/ufraw-0.20-gimp.patch b/media-gfx/ufraw/files/ufraw-0.20-gimp.patch
deleted file mode 100644
index 8d81007ee6b..00000000000
--- a/media-gfx/ufraw/files/ufraw-0.20-gimp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://ufraw.cvs.sourceforge.net/viewvc/ufraw/ufraw/ufraw-gimp.c?r1=1.82&r2=1.83&diff_format=u
-https://sourceforge.net/p/ufraw/bugs/392/
-https://bugs.gentoo.org/show_bug.cgi?id=527836
-
---- ufraw-gimp.c	2014/01/07 13:00:08	1.82
-+++ ufraw-gimp.c	2014/10/20 04:00:10	1.83
-@@ -79,12 +79,16 @@
-                            load_args,
-                            load_return_vals);
- 
-+#if HAVE_GIMP_2_9
-     gimp_register_magic_load_handler("file_ufraw_load",
-                                      (char *)raw_ext,
-                                      "",
-                                      "0,string,II*\\0,"
-                                      "0,string,MM\\0*,"
-                                      "0,string,<?xml");
-+#else
-+    gimp_register_load_handler("file_ufraw_load", (char *)raw_ext, "");
-+#endif
- 
-     gimp_install_procedure("file_ufraw_load_thumb",
-                            "Loads thumbnails from digital camera raw files.",
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/ufraw/files/

[Andreas Sturmlechner]

commit:     f40350f459b1d6c6e2715031cb59bf22720d3fd8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 23:15:50 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 23:16:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40350f4

media-gfx/ufraw: Fix build with >=media-libs/exiv2-0.27.1

Closes: https://bugs.gentoo.org/688540
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
index b5b4140fff8..2cd888ebc09 100644
--- a/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
+++ b/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
@@ -1,6 +1,6 @@
---- a/ufraw_exiv2.cc	2015-06-16 05:58:38.000000000 +0200
-+++ b/ufraw_exiv2.cc	2018-12-29 22:51:23.291894430 +0100
-@@ -15,9 +15,7 @@
+--- a/ufraw_exiv2.cc
++++ b/ufraw_exiv2.cc
+@@ -15,9 +15,8 @@
  #include "ufraw.h"
  
  #ifdef HAVE_EXIV2
@@ -8,10 +8,11 @@
 -#include <exiv2/easyaccess.hpp>
 -#include <exiv2/exif.hpp>
 +#include <exiv2/exiv2.hpp>
++#include <iostream>
  #include <sstream>
  #include <cassert>
  
-@@ -67,7 +65,11 @@
+@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
          if (exifData.empty()) {
              std::string error(uf->filename);
              error += ": No Exif data found in the file";