Apply patch, d’oh

[skip changelog] Signed-off-by: Nils Philippsen <nils@tiptoe.de>
Fix GIMP plug-in
2025-11-01 21:39:53 +01:00 · 2025-11-01 21:36:47 +01:00 · 2025-10-29 13:57:14 +01:00 · 2025-07-25 11:47:21 +00:00 · 2025-05-29 18:03:18 +02:00 · 2025-04-24 08:35:53 +02:00
11 changed files with 6293 additions and 1346 deletions
--- a/.gitignore
+++ b/.gitignore
@ -27,3 +27,11 @@ rawtherapee-3.0-a1.tar.bz2
 /rawtherapee-5.6.tar.xz
 /rawtherapee-5.7.tar.xz
 /rawtherapee-5.8.tar.xz
+/RawTherapee-68ec1a5bb50b496e255a0b843c36345fbeff2468.tar.gz
+/RawTherapee-4059ae5bcad8e18443bf8f37bcff84de1dcc0d03.tar.gz
+/rawtherapee-5.9.tar.xz
+/rawtherapee-5.10-rc1.tar.xz
+/rawtherapee-5.10.tar.xz
+/rawtherapee-5.11.tar.xz
+/rawtherapee-5.12-rc1.tar.xz
+/rawtherapee-5.12.tar.xz
--- a/0001-Fix-static-init-order-fiasco-crashes.patch
+++ b/0001-Fix-static-init-order-fiasco-crashes.patch
--- a/0001-Fix-typos.patch
+++ b/0001-Fix-typos.patch
@ -0,0 +1,39 @@
+From d12ca94d42c1370d70fb14cc185d46aaca9c05ac Mon Sep 17 00:00:00 2001
+From: Daniel Gao <daniel.gao.work@gmail.com>
+Date: Sun, 24 Aug 2025 11:37:06 -0400
+Subject: [PATCH] Fix typos
+
+---
+ rtgui/filepanel.cc | 2 +-
+ rtgui/main.cc      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc
+index f069f099e..28bee9839 100644
+--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
+@@ -208,7 +208,7 @@ void FilePanel::init ()
+     dirBrowser->fillDirTree ();
+     placesBrowser->refreshPlacesList ();
+ 
+-    if (!App::get().argv0().empty() && Glib::file_test (App::get().argv1(), Glib::FILE_TEST_EXISTS)) {
+    if (!App::get().argv1().empty() && Glib::file_test (App::get().argv1(), Glib::FILE_TEST_EXISTS)) {
+         Glib::ustring d(App::get().argv1());
+         if (!Glib::file_test(d, Glib::FILE_TEST_IS_DIR)) {
+             d = Glib::path_get_dirname(d);
+diff --git a/rtgui/main.cc b/rtgui/main.cc
+index ded7076be..180e43f5d 100644
+--- a/rtgui/main.cc
+++ b/rtgui/main.cc
+@@ -139,7 +139,7 @@ int processLineParams ( int argc, char **argv )
+                     if (currParam == "-gimp") {
+                         app.setIsGimpPlugin(true);
+                         app.setIsSimpleEditor(true);
+-                        app.setIsRemote(true);
+                        app.setIsRemote(false);
+                         break;
+                     }
+ 
+-- 
+2.51.1
+
--- a/RT_5.8_fix_crop.patch
+++ b/RT_5.8_fix_crop.patch
@ -1,221 +0,0 @@
-From 15db8cdb57161d57af8307bf85aeda02ea69ddde Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fl=C3=B6ssie?= <floessie.mail@gmail.com>
-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 <https://www.gnu.org/licenses/>.
-  */
-+#include <vector>
-+
- #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<Glib::ustring> getLabels() const
-+    {
-+        std::vector<Glib::ustring> 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<CropRatio> ratios;
-+};
-+
- Crop::Crop():
-     FoldableToolPanel(this, "crop", M("TP_CROP_LABEL"), false, true),
-    crop_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...
-    },
-+    crop_ratios(new CropRatios),
-     opt(0),
-     wDirty(true),
-     hDirty(true),
-@@ -229,8 +274,8 @@ Crop::Crop():
-     // ppigrid END
- 
-     // Populate the combobox
-    for (const auto& crop_ratio : crop_ratios) {
-        ratio->append (crop_ratio.label);
-+    for (const auto& label : crop_ratios->getLabels()) {
-+        ratio->append (label);
-     }
- 
-     ratio->set_active (0);
-@@ -354,7 +399,10 @@ void Crop::read (const ProcParams* pp, const ParamsEdited* pedited)
-         setDimensions (pp->crop.x + pp->crop.w, pp->crop.y + pp->crop.h);
-     }
- 
-    const bool flip_orientation = pp->crop.fixratio && crop_ratios[ratio->get_active_row_number()].value > 0 && crop_ratios[ratio->get_active_row_number()].value < 1.0;
-+    const bool flip_orientation =
-+        pp->crop.fixratio
-+        && crop_ratios->getValue(ratio->get_active_row_number()) > 0
-+        && crop_ratios->getValue(ratio->get_active_row_number()) < 1.0;
- 
-     if (pp->crop.orientation == "Landscape") {
-         orientation->set_active (flip_orientation ? 1 : 0);
-@@ -469,7 +517,10 @@ void Crop::write (ProcParams* pp, ParamsEdited* pedited)
-     }
- 
-     // for historical reasons we store orientation different if ratio is written as 2:3 instead of 3:2, but in GUI 'landscape' is always long side horizontal regardless of the ratio is written short or long side first.
-    const bool flip_orientation = fixr->get_active() && crop_ratios[ratio->get_active_row_number()].value > 0 && crop_ratios[ratio->get_active_row_number()].value < 1.0;
-+    const bool flip_orientation =
-+        fixr->get_active()
-+        && crop_ratios->getValue(ratio->get_active_row_number()) > 0
-+        && crop_ratios->getValue(ratio->get_active_row_number()) < 1.0;
- 
-     if (orientation->get_active_row_number() == 0) {
-         pp->crop.orientation = flip_orientation ? "Portrait" : "Landscape";
-@@ -1501,7 +1552,7 @@ double Crop::getRatio () const
-         return r;
-     }
- 
-    r = crop_ratios[ratio->get_active_row_number()].value;
-+    r = crop_ratios->getValue(ratio->get_active_row_number());
-     if (!r) {
-         r = maxh <= maxw ? float(maxh)/float(maxw) : float(maxw)/float(maxh);
-     }
-@@ -1539,5 +1590,5 @@ void Crop::updateCurrentRatio()
-     double rw, rh;
-     get_custom_ratio(w->get_value(), h->get_value(), rw, rh);
-     customRatioLabel->set_text(Glib::ustring::compose("%1:%2", rw, rh));
-    crop_ratios[1].value = double(w->get_value())/double(h->get_value());
-+    crop_ratios->updateCurrentRatio(static_cast<double>(w->get_value()) / static_cast<double>(h->get_value()));
- }
-diff --git a/rtgui/crop.h b/rtgui/crop.h
-index b9221a803..c6636b917 100644
--- a/rtgui/crop.h
-+++ b/rtgui/crop.h
-@@ -18,7 +18,7 @@
-  */
- #pragma once
- 
-#include <vector>
-+#include <memory>
- 
- #include <gtkmm.h>
- 
-@@ -91,16 +91,13 @@ class Crop final :
-     void rotateCrop         (int deg, bool hflip, bool vflip);
- 
- private:
-    struct CropRatio {
-        Glib::ustring label;
-        double value;
-    };
-
-    std::vector<CropRatio> crop_ratios;
-+    class CropRatios;
- 
-     void adjustCropToRatio();
-     void updateCurrentRatio();
- 
-+    const std::unique_ptr<CropRatios> crop_ratios;
-+
-     Gtk::CheckButton* fixr;
-     MyComboBoxText* ratio;
-     MyComboBoxText* orientation;
--- a/RT_5.8_glibc234.patch
+++ b/RT_5.8_glibc234.patch
@ -1,683 +0,0 @@
-diff -udHrN -- a/RT_5.8_glibc234.patch b/RT_5.8_glibc234.patch
--- a/RT_5.8_glibc234.patch	1970-01-01 01:00:00.000000000 +0100
-+++ b/RT_5.8_glibc234.patch	2021-08-04 18:50:22.142646367 +0200
-@@ -0,0 +1,334 @@
-+diff --git a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc
-+index ddd4b6172..1132b4e01 100644
-+--- a/rtengine/canon_cr3_decoder.cc
-++++ b/rtengine/canon_cr3_decoder.cc
-+@@ -670,7 +670,7 @@ std::uint32_t _byteswap_ulong(std::uint32_t x)
-+ #endif
-+ 
-+ struct LibRaw_abstract_datastream {
-+-    IMFILE* ifp;
-++    rtengine::IMFILE* ifp;
-+ 
-+     void lock()
-+     {
-+diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc
-+index ef0b4e8dc..13a6b054a 100644
-+--- a/rtengine/dcraw.cc
-++++ b/rtengine/dcraw.cc
-+@@ -1963,7 +1963,7 @@ void CLASS phase_one_load_raw_c()
-+ #endif
-+ {
-+     int len[2], pred[2];
-+-    IMFILE ifpthr = *ifp;
-++    rtengine::IMFILE ifpthr = *ifp;
-+     ifpthr.plistener = nullptr;
-+ 
-+ #ifdef _OPENMP
-+@@ -3317,7 +3317,7 @@ void CLASS sony_arw2_load_raw()
-+ {
-+     uchar *data = new (std::nothrow) uchar[raw_width + 1];
-+     merror(data, "sony_arw2_load_raw()");
-+-    IMFILE ifpthr = *ifp;
-++    rtengine::IMFILE ifpthr = *ifp;
-+     int pos = ifpthr.pos;
-+     ushort pix[16];
-+ 
-+@@ -6331,7 +6331,7 @@ int CLASS parse_tiff_ifd (int base)
-+   unsigned sony_curve[] = { 0,0,0,0,0,4095 };
-+   unsigned *buf, sony_offset=0, sony_length=0, sony_key=0;
-+   struct jhead jh;
-+-/*RT*/  IMFILE *sfp;
-++/*RT*/  rtengine::IMFILE *sfp;
-+ /*RT*/  int pana_raw = 0;
-+ 
-+   if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0])
-+@@ -6895,7 +6895,7 @@ it under the terms of the one of two licenses as you choose:
-+     fread (buf, sony_length, 1, ifp);
-+     sony_decrypt (buf, sony_length/4, 1, sony_key);
-+     sfp = ifp;
-+-/*RT*/ ifp = fopen (buf, sony_length);
-++/*RT*/ ifp = rtengine::fopen (buf, sony_length);
-+ // if ((ifp = tmpfile())) {
-+ // fwrite (buf, sony_length, 1, ifp);
-+ // fseek (ifp, 0, SEEK_SET);
-+@@ -7203,7 +7203,7 @@ void CLASS parse_external_jpeg()
-+ {
-+   const char *file, *ext;
-+   char *jname, *jfile, *jext;
-+-/*RT*/  IMFILE *save=ifp;
-++/*RT*/  rtengine::IMFILE *save=ifp;
-+ 
-+   ext  = strrchr (ifname, '.');
-+   file = strrchr (ifname, '/');
-+@@ -7231,7 +7231,7 @@ void CLASS parse_external_jpeg()
-+       *jext = '0';
-+     }
-+   if (strcmp (jname, ifname)) {
-+-/*RT*/    if ((ifp = fopen (jname))) {
-++/*RT*/    if ((ifp = rtengine::fopen (jname))) {
-+ //    if ((ifp = fopen (jname, "rb"))) {
-+       if (verbose)
-+ 	fprintf (stderr,_("Reading metadata from %s ...\n"), jname);
-+diff --git a/rtengine/dcraw.h b/rtengine/dcraw.h
-+index 10c7b9ba6..bc009e67c 100644
-+--- a/rtengine/dcraw.h
-++++ b/rtengine/dcraw.h
-+@@ -73,7 +73,7 @@ public:
-+ 
-+ protected:
-+     int exif_base, ciff_base, ciff_len;
-+-    IMFILE *ifp;
-++    rtengine::IMFILE *ifp;
-+     FILE *ofp;
-+     short order;
-+     const char *ifname;
-+@@ -125,7 +125,7 @@ protected:
-+         int         cur_buf_size;    // buffer size
-+         uchar       *cur_buf;        // currently read block
-+         int         fillbytes;          // Counter to add extra byte for block size N*16
-+-        IMFILE      *input;
-++        rtengine::IMFILE      *input;
-+         struct int_pair grad_even[3][41];    // tables of gradients
-+         struct int_pair grad_odd[3][41];
-+         ushort		*linealloc;
-+@@ -278,7 +278,7 @@ void parse_redcine();
-+ class getbithuff_t
-+ {
-+ public:
-+-   getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){}
-++   getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){}
-+    unsigned operator()(int nbits, ushort *huff);
-+ 
-+ private:
-+@@ -288,7 +288,7 @@ private:
-+    DCraw *parent;
-+    unsigned bitbuf;
-+    int vbits, reset;
-+-   IMFILE *&ifp;
-++   rtengine::IMFILE *&ifp;
-+    unsigned &zero_after_ff;
-+ };
-+ getbithuff_t getbithuff;
-+@@ -296,7 +296,7 @@ getbithuff_t getbithuff;
-+ class nikbithuff_t
-+ {
-+ public:
-+-   explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){}
-++   explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){}
-+    void operator()() {bitbuf = vbits = 0;};
-+    unsigned operator()(int nbits, ushort *huff);
-+    unsigned errorCount() { return errors; }
-+@@ -309,7 +309,7 @@ private:
-+    }
-+    unsigned bitbuf, errors;
-+    int vbits;
-+-   IMFILE *&ifp;
-++   rtengine::IMFILE *&ifp;
-+ };
-+ nikbithuff_t nikbithuff;
-+ 
-+@@ -377,7 +377,7 @@ void parse_qt (int end);
-+ // ph1_bithuff(int nbits, ushort *huff);
-+ class ph1_bithuff_t {
-+ public:
-+-   ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){}
-++   ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){}
-+    unsigned operator()(int nbits, ushort *huff);
-+    unsigned operator()(int nbits);
-+    unsigned operator()();
-+@@ -411,7 +411,7 @@ private:
-+    }
-+ 
-+    short &order;
-+-   IMFILE* const ifp;
-++   rtengine::IMFILE* const ifp;
-+    UINT64 bitbuf;
-+    int vbits;
-+ };
-+@@ -429,11 +429,11 @@ void nokia_load_raw();
-+ 
-+ class pana_bits_t{
-+ public:
-+-   pana_bits_t(IMFILE *i, unsigned &u, unsigned enc):
-++   pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc):
-+     ifp(i), load_flags(u), vbits(0), encoding(enc) {}
-+    unsigned operator()(int nbits, unsigned *bytes=nullptr);
-+ private:
-+-   IMFILE *ifp;
-++   rtengine::IMFILE *ifp;
-+    unsigned &load_flags;
-+    uchar buf[0x4000];
-+    int vbits;
-+diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc
-+index 7dde668eb..e551c9aad 100644
-+--- a/rtengine/dfmanager.cc
-++++ b/rtengine/dfmanager.cc
-+@@ -540,7 +540,7 @@ std::vector<badPix> *DFManager::getHotPixels ( const std::string &mak, const std
-+ 
-+ int DFManager::scanBadPixelsFile( Glib::ustring filename )
-+ {
-+-    FILE *file = fopen( filename.c_str(), "r" );
-++    FILE *file = ::fopen( filename.c_str(), "r" );
-+ 
-+     if( !file ) {
-+         return false;
-+diff --git a/rtengine/myfile.cc b/rtengine/myfile.cc
-+index 842766dcf..2321d18bb 100644
-+--- a/rtengine/myfile.cc
-++++ b/rtengine/myfile.cc
-+@@ -70,7 +70,7 @@ int munmap(void *start, size_t length)
-+ 
-+ #ifdef MYFILE_MMAP
-+ 
-+-IMFILE* fopen (const char* fname)
-++rtengine::IMFILE* rtengine::fopen (const char* fname)
-+ {
-+     int fd;
-+ 
-+@@ -123,13 +123,13 @@ IMFILE* fopen (const char* fname)
-+     return mf;
-+ }
-+ 
-+-IMFILE* gfopen (const char* fname)
-++rtengine::IMFILE* rtengine::gfopen (const char* fname)
-+ {
-+     return fopen(fname);
-+ }
-+ #else
-+ 
-+-IMFILE* fopen (const char* fname)
-++rtengine::IMFILE* rtengine::fopen (const char* fname)
-+ {
-+ 
-+     FILE* f = g_fopen (fname, "rb");
-+@@ -152,7 +152,7 @@ IMFILE* fopen (const char* fname)
-+     return mf;
-+ }
-+ 
-+-IMFILE* gfopen (const char* fname)
-++rtengine::IMFILE* rtengine::gfopen (const char* fname)
-+ {
-+ 
-+     FILE* f = g_fopen (fname, "rb");
-+@@ -176,7 +176,7 @@ IMFILE* gfopen (const char* fname)
-+ }
-+ #endif //MYFILE_MMAP
-+ 
-+-IMFILE* fopen (unsigned* buf, int size)
-++rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size)
-+ {
-+ 
-+     IMFILE* mf = new IMFILE;
-+@@ -190,7 +190,7 @@ IMFILE* fopen (unsigned* buf, int size)
-+     return mf;
-+ }
-+ 
-+-void fclose (IMFILE* f)
-++void rtengine::fclose (IMFILE* f)
-+ {
-+ #ifdef MYFILE_MMAP
-+ 
-+@@ -207,7 +207,7 @@ void fclose (IMFILE* f)
-+     delete f;
-+ }
-+ 
-+-int fscanf (IMFILE* f, const char* s ...)
-++int rtengine::fscanf (IMFILE* f, const char* s ...)
-+ {
-+     // fscanf not easily wrapped since we have no terminating \0 at end
-+     // of file data and vsscanf() won't tell us how many characters that
-+@@ -253,7 +253,7 @@ int fscanf (IMFILE* f, const char* s ...)
-+ }
-+ 
-+ 
-+-char* fgets (char* s, int n, IMFILE* f)
-++char* rtengine::fgets (char* s, int n, IMFILE* f)
-+ {
-+ 
-+     if (f->pos >= f->size) {
-+@@ -270,7 +270,7 @@ char* fgets (char* s, int n, IMFILE* f)
-+     return s;
-+ }
-+ 
-+-void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range)
-++void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range)
-+ {
-+     f->plistener = plistener;
-+     f->progress_range = progress_range;
-+@@ -278,7 +278,7 @@ void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, doub
-+     f->progress_current = 0;
-+ }
-+ 
-+-void imfile_update_progress(IMFILE *f)
-++void rtengine::imfile_update_progress(IMFILE *f)
-+ {
-+     if (!f->plistener || f->progress_current < f->progress_next) {
-+         return;
-+diff --git a/rtengine/myfile.h b/rtengine/myfile.h
-+index 34b90c525..ae14ce31a 100644
-+--- a/rtengine/myfile.h
-++++ b/rtengine/myfile.h
-+@@ -30,8 +30,6 @@ namespace rtengine
-+ 
-+ class ProgressListener;
-+ 
-+-}
-+-
-+ struct IMFILE {
-+     int fd;
-+     ssize_t pos;
-+@@ -141,3 +139,5 @@ inline unsigned char* fdata(int offset, IMFILE* f)
-+ 
-+ int fscanf (IMFILE* f, const char* s ...);
-+ char* fgets (char* s, int n, IMFILE* f);
-++
-++}
-+diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
-+index 8dc998862..cf500474f 100644
-+--- a/rtengine/rtthumbnail.cc
-++++ b/rtengine/rtthumbnail.cc
-+@@ -1965,7 +1965,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname)
-+ 
-+     Glib::ustring fullFName = fname + ".rtti";
-+ 
-+-    FILE* f = g_fopen (fullFName.c_str (), "wb");
-++    FILE* f = ::g_fopen (fullFName.c_str (), "wb");
-+ 
-+     if (!f) {
-+         return false;
-+@@ -2008,7 +2008,7 @@ bool Thumbnail::readImage (const Glib::ustring& fname)
-+         return false;
-+     }
-+ 
-+-    FILE* f = g_fopen(fullFName.c_str (), "rb");
-++    FILE* f = ::g_fopen(fullFName.c_str (), "rb");
-+ 
-+     if (!f) {
-+         return false;
-+@@ -2239,7 +2239,7 @@ bool Thumbnail::writeData  (const Glib::ustring& fname)
-+         return false;
-+     }
-+ 
-+-    FILE *f = g_fopen (fname.c_str (), "wt");
-++    FILE *f = ::g_fopen (fname.c_str (), "wt");
-+ 
-+     if (!f) {
-+         if (settings->verbose) {
-+@@ -2262,7 +2262,7 @@ bool Thumbnail::readEmbProfile  (const Glib::ustring& fname)
-+     embProfile = nullptr;
-+     embProfileLength = 0;
-+ 
-+-    FILE* f = g_fopen (fname.c_str (), "rb");
-++    FILE* f = ::g_fopen (fname.c_str (), "rb");
-+ 
-+     if (f) {
-+         if (!fseek (f, 0, SEEK_END)) {
-+@@ -2290,7 +2290,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname)
-+ {
-+ 
-+     if (embProfileData) {
-+-        FILE* f = g_fopen (fname.c_str (), "wb");
-++        FILE* f = ::g_fopen (fname.c_str (), "wb");
-+ 
-+         if (f) {
-+             fwrite (embProfileData, 1, embProfileLength, f);
-diff -udHrN -- a/rtengine/canon_cr3_decoder.cc b/rtengine/canon_cr3_decoder.cc
--- a/rtengine/canon_cr3_decoder.cc	2020-02-04 07:39:52.000000000 +0100
-+++ b/rtengine/canon_cr3_decoder.cc	2021-08-07 11:43:50.725202017 +0200
-@@ -662,7 +662,7 @@
- #endif
- 
- struct LibRaw_abstract_datastream {
-    IMFILE* ifp;
-+    rtengine::IMFILE* ifp;
- 
-     void lock()
-     {
-diff -udHrN -- a/rtengine/dcraw.cc b/rtengine/dcraw.cc
--- a/rtengine/dcraw.cc	2020-02-04 07:39:52.000000000 +0100
-+++ b/rtengine/dcraw.cc	2021-08-07 11:43:50.736202141 +0200
-@@ -2025,7 +2025,7 @@
- #endif
- {
-     int len[2], pred[2];
-    IMFILE ifpthr = *ifp;
-+    rtengine::IMFILE ifpthr = *ifp;
-     ifpthr.plistener = nullptr;
- 
- #ifdef _OPENMP
-@@ -3380,7 +3380,7 @@
- {
-     uchar *data = new (std::nothrow) uchar[raw_width + 1];
-     merror(data, "sony_arw2_load_raw()");
-    IMFILE ifpthr = *ifp;
-+    rtengine::IMFILE ifpthr = *ifp;
-     int pos = ifpthr.pos;
-     ushort pix[16];
- 
-@@ -6394,7 +6394,7 @@
-   unsigned sony_curve[] = { 0,0,0,0,0,4095 };
-   unsigned *buf, sony_offset=0, sony_length=0, sony_key=0;
-   struct jhead jh;
-/*RT*/  IMFILE *sfp;
-+/*RT*/  rtengine::IMFILE *sfp;
- /*RT*/  int pana_raw = 0;
- 
-   if (tiff_nifds >= sizeof tiff_ifd / sizeof tiff_ifd[0])
-@@ -6958,7 +6958,7 @@
-     fread (buf, sony_length, 1, ifp);
-     sony_decrypt (buf, sony_length/4, 1, sony_key);
-     sfp = ifp;
-/*RT*/ ifp = fopen (buf, sony_length);
-+/*RT*/ ifp = rtengine::fopen (buf, sony_length);
- // if ((ifp = tmpfile())) {
- // fwrite (buf, sony_length, 1, ifp);
- // fseek (ifp, 0, SEEK_SET);
-@@ -7264,7 +7264,7 @@
- {
-   const char *file, *ext;
-   char *jname, *jfile, *jext;
-/*RT*/  IMFILE *save=ifp;
-+/*RT*/  rtengine::IMFILE *save=ifp;
- 
-   ext  = strrchr (ifname, '.');
-   file = strrchr (ifname, '/');
-@@ -7292,7 +7292,7 @@
-       *jext = '0';
-     }
-   if (strcmp (jname, ifname)) {
-/*RT*/    if ((ifp = fopen (jname))) {
-+/*RT*/    if ((ifp = rtengine::fopen (jname))) {
- //    if ((ifp = fopen (jname, "rb"))) {
-       if (verbose)
- 	fprintf (stderr,_("Reading metadata from %s ...\n"), jname);
-diff -udHrN -- a/rtengine/dcraw.h b/rtengine/dcraw.h
--- a/rtengine/dcraw.h	2020-02-04 07:39:52.000000000 +0100
-+++ b/rtengine/dcraw.h	2021-08-07 11:43:50.737202152 +0200
-@@ -73,7 +73,7 @@
- 
- protected:
-     int exif_base, ciff_base, ciff_len;
-    IMFILE *ifp;
-+    rtengine::IMFILE *ifp;
-     FILE *ofp;
-     short order;
-     const char *ifname;
-@@ -125,7 +125,7 @@
-         int         cur_buf_size;    // buffer size
-         uchar       *cur_buf;        // currently read block
-         int         fillbytes;          // Counter to add extra byte for block size N*16
-        IMFILE      *input;
-+        rtengine::IMFILE      *input;
-         struct int_pair grad_even[3][41];    // tables of gradients
-         struct int_pair grad_odd[3][41];
-         ushort		*linealloc;
-@@ -278,7 +278,7 @@
- class getbithuff_t
- {
- public:
-   getbithuff_t(DCraw *p,IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){}
-+   getbithuff_t(DCraw *p,rtengine::IMFILE *&i, unsigned &z):parent(p),bitbuf(0),vbits(0),reset(0),ifp(i),zero_after_ff(z){}
-    unsigned operator()(int nbits, ushort *huff);
- 
- private:
-@@ -288,7 +288,7 @@
-    DCraw *parent;
-    unsigned bitbuf;
-    int vbits, reset;
-   IMFILE *&ifp;
-+   rtengine::IMFILE *&ifp;
-    unsigned &zero_after_ff;
- };
- getbithuff_t getbithuff;
-@@ -296,7 +296,7 @@
- class nikbithuff_t
- {
- public:
-   explicit nikbithuff_t(IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){}
-+   explicit nikbithuff_t(rtengine::IMFILE *&i):bitbuf(0),errors(0),vbits(0),ifp(i){}
-    void operator()() {bitbuf = vbits = 0;};
-    unsigned operator()(int nbits, ushort *huff);
-    unsigned errorCount() { return errors; }
-@@ -309,7 +309,7 @@
-    }
-    unsigned bitbuf, errors;
-    int vbits;
-   IMFILE *&ifp;
-+   rtengine::IMFILE *&ifp;
- };
- nikbithuff_t nikbithuff;
- 
-@@ -378,7 +378,7 @@
- // ph1_bithuff(int nbits, ushort *huff);
- class ph1_bithuff_t {
- public:
-   ph1_bithuff_t(DCraw *p, IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){}
-+   ph1_bithuff_t(DCraw *p, rtengine::IMFILE *i, short &o):order(o),ifp(i),bitbuf(0),vbits(0){}
-    unsigned operator()(int nbits, ushort *huff);
-    unsigned operator()(int nbits);
-    unsigned operator()();
-@@ -412,7 +412,7 @@
-    }
- 
-    short &order;
-   IMFILE* const ifp;
-+   rtengine::IMFILE* const ifp;
-    UINT64 bitbuf;
-    int vbits;
- };
-@@ -430,11 +430,11 @@
- 
- class pana_bits_t{
- public:
-   pana_bits_t(IMFILE *i, unsigned &u, unsigned enc):
-+   pana_bits_t(rtengine::IMFILE *i, unsigned &u, unsigned enc):
-     ifp(i), load_flags(u), vbits(0), encoding(enc) {}
-    unsigned operator()(int nbits, unsigned *bytes=nullptr);
- private:
-   IMFILE *ifp;
-+   rtengine::IMFILE *ifp;
-    unsigned &load_flags;
-    uchar buf[0x4000];
-    int vbits;
-diff -udHrN -- a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc
--- a/rtengine/dfmanager.cc	2020-02-04 07:39:52.000000000 +0100
-+++ b/rtengine/dfmanager.cc	2021-08-07 11:43:50.738202163 +0200
-@@ -540,7 +540,7 @@
- 
- int DFManager::scanBadPixelsFile( Glib::ustring filename )
- {
-    FILE *file = fopen( filename.c_str(), "r" );
-+    FILE *file = ::fopen( filename.c_str(), "r" );
- 
-     if( !file ) {
-         return false;
-diff -udHrN -- a/rtengine/myfile.cc b/rtengine/myfile.cc
--- a/rtengine/myfile.cc	2020-02-04 07:39:52.000000000 +0100
-+++ b/rtengine/myfile.cc	2021-08-07 11:43:50.738202163 +0200
-@@ -70,7 +70,7 @@
- 
- #ifdef MYFILE_MMAP
- 
-IMFILE* fopen (const char* fname)
-+rtengine::IMFILE* rtengine::fopen (const char* fname)
- {
-     int fd;
- 
-@@ -123,13 +123,13 @@
-     return mf;
- }
- 
-IMFILE* gfopen (const char* fname)
-+rtengine::IMFILE* rtengine::gfopen (const char* fname)
- {
-     return fopen(fname);
- }
- #else
- 
-IMFILE* fopen (const char* fname)
-+rtengine::IMFILE* rtengine::fopen (const char* fname)
- {
- 
-     FILE* f = g_fopen (fname, "rb");
-@@ -152,7 +152,7 @@
-     return mf;
- }
- 
-IMFILE* gfopen (const char* fname)
-+rtengine::IMFILE* rtengine::gfopen (const char* fname)
- {
- 
-     FILE* f = g_fopen (fname, "rb");
-@@ -176,7 +176,7 @@
- }
- #endif //MYFILE_MMAP
- 
-IMFILE* fopen (unsigned* buf, int size)
-+rtengine::IMFILE* rtengine::fopen (unsigned* buf, int size)
- {
- 
-     IMFILE* mf = new IMFILE;
-@@ -190,7 +190,7 @@
-     return mf;
- }
- 
-void fclose (IMFILE* f)
-+void rtengine::fclose (IMFILE* f)
- {
- #ifdef MYFILE_MMAP
- 
-@@ -207,7 +207,7 @@
-     delete f;
- }
- 
-int fscanf (IMFILE* f, const char* s ...)
-+int rtengine::fscanf (IMFILE* f, const char* s ...)
- {
-     // fscanf not easily wrapped since we have no terminating \0 at end
-     // of file data and vsscanf() won't tell us how many characters that
-@@ -253,7 +253,7 @@
- }
- 
- 
-char* fgets (char* s, int n, IMFILE* f)
-+char* rtengine::fgets (char* s, int n, IMFILE* f)
- {
- 
-     if (f->pos >= f->size) {
-@@ -270,7 +270,7 @@
-     return s;
- }
- 
-void imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range)
-+void rtengine::imfile_set_plistener(IMFILE *f, rtengine::ProgressListener *plistener, double progress_range)
- {
-     f->plistener = plistener;
-     f->progress_range = progress_range;
-@@ -278,7 +278,7 @@
-     f->progress_current = 0;
- }
- 
-void imfile_update_progress(IMFILE *f)
-+void rtengine::imfile_update_progress(IMFILE *f)
- {
-     if (!f->plistener || f->progress_current < f->progress_next) {
-         return;
-diff -udHrN -- a/rtengine/myfile.h b/rtengine/myfile.h
--- a/rtengine/myfile.h	2020-02-04 07:39:52.000000000 +0100
-+++ b/rtengine/myfile.h	2021-08-07 11:43:50.739202175 +0200
-@@ -30,8 +30,6 @@
- 
- class ProgressListener;
- 
-}
-
- struct IMFILE {
-     int fd;
-     ssize_t pos;
-@@ -141,3 +139,5 @@
- 
- int fscanf (IMFILE* f, const char* s ...);
- char* fgets (char* s, int n, IMFILE* f);
-+
-+}
-diff -udHrN -- a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
--- a/rtengine/rtthumbnail.cc	2020-02-04 07:39:52.000000000 +0100
-+++ b/rtengine/rtthumbnail.cc	2021-08-07 12:02:02.091503230 +0200
-@@ -1922,7 +1922,7 @@
- 
-     Glib::ustring fullFName = fname + ".rtti";
- 
-    FILE* f = g_fopen (fullFName.c_str (), "wb");
-+    FILE* f = ::g_fopen (fullFName.c_str (), "wb");
- 
-     if (!f) {
-         return false;
-@@ -1965,7 +1965,7 @@
-         return false;
-     }
- 
-    FILE* f = g_fopen(fullFName.c_str (), "rb");
-+    FILE* f = ::g_fopen(fullFName.c_str (), "rb");
- 
-     if (!f) {
-         return false;
-@@ -2191,7 +2191,7 @@
-         return false;
-     }
- 
-    FILE *f = g_fopen (fname.c_str (), "wt");
-+    FILE *f = ::g_fopen (fname.c_str (), "wt");
- 
-     if (!f) {
-         if (settings->verbose) {
-@@ -2214,7 +2214,7 @@
-     embProfile = nullptr;
-     embProfileLength = 0;
- 
-    FILE* f = g_fopen (fname.c_str (), "rb");
-+    FILE* f = ::g_fopen (fname.c_str (), "rb");
- 
-     if (f) {
-         if (!fseek (f, 0, SEEK_END)) {
-@@ -2242,7 +2242,7 @@
- {
- 
-     if (embProfileData) {
-        FILE* f = g_fopen (fname.c_str (), "wb");
-+        FILE* f = ::g_fopen (fname.c_str (), "wb");
- 
-         if (f) {
-             fwrite (embProfileData, 1, embProfileLength, f);
-@@ -2257,7 +2257,7 @@
- bool Thumbnail::readAEHistogram  (const Glib::ustring& fname)
- {
- 
-    FILE* f = g_fopen(fname.c_str(), "rb");
-+    FILE* f = ::g_fopen(fname.c_str(), "rb");
- 
-     if (!f) {
-         aeHistogram.reset();
-@@ -2280,7 +2280,7 @@
- {
- 
-     if (aeHistogram) {
-        FILE* f = g_fopen (fname.c_str (), "wb");
-+        FILE* f = ::g_fopen (fname.c_str (), "wb");
- 
-         if (f) {
-             fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof (aeHistogram[0]), f);
--- a/RT_5.8_system_klt.patch
+++ b/RT_5.8_system_klt.patch
@ -1,49 +0,0 @@
-From 9205b506b50c941ee13c78243f51a2e15d9fe16f Mon Sep 17 00:00:00 2001
-From: Mattia Verga <mattia.verga@tiscali.it>
-Date: Sun, 24 Nov 2019 13:48:12 +0100
-Subject: [PATCH] Fix linking against system klt
-
---
- rtengine/CMakeLists.txt  | 6 ++++++
- rtengine/calc_distort.cc | 4 ++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt
-index f58afde5e..711818a6d 100644
--- a/rtengine/CMakeLists.txt
-+++ b/rtengine/CMakeLists.txt
-@@ -12,6 +12,11 @@ include_directories(${EXTRA_INCDIR}
-     ${LENSFUN_INCLUDE_DIRS}
-     ${RSVG_INCLUDE_DIRS}
- )
-+if(NOT WITH_SYSTEM_KLT)
-+    include_directories("${CMAKE_SOURCE_DIR}/rtengine/klt")
-+else()
-+    include_directories(${KLT_INCLUDE_DIRS})
-+endif()
- 
- link_directories("${PROJECT_SOURCE_DIR}/rtexif"
-     ${EXPAT_LIBRARY_DIRS}
-@@ -184,6 +189,7 @@ target_link_libraries(rtengine rtexif
-     ${ZLIB_LIBRARIES}
-     ${LENSFUN_LIBRARIES}
-     ${RSVG_LIBRARIES}
-+    ${KLT_LIBRARIES}
- )
- 
- install(FILES ${CAMCONSTSFILE} DESTINATION "${DATADIR}" PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-diff --git a/rtengine/calc_distort.cc b/rtengine/calc_distort.cc
-index 7af47adb2..3a7a4a1c4 100644
--- a/rtengine/calc_distort.cc
-+++ b/rtengine/calc_distort.cc
-@@ -5,8 +5,8 @@ locations (before and after tracking) to text files and to PPM files,
- and prints the features to the screen.
- **********************************************************************/
- 
-#include "klt/pnmio.h"
-#include "klt/klt.h"
-+#include <pnmio.h>
-+#include <klt.h>
- #include <cmath>
- #include <cstring>
- 
--- a/ReleaseInfo.cmake
+++ b/ReleaseInfo.cmake
@ -0,0 +1,7 @@
+set(GIT_DESCRIBE 5.9)
+set(GIT_BRANCH dev)
+set(GIT_COMMIT 4059ae5)
+set(GIT_COMMIT_DATE 2022-10-02)
+set(GIT_COMMITS_SINCE_TAG 0)
+set(GIT_COMMITS_SINCE_BRANCH 0)
+set(GIT_VERSION_NUMERIC_BS 0.0.0)
--- a/358
+++ b/358
@ -0,0 +1,358 @@
+* Sat Aug 07 2021 Mattia Verga <mattia.verga@protonmail.com> - 5.8-8
+- Backport patch for glibc 2.34 compatibility (fixes rhbz#1987918)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 04 2020 Mattia Verga <mattia.verga@protonmail.com> - 5.8-5
+- Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed
+- Use new cmake macros
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 06 2020 Mattia Verga <mattia.verga@protonmail.com> - 5.8-2
+- Backport patch for fixing rhbz#1820907
+
+* Wed Feb 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 5.8-1
+- Release 5.8 stable
+- Fix linking to system's KLT lib
+- Use static libraries
+- Enable linking to tcmalloc
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Sep 11 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.7-1
+- Release 5.7 stable
+- Add forgotten klt-devel as BR
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Apr 25 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-2
+- Backport patch to fix appdata validation
+
+* Wed Apr 24 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-1
+- Release 5.6 stable
+
+* Sat Apr 13 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-0.1.rc1
+- Update to 5.6RC1
+- Added librsvg-2.0 to BuildRequires
+- Changed appdata filename
+
+* Sat Apr 06 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.5-4
+- Backport patch to fix Histogram Matching (RHBZ #1692572)
+
+* Sat Feb 16 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.5-3
+- Backport patch to fix build with GCC9
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Dec 21 2018 Mattia Verga <mattia.verga@protonmail.com> - 5.5-1
+- Release 5.5 stable
+- Add libatomic to BRs to fix x64 builds
+
+* Tue Sep 18 2018 Owen Taylor <otaylor@redhat.com> - 5.4-3
+- Don't explicitly require fftw - this pulls in unnecessary library subpackages
+  and binaries; just count on RPM's standard library autodependencies.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Mar 22 2018 Mattia Verga <mattia.verga@email.it> - 5.4-1
+- Release 5.4 stable
+
+* Wed Mar 14 2018 Mattia Verga <mattia.verga@email.it> - 5.4-0.2.rc3
+- Update to 5.4RC3
+
+* Sun Mar 04 2018 Mattia Verga <mattia.verga@email.it> - 5.4-0.1.rc2
+- Update to 5.4RC2
+- Report correct dcraw version in bundled statement
+- Remove obsolete ld scriptlets
+
+* Mon Feb 19 2018 Mattia Verga <mattia.verga@email.it> - 5.3-4
+- Add gcc-c++ to BuildRequires
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org>
+- Remove obsolete scriptlets
+
+* Mon Oct  2 2017 Matthew Miller <mattdm@fedoraproject.org> - 5.3-1
+- update to 5.3 final
+
+* Mon Sep 25 2017 Matthew Miller <mattdm@fedoraproject.org> - 5.3-0.1
+- upstream 5.3 rc1 for rawhide
+- includes fix for CVE-2017-13735
+- lensfun is now required (enabling new lens correction feature)
+- appdata -> metainfo dir
+
+* Sun Sep 10 2017 Mattia Verga <mattia.verga@email.it> - 5.2-2
+- Backport upstream patch for fixing CVE-2017-13735
+
+* Mon Jul 31 2017 Mattia Verga <mattia.verga@email.it> - 5.2-1
+- Upgrade to 5.2
+- Use system KLT library instead of bundled one
+- No further requires bzip2 as BR
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu May 18 2017 Matthew Miller <mattdm@fedoraproject.org> - 5.1-1
+- 5.1 final is out
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1-0.2.rc1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
+* Sun May 14 2017 Mattia Verga <mattia.verga@email.it> - 5.1-0.1.rc1
+- Upgrade to 5.1-rc1
+- New command line binary
+- Removed support for gtk2
+
+* Sat Feb 18 2017 Mattia Verga <mattia.verga@tiscali.it> - 5.0-3.r1
+- Upgrade to 5.0-r1
+- Fix build error with GCC7
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Jan 23 2017 Mattia Verga <mattia.verga@tiscali.it> - 5.0-1
+- Upgrade to stable 5.0-gtk3
+
+* Sat Nov 05 2016 Mattia Verga <mattia.verga@tiscali.it> - 4.2.1234-2.20161105gitb766110
+- Upgrade svn version
+- Add provides klt
+
+* Sun Oct 09 2016 Mattia Verga <mattia.verga@tiscali.it> - 4.2.1234-1.20161009gitd16d244
+- Upgrade to svn version
+- GTK3 is now default
+- Remove unneeded patches
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed May 13 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-10
+- note dcraw bundling (see https://fedorahosted.org/fpc/ticket/530)
+
+* Wed May 13 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-9
+- same thing, format patch correctly
+
+* Wed May 13 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-8
+- Security fix for CVE-2015-3885 (dcraw input sanitization), bz #1221257
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 4.2-7
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-6
+- ooh, fixed it. (insufficiently strict html in description. will
+  submit bug upstream -- thanks Kalev for the fix!)
+
+* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-5
+- appstream validation currently failing on f22 and f23. temporarily
+  disabling
+
+* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-4
+- oh look! fix some invalid dates in changelog including the previous entry
+- move appdata validation next to desktop file validation
+
+* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-3
+- package appdata
+- fix some invalid dates in changelog
+
+* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-2
+- a few config changes to match upstream rpm
+
+* Sat Nov 08 2014 Matthew Miller <mattdm@fedoraproject.org> - 4.2-1
+- update to new upstream stable release
+- set cache and config dir to be unversioned by upstream request
+  (see http://rawtherapee.com/blog/4.2-pre-release-announcement)
+  Note that this will cause config from 4.1 to be ignored, and 
+  possibly even older config to be used instead.
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Matthew Miller <mattdm@fedoraproject.org> - 4.1-1
+- update to new upstream stable release (first officially-stable release
+  since 3.1)
+- see changelog at http://rawtherapee.com/blog/rawtherapee-4.1-is-out
+- drop documentation subpackage, because upstream does not yet have a pdf
+  for 4.1; see docs online at http://rawtherapee.com/blog/documentation and
+  http://rawpedia.rawtherapee.com/
+- no need to include COMPILE.txt in binary package, but do incliude 
+  RELEASE_NOTES.txt
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sat Jun 29 2013 Thibault North <tnorth@fedoraproject.org> - 4.0.11-1
+- Update to 4.0.11
+
+* Sun Apr 7 2013 Thibault North <tnorth@fedoraproject.org> - 4.0.10-1
+- Update to 4.0.10
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 4.0.9-4
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 4.0.9-3
+- rebuild against new libjpeg
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jun 22 2012 Thibault North <tnorth@fedoraproject.org> - 4.0.9-1
+- Update to 4.0.9
+
+* Sat Apr 7 2012 Thibault North <tnorth@fedoraproject.org> - 4.0.8-1
+- Update to 4.0.8
+- Spec cleanup
+- Rebase on the online source archive
+
+* Sun Feb 12 2012  Thibault North <tnorth@fedoraproject.org> - 4.0.7-2
+- Fix faulty MIME directive
+
+* Sat Feb 11 2012  Thibault North <tnorth@fedoraproject.org> - 4.0.7-1
+- Update to 4.0.7
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sun Nov 27 2011  Thibault North <tnorth@fedoraproject.org> - 4.0.5-2
+- Now require lcms2
+
+* Sun Nov 27 2011  Thibault North <tnorth@fedoraproject.org> - 4.0.5-1
+- Upgrade to release 4.0.5
+
+* Thu Aug 18 2011 Thibault North <tnorth@fedoraproject.org> - 3.0.0-1
+- Upgrade to stable release 3.0.0
+
+* Tue Jul 12 2011 Thibault North <tnorth@fedoraproject.org> - 3.0-0.31.a1
+- Fix .desktop file to properly run rawtherapee
+
+* Sun Jul 10 2011 Thibault North <tnorth@fedoraproject.org> - 3.0-0.30.a1
+- Sync with upstream for many fixes and improvements
+- Executable is now rawtherapee instead of rt (see BZ#715390)
+
+* Mon Jun 6 2011  Thibault North <tnorth@fedoraproject.org> - 3.0-0.29.a1
+- Sync with upstream
+- Versioning now needs to be included in version.h 
+
+* Sun Mar 20 2011 Thibault North <tnorth@fedoraproject.org> - 3.0-0.28.a1
+- Updated to 3.0A2, distance 13 for many fixes
+- Updated spec file thanks to upstream fixes
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0-0.28.a1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 3 2011 Thibault North <tnorth@fedoraproject.org> - 3.0-0.27.a1
+- Sync with upstream for various bugfixes and enhancements
+
+* Sun Dec 19 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.26.a1
+- Sync with branch_3.0 upstream: rawtherapee has a stable branch now.
+
+* Sat Nov 6 2010 Dan Horák <dan[at]danny.cz> - 3.0-0.25.a1
+- Fix libdir for 64-bit architectures
+- Fix ownership of the /usr/share/rawtherapee directory
+
+* Mon Oct 25 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.24.a1
+- Sync with upstream for many enhancements and fixes
+
+* Thu Sep 9 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.23.a1
+- Sync with upstream back to the official repository
+- Various fixes and enhancements
+
+* Thu May 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.22.a1
+- Sync upstream for OpenMP support
+
+* Tue May 11 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.21.a1
+- Sync with upstream rev ccc12f4a03
+- Segfault fix
+- Various fixes/enhancements
+
+* Tue Apr 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.20.a1
+- Fix compilation for 64 bits OSes
+
+* Tue Apr 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.19.a1
+- Switch back to Rawtherapee original release
+- Bug fixes
+- Translations and themes now have a licence and can be used
+- Hide information on pictures by default
+
+* Fri Apr 16 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.18.a1
+- New release including curves (exposure and luminance)
+
+* Fri Apr 16 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.17.a1
+- Sync with upstream: multiple fixes
+
+* Mon Apr 12 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.16.a1
+- Sync with upstream for new resizing algorithms
+- File renames
+
+* Thu Apr 8 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.15.a1
+- Sync with upstream for new demosaicing algorithms
+- Fix segfault
+
+* Tue Mar 23 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.14.a1
+- Remove sed liners which have been pushed upstream
+
+* Tue Mar 23 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.13.a1
+- Fix CMakeLists to build without extra languages and themes
+- Remove PDF docs : development-related or outdated
+
+* Tue Mar 23 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.12.a1
+- Now rely on RawTherapee-Fork, new upstream
+
+* Sat Mar 20 2010 Sebastian Dziallas <sebastian@when.com> - 3.0-0.11.a1
+- Correct path in .desktop file
+
+* Wed Mar 17 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.10.a1
+- Run ldconfig at post/postun
+
+* Mon Mar 15 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.9.a1
+- Use proper license tag
+- Remove some files with different licensing
+
+* Wed Mar 3 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.8.a1
+- Various fixes related to review request.
+
+* Sun Feb 28 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.7.a1
+- Update icon database on install/removal
+- Fix many files permissions (thanks Sebastian Dziallas)
+
+* Sun Feb 28 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.6.a1
+- Set icons for desktop file
+- Remove rawzor from SRPM
+
+* Sun Feb 28 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.5.a1
+- More fixes and added desktop file
+
+* Wed Feb 24 2010 Sebastian Dziallas <sebastian@when.com> - 3.0-0.4.a1
+- Smaller modifications and changes
+
+* Sun Jan 24 2010 Sebastian Dziallas <sebastian@when.com> - 3.0-0.3.a1
+- Switch to a1 SVN checkout
+
+* Sun Jan 24 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.2.a1
+- Various Fixes
+
+* Fri Jan 22 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.1.a1
+- Initial package
--- a/create_ReleaseInfo.sh
+++ b/create_ReleaseInfo.sh
@ -0,0 +1,14 @@
+#!/bin/sh
+# example usage: ./create_ReleaseInfo.sh 5.9 68ec1a5 2022-05-25
+
+VERSION=$1
+SHORTCOMMIT=$2
+DATE=$3
+
+echo "set(GIT_DESCRIBE $VERSION)" > ReleaseInfo.cmake
+echo "set(GIT_BRANCH dev)" >> ReleaseInfo.cmake
+echo "set(GIT_COMMIT $SHORTCOMMIT)" >> ReleaseInfo.cmake
+echo "set(GIT_COMMIT_DATE $DATE)" >> ReleaseInfo.cmake
+echo "set(GIT_COMMITS_SINCE_TAG 0)" >> ReleaseInfo.cmake
+echo "set(GIT_COMMITS_SINCE_BRANCH 0)" >> ReleaseInfo.cmake
+echo "set(GIT_VERSION_NUMERIC_BS 0.0.0)" >> ReleaseInfo.cmake
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@ -1,25 +1,40 @@
 %global link_tcmalloc 1
+%global development 0
+
+%if 0%{?development}
+%global commit 4059ae5bcad8e18443bf8f37bcff84de1dcc0d03
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%endif
+
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch:    %{ix86}

 Name:           rawtherapee
-Version:        5.8
-Release:        8%{?dist}
+%if 0%{?development}
+Version:        5.9~20221002git%{shortcommit}
+%else
+Version:        5.12
+%endif
+Release:        %autorelease
 Summary:        Raw image processing software

-License:        GPLv3 and MIT and IJG
+License:        GPL-3.0-or-later and AGPL-3.0-or-later and MIT-open-group and IJG and BSL-1.0 and Apache-2.0
 URL:            http://www.rawtherapee.com/
-Source0:        https://github.com/Beep6581/RawTherapee/releases/download/%{version}/%{name}-%{version}.tar.xz

-# Fix linking against system's KLT
-# Upstream PR https://github.com/Beep6581/RawTherapee/pull/5539
-Patch0:         RT_5.8_system_klt.patch
-
-# Backport patch for fixing rhbz#1820907
-Patch1:         RT_5.8_fix_crop.patch
-
-# Backport patch for fixing build with glibc 2.34
-# https://github.com/Beep6581/RawTherapee/issues/6324
-Patch2:         RT_5.8_glibc234.patch
+%if 0%{?development}
+Source0:        https://github.com/Beep6581/RawTherapee/archive/%{commit}/RawTherapee-%{commit}.tar.gz
+# File created with ./create_ReleaseInfo.sh 5.9 4059ae5 2022-10-02
+Source1:        create_ReleaseInfo.sh
+Source2:        ReleaseInfo.cmake
+%else
+#Source0:        https://rawtherapee.com/shared/source/%%{name}-%%{version}.tar.xz
+Source0:        https://github.com/Beep6581/RawTherapee/releases/download/%{version}/rawtherapee-%{version}.tar.xz
+%endif

+# Patch to fix segfault at startup
+# See upstream ticket https://github.com/RawTherapee/RawTherapee/issues/7532
+Patch:          0001-Fix-static-init-order-fiasco-crashes.patch
+Patch:          0001-Fix-typos.patch

 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@ -28,20 +43,22 @@ BuildRequires:  klt-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  libatomic

-BuildRequires:  pkgconfig(exiv2)
-BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(exiv2) >= 0.24
+BuildRequires:  pkgconfig(expat) >= 2.1
 BuildRequires:  pkgconfig(fftw3f)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(glibmm-2.4)
-BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.48
+BuildRequires:  pkgconfig(glibmm-2.4) >= 2.48
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.24.3
 BuildRequires:  pkgconfig(gtkmm-3.0)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(lensfun)
+BuildRequires:  pkgconfig(lcms2) >= 2.6
+BuildRequires:  pkgconfig(lensfun) >= 0.2
 BuildRequires:  pkgconfig(libcanberra)
 BuildRequires:  pkgconfig(libiptcdata)
 BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libjxl)
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(libraw)
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.52
 %if 0%{?link_tcmalloc}
 BuildRequires:  pkgconfig(libtcmalloc)
 %endif
@ -62,30 +79,32 @@ many parameters to enhance the raw picture before finally exporting it
 to some common image format.

 %prep
+%if 0%{?development}
+%autosetup -p1 -n RawTherapee-%{commit}
+cp -p %SOURCE2 .
+%else
 %autosetup -p1 -n %{name}-%{version}
-
-# fix wrong line endings
-sed -i "s|\r||g" LICENSE.txt
+%endif

 # remove bundled KLT, so we're sure to use system provided KLT
 rm -rf rtengine/klt/

+# remove bundled libraw, so we're sure to use system provided libraw
+rm -rf rtengine/libraw/
+
 %build
 # do not build shared libs
 # https://github.com/Beep6581/RawTherapee/pull/5479
-%{cmake} %{?BUILD_TESTS} \
-        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-        -DLIBDIR=%{_libdir} \
+%{cmake} \
        -DCMAKE_BUILD_TYPE=release \
+        -DLIBDIR=%{_libdir} \
        -DBUILD_SHARED_LIBS:BOOL=OFF \
-        -DAUTOMATED_BUILD_SYSTEM:BOOL=ON \
-        -DCACHE_NAME_SUFFIX="" \
-        -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" \
-        -DCMAKE_C_FLAGS="$RPM_OPT_FLAGS" \
 %if 0%{?link_tcmalloc}
        -DENABLE_TCMALLOC=ON \
 %endif
-        -DWITH_SYSTEM_KLT=ON
+        -DWITH_SYSTEM_KLT=ON \
+        -DWITH_SYSTEM_LIBRAW="ON" \
+        -DWITH_JXL="ON"

 %cmake_build

@ -104,7 +123,8 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/com.%{na


 %files
-%doc AUTHORS.txt LICENSE.txt RELEASE_NOTES.txt
+%doc AUTHORS.txt RELEASE_NOTES.txt
+%license LICENSE licenses/DroidSansMonoDotted.txt licenses/sleef_LICENSE.txt licenses/jdatasrc
 %{_mandir}/man1/%{name}.1.gz
 %{_bindir}/%{name}
 %{_bindir}/%{name}-cli
@ -112,364 +132,8 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/com.%{na
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/metainfo/com.%{name}.RawTherapee.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg


 %changelog
-* Sat Aug 07 2021 Mattia Verga <mattia.verga@protonmail.com> - 5.8-8
- Backport patch for glibc 2.34 compatibility (fixes rhbz#1987918)
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Aug 04 2020 Mattia Verga <mattia.verga@protonmail.com> - 5.8-5
- Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed
- Use new cmake macros
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-4
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Apr 06 2020 Mattia Verga <mattia.verga@protonmail.com> - 5.8-2
- Backport patch for fixing rhbz#1820907
-
-* Wed Feb 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 5.8-1
- Release 5.8 stable
- Fix linking to system's KLT lib
- Use static libraries
- Enable linking to tcmalloc
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Sep 11 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.7-1
- Release 5.7 stable
- Add forgotten klt-devel as BR
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Apr 25 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-2
- Backport patch to fix appdata validation
-
-* Wed Apr 24 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-1
- Release 5.6 stable
-
-* Sat Apr 13 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.6-0.1.rc1
- Update to 5.6RC1
- Added librsvg-2.0 to BuildRequires
- Changed appdata filename
-
-* Sat Apr 06 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.5-4
- Backport patch to fix Histogram Matching (RHBZ #1692572)
-
-* Sat Feb 16 2019 Mattia Verga <mattia.verga@protonmail.com> - 5.5-3
- Backport patch to fix build with GCC9
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Dec 21 2018 Mattia Verga <mattia.verga@protonmail.com> - 5.5-1
- Release 5.5 stable
- Add libatomic to BRs to fix x64 builds
-
-* Tue Sep 18 2018 Owen Taylor <otaylor@redhat.com> - 5.4-3
- Don't explicitly require fftw - this pulls in unnecessary library subpackages
-  and binaries; just count on RPM's standard library autodependencies.
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 22 2018 Mattia Verga <mattia.verga@email.it> - 5.4-1
- Release 5.4 stable
-
-* Wed Mar 14 2018 Mattia Verga <mattia.verga@email.it> - 5.4-0.2.rc3
- Update to 5.4RC3
-
-* Sun Mar 04 2018 Mattia Verga <mattia.verga@email.it> - 5.4-0.1.rc2
- Update to 5.4RC2
- Report correct dcraw version in bundled statement
- Remove obsolete ld scriptlets
-
-* Mon Feb 19 2018 Mattia Verga <mattia.verga@email.it> - 5.3-4
- Add gcc-c++ to BuildRequires
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org>
- Remove obsolete scriptlets
-
-* Mon Oct  2 2017 Matthew Miller <mattdm@fedoraproject.org> - 5.3-1
- update to 5.3 final
-
-* Mon Sep 25 2017 Matthew Miller <mattdm@fedoraproject.org> - 5.3-0.1
- upstream 5.3 rc1 for rawhide
- includes fix for CVE-2017-13735
- lensfun is now required (enabling new lens correction feature)
- appdata -> metainfo dir
-
-* Sun Sep 10 2017 Mattia Verga <mattia.verga@email.it> - 5.2-2
- Backport upstream patch for fixing CVE-2017-13735
-
-* Mon Jul 31 2017 Mattia Verga <mattia.verga@email.it> - 5.2-1
- Upgrade to 5.2
- Use system KLT library instead of bundled one
- No further requires bzip2 as BR
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu May 18 2017 Matthew Miller <mattdm@fedoraproject.org> - 5.1-1
- 5.1 final is out
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1-0.2.rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sun May 14 2017 Mattia Verga <mattia.verga@email.it> - 5.1-0.1.rc1
- Upgrade to 5.1-rc1
- New command line binary
- Removed support for gtk2
-
-* Sat Feb 18 2017 Mattia Verga <mattia.verga@tiscali.it> - 5.0-3.r1
- Upgrade to 5.0-r1
- Fix build error with GCC7
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Jan 23 2017 Mattia Verga <mattia.verga@tiscali.it> - 5.0-1
- Upgrade to stable 5.0-gtk3
-
-* Sat Nov 05 2016 Mattia Verga <mattia.verga@tiscali.it> - 4.2.1234-2.20161105gitb766110
- Upgrade svn version
- Add provides klt
-
-* Sun Oct 09 2016 Mattia Verga <mattia.verga@tiscali.it> - 4.2.1234-1.20161009gitd16d244
- Upgrade to svn version
- GTK3 is now default
- Remove unneeded patches
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed May 13 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-10
- note dcraw bundling (see https://fedorahosted.org/fpc/ticket/530)
-
-* Wed May 13 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-9
- same thing, format patch correctly
-
-* Wed May 13 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-8
- Security fix for CVE-2015-3885 (dcraw input sanitization), bz #1221257
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 4.2-7
- Rebuilt for GCC 5 C++11 ABI change
-
-* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-6
- ooh, fixed it. (insufficiently strict html in description. will
-  submit bug upstream -- thanks Kalev for the fix!)
-
-* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-5
- appstream validation currently failing on f22 and f23. temporarily
-  disabling
-
-* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-4
- oh look! fix some invalid dates in changelog including the previous entry
- move appdata validation next to desktop file validation
-
-* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-3
- package appdata
- fix some invalid dates in changelog
-
-* Tue Mar 24 2015 Matthew Miller <mattdm@fedoraproject.org> - 4.2-2
- a few config changes to match upstream rpm
-
-* Sat Nov 08 2014 Matthew Miller <mattdm@fedoraproject.org> - 4.2-1
- update to new upstream stable release
- set cache and config dir to be unversioned by upstream request
-  (see http://rawtherapee.com/blog/4.2-pre-release-announcement)
-  Note that this will cause config from 4.1 to be ignored, and 
-  possibly even older config to be used instead.
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Matthew Miller <mattdm@fedoraproject.org> - 4.1-1
- update to new upstream stable release (first officially-stable release
-  since 3.1)
- see changelog at http://rawtherapee.com/blog/rawtherapee-4.1-is-out
- drop documentation subpackage, because upstream does not yet have a pdf
-  for 4.1; see docs online at http://rawtherapee.com/blog/documentation and
-  http://rawpedia.rawtherapee.com/
- no need to include COMPILE.txt in binary package, but do incliude 
-  RELEASE_NOTES.txt
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Sat Jun 29 2013 Thibault North <tnorth@fedoraproject.org> - 4.0.11-1
- Update to 4.0.11
-
-* Sun Apr 7 2013 Thibault North <tnorth@fedoraproject.org> - 4.0.10-1
- Update to 4.0.10
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 4.0.9-4
- rebuild due to "jpeg8-ABI" feature drop
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 4.0.9-3
- rebuild against new libjpeg
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jun 22 2012 Thibault North <tnorth@fedoraproject.org> - 4.0.9-1
- Update to 4.0.9
-
-* Sat Apr 7 2012 Thibault North <tnorth@fedoraproject.org> - 4.0.8-1
- Update to 4.0.8
- Spec cleanup
- Rebase on the online source archive
-
-* Sun Feb 12 2012  Thibault North <tnorth@fedoraproject.org> - 4.0.7-2
- Fix faulty MIME directive
-
-* Sat Feb 11 2012  Thibault North <tnorth@fedoraproject.org> - 4.0.7-1
- Update to 4.0.7
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sun Nov 27 2011  Thibault North <tnorth@fedoraproject.org> - 4.0.5-2
- Now require lcms2
-
-* Sun Nov 27 2011  Thibault North <tnorth@fedoraproject.org> - 4.0.5-1
- Upgrade to release 4.0.5
-
-* Thu Aug 18 2011 Thibault North <tnorth@fedoraproject.org> - 3.0.0-1
- Upgrade to stable release 3.0.0
-
-* Tue Jul 12 2011 Thibault North <tnorth@fedoraproject.org> - 3.0-0.31.a1
- Fix .desktop file to properly run rawtherapee
-
-* Sun Jul 10 2011 Thibault North <tnorth@fedoraproject.org> - 3.0-0.30.a1
- Sync with upstream for many fixes and improvements
- Executable is now rawtherapee instead of rt (see BZ#715390)
-
-* Mon Jun 6 2011  Thibault North <tnorth@fedoraproject.org> - 3.0-0.29.a1
- Sync with upstream
- Versioning now needs to be included in version.h 
-
-* Sun Mar 20 2011 Thibault North <tnorth@fedoraproject.org> - 3.0-0.28.a1
- Updated to 3.0A2, distance 13 for many fixes
- Updated spec file thanks to upstream fixes
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0-0.28.a1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jan 3 2011 Thibault North <tnorth@fedoraproject.org> - 3.0-0.27.a1
- Sync with upstream for various bugfixes and enhancements
-
-* Sun Dec 19 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.26.a1
- Sync with branch_3.0 upstream: rawtherapee has a stable branch now.
-
-* Sat Nov 6 2010 Dan Horák <dan[at]danny.cz> - 3.0-0.25.a1
- Fix libdir for 64-bit architectures
- Fix ownership of the /usr/share/rawtherapee directory
-
-* Mon Oct 25 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.24.a1
- Sync with upstream for many enhancements and fixes
-
-* Thu Sep 9 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.23.a1
- Sync with upstream back to the official repository
- Various fixes and enhancements
-
-* Thu May 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.22.a1
- Sync upstream for OpenMP support
-
-* Tue May 11 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.21.a1
- Sync with upstream rev ccc12f4a03
- Segfault fix
- Various fixes/enhancements
-
-* Tue Apr 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.20.a1
- Fix compilation for 64 bits OSes
-
-* Tue Apr 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.19.a1
- Switch back to Rawtherapee original release
- Bug fixes
- Translations and themes now have a licence and can be used
- Hide information on pictures by default
-
-* Fri Apr 16 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.18.a1
- New release including curves (exposure and luminance)
-
-* Fri Apr 16 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.17.a1
- Sync with upstream: multiple fixes
-
-* Mon Apr 12 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.16.a1
- Sync with upstream for new resizing algorithms
- File renames
-
-* Thu Apr 8 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.15.a1
- Sync with upstream for new demosaicing algorithms
- Fix segfault
-
-* Tue Mar 23 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.14.a1
- Remove sed liners which have been pushed upstream
-
-* Tue Mar 23 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.13.a1
- Fix CMakeLists to build without extra languages and themes
- Remove PDF docs : development-related or outdated
-
-* Tue Mar 23 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.12.a1
- Now rely on RawTherapee-Fork, new upstream
-
-* Sat Mar 20 2010 Sebastian Dziallas <sebastian@when.com> - 3.0-0.11.a1
- Correct path in .desktop file
-
-* Wed Mar 17 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.10.a1
- Run ldconfig at post/postun
-
-* Mon Mar 15 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.9.a1
- Use proper license tag
- Remove some files with different licensing
-
-* Wed Mar 3 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.8.a1
- Various fixes related to review request.
-
-* Sun Feb 28 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.7.a1
- Update icon database on install/removal
- Fix many files permissions (thanks Sebastian Dziallas)
-
-* Sun Feb 28 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.6.a1
- Set icons for desktop file
- Remove rawzor from SRPM
-
-* Sun Feb 28 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.5.a1
- More fixes and added desktop file
-
-* Wed Feb 24 2010 Sebastian Dziallas <sebastian@when.com> - 3.0-0.4.a1
- Smaller modifications and changes
-
-* Sun Jan 24 2010 Sebastian Dziallas <sebastian@when.com> - 3.0-0.3.a1
- Switch to a1 SVN checkout
-
-* Sun Jan 24 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.2.a1
- Various Fixes
-
-* Fri Jan 22 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.1.a1
- Initial package
+%autochangelog
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (rawtherapee-5.8.tar.xz) = bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
+SHA512 (rawtherapee-5.12.tar.xz) = 0590a0852385bc85be2a33e5f978904f3a05385b5702f8960adb5aade67d549037245506c84a541d8a49bcc49fe7b71c765be875336cb86deb5c03fd4e3f4c23
Author	SHA1	Message	Date
Nils Philippsen	12576ad40d	Apply patch, d’oh [skip changelog] Signed-off-by: Nils Philippsen <nils@tiptoe.de>	2025-11-01 21:39:53 +01:00
Nils Philippsen	4347dfee46	Fix GIMP plug-in Resolves: #2411799 Signed-off-by: Nils Philippsen <nils@tiptoe.de>	2025-11-01 21:36:47 +01:00
Mattia Verga	515206ba42	Patch from upstream to fix segfault at start	2025-10-29 13:57:14 +01:00
Fedora Release Engineering	2af8e5fad4	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-25 11:47:21 +00:00
Mattia Verga	07e30328c9	Update to 5.12 (Fedora#2364013)	2025-05-29 18:03:18 +02:00
Mattia Verga	3ed02787da	Update to 5.12-RC1 (Fedora#2361830)	2025-04-24 08:35:53 +02:00
Sérgio M. Basto	04bdaac895	Rebuild for jpegxl (libjxl) 0.11.1	2025-02-02 19:54:16 +00:00
Fedora Release Engineering	d8dedb68c8	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-18 22:06:32 +00:00
Mattia Verga	b85a07b166	Stop building on i686	2024-08-26 16:51:19 +02:00
Mattia Verga	7174c58265	Update to 5.11 (Fedora#2305085)	2024-08-26 16:37:42 +02:00
Fedora Release Engineering	efb8d0a461	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-19 18:16:56 +00:00
Robert-André Mauchin	aac12ce557	Rebuilt for exiv2 0.28.2	2024-06-16 08:07:04 +02:00
Mattia Verga	90ff839588	Release 5.10 final (fedora#2264512)	2024-02-18 09:39:32 +01:00
Mattia Verga	de453f4176	Update to 5.10-RC1	2024-02-11 10:08:12 +01:00
Fedora Release Engineering	152d5a4f81	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-26 14:48:08 +00:00
Fedora Release Engineering	7cdfd2453c	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-22 10:52:19 +00:00
Mattia Verga	c99cca3b0e	Remove unused cmake options	2023-09-10 10:09:36 +02:00
Fedora Release Engineering	b12a620274	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-21 16:34:08 +00:00
Mattia Verga	48ca483583	Fix patch for GCC13	2023-01-25 13:24:05 +01:00
Mattia Verga	15fad0b51f	Patch to fix build with GCC13	2023-01-25 09:48:54 +01:00
Fedora Release Engineering	623ce84808	Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-01-20 19:29:48 +00:00
Mattia Verga	ead8b8fe88	Update to 5.9 final	2022-12-02 09:10:41 +01:00
Mattia Verga	a5cb9f7848	Convert license to SPDX	2022-11-27 10:51:12 +01:00
Mattia Verga	c9657a7132	Update to latest git commit	2022-10-02 17:38:28 +02:00
Fedora Release Engineering	01c98d8be1	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-23 00:32:07 +00:00
Mattia Verga	8e7a1b123c	Fix source number in specfile	2022-05-25 16:25:29 +02:00
Mattia Verga	343e6e34ed	Update to development branch	2022-05-25 16:23:45 +02:00
Ta-Lun Yen	b57ff480b8	Backport patch for fixing Nikon Z EXIF information	2022-04-03 00:29:23 +08:00
Fedora Release Engineering	1f0a5c40b8	- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-01-21 17:33:40 +00:00
Mattia Verga	b4198c95d9	Add patch to fix Canon sRaw/mRaw file import	2022-01-16 12:47:47 +01:00
Matthew Miller	d0d12165cb	use rpmautospec https://docs.pagure.org/Fedora-Infra.rpmautospec/opting-in.htmlhttps://docs.pagure.org/Fedora-Infra.rpmautospec/opting-in.html	2021-08-17 12:32:54 -04:00