diff options
Diffstat (limited to 'graphics/ufraw/patches')
7 files changed, 0 insertions, 146 deletions
diff --git a/graphics/ufraw/patches/0001-Change-use-of-header-files.patch b/graphics/ufraw/patches/0001-Change-use-of-header-files.patch deleted file mode 100644 index 64cf176726..0000000000 --- a/graphics/ufraw/patches/0001-Change-use-of-header-files.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a9fc8b39010640fd8e931e8d635160430ade57bc Mon Sep 17 00:00:00 2001 -From: Neil Mayhew <neil_mayhew@users.sourceforge.net> -Date: Fri, 5 Jul 2019 13:08:18 -0600 -Subject: [PATCH 1/2] Change use of header files to follow best practices -Content-Type: text/plain; charset=utf-8 - -This also fixes build errors after recent changes to dependencies ---- - ufraw_exiv2.cc | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc -index f03011b..9a6ec86 100644 ---- a/ufraw_exiv2.cc -+++ b/ufraw_exiv2.cc -@@ -15,9 +15,8 @@ - #include "ufraw.h" - - #ifdef HAVE_EXIV2 --#include <exiv2/image.hpp> --#include <exiv2/easyaccess.hpp> --#include <exiv2/exif.hpp> -+#include <exiv2/exiv2.hpp> -+#include <iostream> - #include <sstream> - #include <cassert> - --- -2.22.0 - diff --git a/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch b/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch deleted file mode 100644 index 1859ca702a..0000000000 --- a/graphics/ufraw/patches/0002-Use-symbolic-error-code.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b85e03dd607fb697f69eb9afb044924f046f9eb3 Mon Sep 17 00:00:00 2001 -From: Neil Mayhew <neil_mayhew@users.sourceforge.net> -Date: Fri, 5 Jul 2019 13:08:35 -0600 -Subject: [PATCH 2/2] Use symbolic error code -Content-Type: text/plain; charset=utf-8 - ---- - ufraw_exiv2.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc -index 9a6ec86..5958b3d 100644 ---- a/ufraw_exiv2.cc -+++ b/ufraw_exiv2.cc -@@ -66,7 +66,7 @@ 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"; -- throw Exiv2::Error(1, error); -+ throw Exiv2::Error(Exiv2::kerErrorMessage, error); - } - - /* List of tag names taken from exiv2's printSummary() in actions.cpp */ --- -2.22.0 - diff --git a/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch b/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch deleted file mode 100644 index 8b26ee3a3d..0000000000 --- a/graphics/ufraw/patches/0003-ufraw-0.22-fix_omp_definitions.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/dcraw_api.cc 2015-06-16 04:58:38.000000000 +0100 -+++ b/dcraw_api.cc 2019-06-30 16:37:05.503409567 +0100 -@@ -689,3 +689,3 @@ - #pragma omp parallel for schedule(static) default(none) \ -- shared(h,dark,rgbWB) -+ firstprivate(black,pixels) shared(h,dark,rgbWB) - #endif -@@ -702,3 +702,3 @@ - #pragma omp parallel for schedule(static) default(none) \ -- shared(h,dark,rgbWB) -+ firstprivate(black,pixels) shared(h,dark,rgbWB) - #endif ---- a/dcraw_indi.c 2015-06-16 04:58:38.000000000 +0100 -+++ b/dcraw_indi.c 2019-06-30 17:03:59.692710441 +0100 -@@ -140,2 +140,3 @@ - default(none) \ -+ firstprivate(iheight,iwidth,noise,threshold) \ - shared(nc,image,size,noise) \ -@@ -145,2 +146,3 @@ - default(none) \ -+ firstprivate(iheight,iwidth,noise,threshold) \ - shared(nc,image,size) \ -@@ -416,2 +418,3 @@ - default(none) \ -+ firstprivate(colors,filters,height,width) \ - shared(image,code,prow,pcol,h) \ -@@ -502,3 +502,4 @@ - default(none) \ -- shared(image,dir,diff) \ -+ firstprivate(filters,height,width) \ -+ shared(image,dir,diff) \ - private(row,col,i,d,c,pix,guess) diff --git a/graphics/ufraw/patches/05_fix_build_due_to_unsigned_char.patch b/graphics/ufraw/patches/05_fix_build_due_to_unsigned_char.patch deleted file mode 100644 index 9b634b69a2..0000000000 --- a/graphics/ufraw/patches/05_fix_build_due_to_unsigned_char.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Philip Rinn <rinni@inventati.org> -Description: Fix build with C++11 as char is unsigned on some architectures -Last-update: 2015-11-04 ---- a/dcraw.cc -+++ b/dcraw.cc -@@ -2054,7 +2054,7 @@ - - void CLASS kodak_radc_load_raw() - { -- static const char src[] = { -+ static const signed char src[] = { - 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, - 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, - 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8, diff --git a/graphics/ufraw/patches/CVE-2015-8366.patch b/graphics/ufraw/patches/CVE-2015-8366.patch deleted file mode 100644 index 9d59ca413f..0000000000 --- a/graphics/ufraw/patches/CVE-2015-8366.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix a buffer overflow bug. See -https://github.com/LibRaw/LibRaw/commit/89d065424f09b788f443734d44857289489ca9e2 - ---- a/dcraw.cc -+++ b/dcraw.cc -@@ -3013,7 +3013,10 @@ - diff = diff ? -diff : 0x80; - if (ftell(ifp) + 12 >= (int) seg[1][1]) - diff = 0; -- raw_image[pix] = pred[pix & 1] += diff; -+ if(pix>=raw_width*raw_height) -+ derror(); -+ else -+ raw_image[pix] = pred[pix & 1] += diff; - if (!(pix & 1) && HOLE(pix / raw_width)) pix += 2; - } - maximum = 0xff; diff --git a/graphics/ufraw/patches/gcc7.patch b/graphics/ufraw/patches/gcc7.patch deleted file mode 100644 index 2a77b06e62..0000000000 --- a/graphics/ufraw/patches/gcc7.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/dcraw.cc b/dcraw.cc -index 88c8068..d78c66b 100644 ---- a/dcraw.cc -+++ b/dcraw.cc -@@ -8766,8 +8766,8 @@ void CLASS identify() - "Nikon", "Nokia", "Olympus", "Pentax", "Phase One", "Ricoh", - "Samsung", "Sigma", "Sinar", "Sony" }; - char head[32], *cp; -- unsigned fsize, i, c; -- int hlen, flen, zero_fsize=1; -+ unsigned fsize; -+ int hlen, flen, zero_fsize=1, i, c; - struct jhead jh; - - tiff_flip = flip = filters = UINT_MAX; /* unknown */
\ No newline at end of file diff --git a/graphics/ufraw/patches/no-gimp-remote.patch b/graphics/ufraw/patches/no-gimp-remote.patch deleted file mode 100644 index ca4f4beb62..0000000000 --- a/graphics/ufraw/patches/no-gimp-remote.patch +++ /dev/null @@ -1,12 +0,0 @@ -Don't use gimp-remote since gimp 2.4 already includes gimp-remote functionality ---- a/ufraw_conf.c -+++ b/ufraw_conf.c -@@ -137,7 +137,7 @@ - #elif HAVE_GIMP_2_4 - "gimp", /* remoteGimpCommand */ - #else -- "gimp-remote", /* remoteGimpCommand */ -+ "gimp", /* remoteGimpCommand */ - #endif - - /* EXIF data */ |