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

2023-02-18 Thread Andreas Sturmlechner 
commit: bb7aef31bd067df47065449f3677bae2dd8ceb8f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb  9 13:35:35 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 13:55:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7aef31

media-gfx/rawtherapee: drop 5.8-r4

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/rawtherapee/Manifest|   1 -
 media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch | 221 ---
 media-gfx/rawtherapee/files/RT_5.8_glibc234.patch | 683 --
 media-gfx/rawtherapee/rawtherapee-5.8-r4.ebuild   |  85 ---
 4 files changed, 990 deletions(-)

diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index b6972135aeee..f0e2ae008708 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,2 +1 @@
-DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B 
f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4
 SHA512 
bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
 DIST rawtherapee-5.9.tar.xz 16219076 BLAKE2B 
32039d6927eb4a4efbb49f3ad2bd019bd9f73c92a5e7125b7c560aaf7b6a42a5f1a2f67b24a713e4b255867539eda2bf63ea4e988453ec9634c917a11432a7fb
 SHA512 
0d848a36293eb5cac3212910eaf1d011315269c6bbe780c4c2e5f91719721e25a7d1678a7e4453fa4a9694618978b04828612dc03e1d50cb9c11ad4d238e7ca8

diff --git a/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch 
b/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch
deleted file mode 100644
index 24cbfdcb41db..
--- a/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 15db8cdb57161d57af8307bf85aeda02ea69ddde Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fl=C3=B6ssie?= 
-Date: Sun, 5 Apr 2020 11:26:47 +0200
-Subject: [PATCH] Guard accesses to `Crop::crop_ratios` (#5701)
-

- rtgui/crop.cc | 125 +++---
- rtgui/crop.h  |  11 ++---
- 2 files changed, 92 insertions(+), 44 deletions(-)
-
-diff --git a/rtgui/crop.cc b/rtgui/crop.cc
-index d9d496523..f092f07a5 100644
 a/rtgui/crop.cc
-+++ b/rtgui/crop.cc
-@@ -16,6 +16,8 @@
-  *  You should have received a copy of the GNU General Public License
-  *  along with RawTherapee.  If not, see .
-  */
-+#include 
-+
- #include "crop.h"
- 
- #include "options.h"
-@@ -46,39 +48,82 @@ inline void get_custom_ratio(int w, int h, double &rw, 
double &rh)
- 
- } // namespace
- 
-+class Crop::CropRatios final
-+{
-+public:
-+CropRatios() :
-+ratios{
-+{M("GENERAL_ASIMAGE"), 0.0},
-+{M("GENERAL_CURRENT"), -1.0},
-+{"3:2", 3.0 / 2.0}, // L1.5,P0.666...
-+{"4:3", 4.0 / 3.0}, // L1.333...,   P0.75
-+{"16:9", 16.0 / 9.0},   // L1.777...,   P0.5625
-+{"16:10", 16.0 / 10.0}, // L1.6,P0.625
-+{"1:1", 1.0 / 1.0}, // L1,  P1
-+{"2:1", 2.0 / 1.0}, // L2,  P0.5
-+{"3:1", 3.0 / 1.0}, // L3,  P0.333...
-+{"4:1", 4.0 / 1.0}, // L4,  P0.25
-+{"5:1", 5.0 / 1.0}, // L5,  P0.2
-+{"6:1", 6.0 / 1.0}, // L6,  P0.1666...
-+{"7:1", 7.0 / 1.0}, // L7,  P0.142...
-+{"4:5", 4.0 / 5.0}, // L1.25,   P0.8
-+{"5:7", 5.0 / 7.0}, // L1.4,P0.714...
-+{"6:7", 6.0 / 7.0}, // L1.166...,   P0.857...
-+{"6:17", 6.0 / 17.0},   // L2.833...,   P0.352...
-+{"24:65 - XPAN", 24.0 / 65.0},  // L2.708...,   P0.369...
-+{"1.414 - DIN EN ISO 216", 1.414},  // L1.414,  P0.707...
-+{"3.5:5", 3.5 / 5.0},   // L1.428...,   P0.7
-+{"8.5:11 - US Letter", 8.5 / 11.0}, // L1.294...,   P0.772...
-+{"9.5:12", 9.5 / 12.0}, // L1.263...,   P0.791...
-+{"10:12", 10.0 / 12.0}, // L1.2,P0.833...
-+{"11:14", 11.0 / 14.0}, // L1.272...,   P0.785...
-+{"11:17 - Tabloid", 11.0 / 17.0},   // L1.545...,   P0.647...
-+{"13:19", 13.0 / 19.0}, // L1.461...,   P0.684...
-+{"17:22", 17.0 / 22.0}, // L1.294...,   P0.772...
-+{"45:35 - ePassport", 45.0 / 35.0}, // L1.285,...   P0.777...
-+{"64:27", 64.0 / 27.0}, // L2.370...,   P0.421...
-+}
-+{
-+}
-+
-+std::vector getLabels() const
-+{
-+std::vector res;
-+
-+res.reserve(ratios.size());
-+
-+for (const auto& ratio : ratios

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

2021-08-11 Thread Joonas Niilola 
commit: 5e84258847804bd1073a078b1a5881accad9d2ee
Author: Francesco Riosa  gmail  com>
AuthorDate: Wed Aug 11 15:09:18 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 11 15:18:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e842588

media-gfx/rawtherapee: import some fedora patches to fix gcc:11 comp

GCC 11 in combination with glibc-2.34 braek overloading some functions
see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101747

Closes: https://bugs.gentoo.org/807658
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch | 221 +++
 media-gfx/rawtherapee/files/RT_5.8_glibc234.patch | 683 ++
 media-gfx/rawtherapee/rawtherapee-5.8-r1.ebuild   |  78 +++
 3 files changed, 982 insertions(+)

diff --git a/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch 
b/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch
new file mode 100644
index 000..24cbfdcb41d
--- /dev/null
+++ b/media-gfx/rawtherapee/files/RT_5.8_fix_crop.patch
@@ -0,0 +1,221 @@
+From 15db8cdb57161d57af8307bf85aeda02ea69ddde Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fl=C3=B6ssie?= 
+Date: Sun, 5 Apr 2020 11:26:47 +0200
+Subject: [PATCH] Guard accesses to `Crop::crop_ratios` (#5701)
+
+---
+ rtgui/crop.cc | 125 +++---
+ rtgui/crop.h  |  11 ++---
+ 2 files changed, 92 insertions(+), 44 deletions(-)
+
+diff --git a/rtgui/crop.cc b/rtgui/crop.cc
+index d9d496523..f092f07a5 100644
+--- a/rtgui/crop.cc
 b/rtgui/crop.cc
+@@ -16,6 +16,8 @@
+  *  You should have received a copy of the GNU General Public License
+  *  along with RawTherapee.  If not, see .
+  */
++#include 
++
+ #include "crop.h"
+ 
+ #include "options.h"
+@@ -46,39 +48,82 @@ inline void get_custom_ratio(int w, int h, double &rw, 
double &rh)
+ 
+ } // namespace
+ 
++class Crop::CropRatios final
++{
++public:
++CropRatios() :
++ratios{
++{M("GENERAL_ASIMAGE"), 0.0},
++{M("GENERAL_CURRENT"), -1.0},
++{"3:2", 3.0 / 2.0}, // L1.5,P0.666...
++{"4:3", 4.0 / 3.0}, // L1.333...,   P0.75
++{"16:9", 16.0 / 9.0},   // L1.777...,   P0.5625
++{"16:10", 16.0 / 10.0}, // L1.6,P0.625
++{"1:1", 1.0 / 1.0}, // L1,  P1
++{"2:1", 2.0 / 1.0}, // L2,  P0.5
++{"3:1", 3.0 / 1.0}, // L3,  P0.333...
++{"4:1", 4.0 / 1.0}, // L4,  P0.25
++{"5:1", 5.0 / 1.0}, // L5,  P0.2
++{"6:1", 6.0 / 1.0}, // L6,  P0.1666...
++{"7:1", 7.0 / 1.0}, // L7,  P0.142...
++{"4:5", 4.0 / 5.0}, // L1.25,   P0.8
++{"5:7", 5.0 / 7.0}, // L1.4,P0.714...
++{"6:7", 6.0 / 7.0}, // L1.166...,   P0.857...
++{"6:17", 6.0 / 17.0},   // L2.833...,   P0.352...
++{"24:65 - XPAN", 24.0 / 65.0},  // L2.708...,   P0.369...
++{"1.414 - DIN EN ISO 216", 1.414},  // L1.414,  P0.707...
++{"3.5:5", 3.5 / 5.0},   // L1.428...,   P0.7
++{"8.5:11 - US Letter", 8.5 / 11.0}, // L1.294...,   P0.772...
++{"9.5:12", 9.5 / 12.0}, // L1.263...,   P0.791...
++{"10:12", 10.0 / 12.0}, // L1.2,P0.833...
++{"11:14", 11.0 / 14.0}, // L1.272...,   P0.785...
++{"11:17 - Tabloid", 11.0 / 17.0},   // L1.545...,   P0.647...
++{"13:19", 13.0 / 19.0}, // L1.461...,   P0.684...
++{"17:22", 17.0 / 22.0}, // L1.294...,   P0.772...
++{"45:35 - ePassport", 45.0 / 35.0}, // L1.285,...   P0.777...
++{"64:27", 64.0 / 27.0}, // L2.370...,   P0.421...
++}
++{
++}
++
++std::vector getLabels() const
++{
++std::vector res;
++
++res.reserve(ratios.size());
++
++for (const auto& ratio : ratios) {
++res.push_back(ratio.label);
++}
++
++return res;
++}
++
++double getValue(std::size_t index) const
++{
++return
++index < ratios.size()
++? ratios[index].value
++: ratios[0].value;
++}
++
++void updateCurrentRatio(double value)
++{
++ratios[1].value = value;
++}
++
++private:
++struct CropRatio {
++Glib::ustring label;
++double value;
++};
++
++std::vector ratios;
++};
++
+ Crop::Crop():
+ FoldableToolPanel(this, "crop", M("TP_CROP_LABEL"), false, true),
+-crop_ratios{
+-{M("GENERAL_ASIMAGE"), 0.0},
+-{M("GENERAL_CURRENT"), -1.0},
+-

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

2015-12-15 Thread Pacho Ramos 
commit: cc701dd19ce61eaa29889b185ca4c55298b75126
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Dec 15 20:15:39 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Dec 15 20:16:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc701dd1

media-gfx/rawtherapee: Fix building with latest glibmm/libsigc++ (#568136), fix 
CVE-2015-3885

Package-Manager: portage-2.2.26

 .../files/rawtherapee-4.2-CVE-2015-3885.patch  | 28 ++
 .../files/rawtherapee-4.2-build-cxx11-2.patch  | 14 +
 .../files/rawtherapee-4.2-build-cxx11.patch| 20 +++
 .../rawtherapee/files/rawtherapee-4.2-cxx11.patch  | 27 ++
 .../rawtherapee/files/rawtherapee-4.2-sigc26.patch | 47 
 media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild| 62 ++
 6 files changed, 198 insertions(+)

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch
new file mode 100644
index 000..3de7d7e
--- /dev/null
+++ b/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch
@@ -0,0 +1,28 @@
+Author: Philip Rinn 
+Description: Fix CVE-2015-3885
+Source: 
https://github.com/rawstudio/rawstudio/commit/983bda1f0fa5fa86884381208274198a620f006e
+Last-update: 2015-05-14
+--- a/rtengine/dcraw.c
 b/rtengine/dcraw.c
+@@ -824,7 +824,8 @@
+ 
+ int CLASS ljpeg_start (struct jhead *jh, int info_only)
+ {
+-  int c, tag, len;
++  int c, tag;
++  ushort len;
+   uchar data[0x1];
+   const uchar *dp;
+ 
+--- a/rtengine/dcraw.cc
 b/rtengine/dcraw.cc
+@@ -787,7 +787,8 @@
+ 
+ int CLASS ljpeg_start (struct jhead *jh, int info_only)
+ {
+-  int c, tag, len;
++  int c, tag;
++  ushort len;
+   uchar data[0x1];
+   const uchar *dp;
+ 

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch
new file mode 100644
index 000..0d79e25
--- /dev/null
+++ b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch
@@ -0,0 +1,14 @@
+Author: Philip Rinn 
+Description: Fix build with C++11 as char is unsigned on some architectures
+Last-update: 2015-11-04
+--- a/rtengine/dcraw.cc
 b/rtengine/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/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch
new file mode 100644
index 000..4832dc3
--- /dev/null
+++ b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch
@@ -0,0 +1,20 @@
+Author: Philip Rinn 
+Description: Fix build with C++11
+Last-update: 2015-11-03
+--- a/rtengine/dcraw.cc
 b/rtengine/dcraw.cc
+@@ -136,10 +136,10 @@
+ 
+ #define SQR(x) rtengine::SQR(x)
+ #define ABS(x) (((int)(x) ^ ((int)(x) >> 31)) - ((int)(x) >> 31))
+-#define MIN(a,b) rtengine::min(a,static_cast(b))
+-#define MAX(a,b) rtengine::max(a,static_cast(b))
+-#define LIM(x,min,max) 
rtengine::LIM(x,static_cast(min),static_cast(max))
+-#define ULIM(x,y,z) 
rtengine::ULIM(x,static_cast(y),static_cast(z))
++#define MIN(a,b) rtengine::min(a,static_cast<__typeof__(a)>(b))
++#define MAX(a,b) rtengine::max(a,static_cast<__typeof__(a)>(b))
++#define LIM(x,min,max) 
rtengine::LIM(x,static_cast<__typeof__(x)>(min),static_cast<__typeof__(x)>(max))
++#define ULIM(x,y,z) 
rtengine::ULIM(x,static_cast<__typeof__(x)>(y),static_cast(z))
+ #define CLIP(x) rtengine::CLIP(x)
+ #define SWAP(a,b) { a=a+b; b=a-b; a=a-b; }
+ 

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
new file mode 100644
index 000..48acb5f
--- /dev/null
+++ b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
@@ -0,0 +1,27 @@
+From 39ef59ddeb7679c71274b1da3faadd395b650c73 Mon Sep 17 00:00:00 2001
+From: Adam Reichold 
+Date: Sun, 29 Nov 2015 11:48:30 +0100
+Subject: [PATCH] Build with '-std=c++11' if libsigc++ version 2.5.1 is used as
+ it does require it.
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dd5fcbc..6153484 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -278,10 +278,10 @@ if (OPTION_OMP)
+ endif (OPENMP_FOUND)
+ endif (OPTION_OMP)
+ 
+-if(USE_EXPERIMENTAL_LANG_VERSIONS)
++if(USE_EXPERIMENTAL_LANG_VERSIONS OR NOT (SIGC_VERSION VERSION_LESS 2.5.1))
+   SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu1x")
+   SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
+-endif (USE_EXPERIMENTAL_LANG_VERSIONS)
++endif ()
+ 
+ # find out whether we are building out of source
+ get_filename_component(ABS_SOURCE_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE)

diff --git a/media-g

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

2015-12-15 Thread Pacho Ramos 
commit: 043e8de5728b09812035580454fd9b88123e7a06
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Dec 15 20:07:07 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Dec 15 20:16:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043e8de5

Revert "media-gfx/rawtherapee: Fix building with latest glibmm/libsigc++ 
(#568136)"

This reverts commit 519fe2b101ec4914e62246b72e9ba6139581e0c8.

 .../rawtherapee/files/rawtherapee-4.2-cxx11.patch  | 27 --
 media-gfx/rawtherapee/rawtherapee-4.2.ebuild   |  4 
 2 files changed, 31 deletions(-)

diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch 
b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
deleted file mode 100644
index 48acb5f..000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 39ef59ddeb7679c71274b1da3faadd395b650c73 Mon Sep 17 00:00:00 2001
-From: Adam Reichold 
-Date: Sun, 29 Nov 2015 11:48:30 +0100
-Subject: [PATCH] Build with '-std=c++11' if libsigc++ version 2.5.1 is used as
- it does require it.
-

- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dd5fcbc..6153484 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -278,10 +278,10 @@ if (OPTION_OMP)
- endif (OPENMP_FOUND)
- endif (OPTION_OMP)
- 
--if(USE_EXPERIMENTAL_LANG_VERSIONS)
-+if(USE_EXPERIMENTAL_LANG_VERSIONS OR NOT (SIGC_VERSION VERSION_LESS 2.5.1))
-   SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu1x")
-   SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
--endif (USE_EXPERIMENTAL_LANG_VERSIONS)
-+endif ()
- 
- # find out whether we are building out of source
- get_filename_component(ABS_SOURCE_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE)

diff --git a/media-gfx/rawtherapee/rawtherapee-4.2.ebuild 
b/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
index 6702661..6ae07a5 100644
--- a/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-4.2.ebuild
@@ -33,10 +33,6 @@ DEPEND="${RDEPEND}
app-arch/xz-utils
virtual/pkgconfig"
 
-PATCHES=(
-"${FILESDIR}"/${P}-cxx11.patch # Upstream patch for fixing bug #568136
-)
-
 pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible 
compiler"