From 7cfcd1d215d9b8147576b6502c9fd16c1c2594d7 Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio@serjux.com>
Date: Jul 12 2021 14:34:31 +0000
Subject: adjustment of build requires and requires based on doc/README and fotoxx line

  402
Patch to use opj2_decompress provided by openjpeg2 package

---

diff --git a/fotoxx.spec b/fotoxx.spec
index 7ed9a09..850773a 100644
--- a/fotoxx.spec
+++ b/fotoxx.spec
@@ -1,35 +1,38 @@
 Name:    fotoxx
 Version: 21.44
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Photo editor
 
 License: GPLv3+
 URL:     http://www.kornelix.com/fotoxx/fotoxx.html
 Source0: http://www.kornelix.net/downloads/downloads/fotoxx-%{version}.tar.gz
 Source1: %{name}.desktop
+Patch1:  opj_decompress.patch
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 BuildRequires: gcc-c++
 BuildRequires: gtk3-devel
 BuildRequires: desktop-file-utils
-BuildRequires: freeimage-devel
 BuildRequires: libjpeg-turbo-devel
-BuildRequires: perl-Image-ExifTool
-BuildRequires: xdg-utils
 BuildRequires: libtiff-devel
 BuildRequires: lcms2-devel
-BuildRequires: LibRaw-devel
 BuildRequires: libchamplain-devel
+BuildRequires: clutter-gtk-devel
 BuildRequires: make
 
 # Presents checked at build time
+Requires: binutils
 Requires: perl-Image-ExifTool
 Requires: xdg-utils
 Requires: dcraw
-Requires: exiv2
 Requires: openjpeg2-tools
 
+Suggests: rawtherapee
+Suggests: growisofs
+Suggests: hugin
+Suggests: libwebp-tools
+
 %description
 Fotoxx is a free open source Linux program for editing image files
 from a digital camera. The goal of fotoxx is to meet most image editing
@@ -72,6 +75,11 @@ ln -s %{_bindir}/fotoxx %{buildroot}%{_bindir}/fotoxx-snap
 #%%{_datadir}/metainfo/
 
 %changelog
+* Sat Jul 10 2021 Sérgio Basto <sergio@serjux.com> - 21.44-2
+- Adjustment of build requires and requires based on doc/README and fotoxx.cc
+  line 402
+- Patch to use opj2_decompress provided by openjpeg2 package
+
 * Wed Jun 30 2021 Gwyn Ciesla <gwync@protonmail.com> - 21.44-1
 - 21.44
 
diff --git a/opj_decompress.patch b/opj_decompress.patch
new file mode 100644
index 0000000..62ca671
--- /dev/null
+++ b/opj_decompress.patch
@@ -0,0 +1,40 @@
+--- ./f.pixmap.cc.orig	2021-07-10 19:55:06.790694310 +0100
++++ ./f.pixmap.cc	2021-07-10 19:55:27.744854925 +0100
+@@ -3597,7 +3597,7 @@ PXB * JP2_PXB_load(cchar *file)
+    if (! pp) goto errret;
+    strcpy(pp,".tif");
+ 
+-   err = zshell(0,"opj_decompress -i \"%s\" -o \"%s\" >/dev/null 2>1",file,tiffile);
++   err = zshell(0,"opj2_decompress -i \"%s\" -o \"%s\" >/dev/null 2>1",file,tiffile);
+ 
+    if (zdm) zdialog_free(zdm);
+    if (err) goto errret;
+@@ -3641,7 +3641,7 @@ PXM * JP2_PXM_load(cchar *file)
+    if (! pp) goto errret;
+    strcpy(pp,".tif");
+    
+-   err = zshell(0,"opj_decompress -i \"%s\" -o \"%s\" >/dev/null 2>1",file,tiffile);
++   err = zshell(0,"opj2_decompress -i \"%s\" -o \"%s\" >/dev/null 2>1",file,tiffile);
+ 
+    if (zdm) zdialog_free(zdm);
+    if (err) goto errret;
+--- ./fotoxx.cc.orig	2021-07-10 19:54:15.322299800 +0100
++++ ./fotoxx.cc	2021-07-10 19:54:37.556470227 +0100
+@@ -404,7 +404,7 @@ int main(int argc, char *argv[])
+    err = zshell(0,"which heif-convert >/dev/null 2>&1");                         //  file.heic to .jpg converter
+    if (! err) Fheif = 1;
+ 
+-   err = zshell(0,"which opj_decompress >/dev/null 2>&1");                       //  file.jp2 to .tif converter
++   err = zshell(0,"which opj2_decompress >/dev/null 2>&1");                       //  file.jp2 to .tif converter
+    if (! err) Fjp2 = 1;
+ 
+    err = zshell(0,"which dwebp >/dev/null 2>&1");                                //  file.webp to .tif converter 
+@@ -490,7 +490,7 @@ int main(int argc, char *argv[])
+    Ftinycomputer = 0;                                                            //  flag, inadequate memory
+    if (freememory < 4000) {                                                      //  4 GB threshhold
+       Ftinycomputer = 1;
+-      Plog(1,"computer has inadequate memory \n");
++      Plog(1,"computer has inadequate memory, only %.0f MB, we recommend 4000 MB\n", freememory);
+    }
+ 
+    Plog(1,"image size limits for reasonable performance: \n");