diff --git a/.gitignore b/.gitignore index b73abb1..7c3564d 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ fotoxx-8.0-mandir.patch /fotoxx-22.12.tar.gz /fotoxx-22.14.tar.gz /fotoxx-22.15.tar.gz +/fotoxx-22.16.tar.gz diff --git a/drop-locales.patch b/drop-locales.patch deleted file mode 100644 index 1d9442f..0000000 --- a/drop-locales.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.orig 2020-10-28 09:31:34.486382518 -0500 -+++ Makefile 2020-10-28 09:31:41.978341092 -0500 -@@ -29,7 +29,6 @@ - DATADIR = $(SHAREDIR)/data - ICONDIR = $(SHAREDIR)/icons - IMAGEDIR = $(SHAREDIR)/images --LOCALESDIR = $(SHAREDIR)/locales - DOCDIR = $(PREFIX)/share/doc/fotoxx - MANDIR = $(PREFIX)/share/man/man1 - APPDATADIR = $(PREFIX)/share/appdata -@@ -114,7 +113,6 @@ - mkdir -p $(DESTDIR)$(DATADIR) - mkdir -p $(DESTDIR)$(ICONDIR) - mkdir -p $(DESTDIR)$(IMAGEDIR) -- mkdir -p $(DESTDIR)$(LOCALESDIR) - mkdir -p $(DESTDIR)$(DOCDIR) - mkdir -p $(DESTDIR)$(MANDIR) - mkdir -p $(DESTDIR)$(PREFIX)/share/applications -@@ -122,7 +120,6 @@ - cp -f fotoxx $(DESTDIR)$(BINDIR) - cp -f -R data/* $(DESTDIR)$(DATADIR) - cp -f -R images/* $(DESTDIR)$(IMAGEDIR) -- cp -f -R locales/* $(DESTDIR)$(LOCALESDIR) - cp -f -R doc/* $(DESTDIR)$(DOCDIR) - gzip -f -9 $(DESTDIR)$(DOCDIR)/changelog - cp -f -R appdata/* $(DESTDIR)$(APPDATADIR) -@@ -137,7 +134,6 @@ - - uninstall: - rm -f $(DESTDIR)$(BINDIR)/fotoxx -- rm -f -R $(DESTDIR)$(LOCALESDIR) - rm -f -R $(DESTDIR)$(SHAREDIR) - rm -f -R $(DESTDIR)$(DOCDIR) - rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz diff --git a/fotoxx.spec b/fotoxx.spec index 80ea6a2..2ff5b23 100644 --- a/fotoxx.spec +++ b/fotoxx.spec @@ -1,5 +1,5 @@ Name: fotoxx -Version: 22.15 +Version: 22.16 Release: 1%{?dist} Summary: Photo editor @@ -74,6 +74,9 @@ ln -s %{_bindir}/fotoxx %{buildroot}%{_bindir}/fotoxx-snap #%%{_datadir}/metainfo/ %changelog +* Mon May 02 2022 Gwyn Ciesla - 22.16-1 +- 22.16 + * Sun Apr 03 2022 Sérgio Basto - 22.15-1 - Update fotoxx to 22.15 diff --git a/opj_decompress.patch b/opj_decompress.patch deleted file mode 100644 index 62ca671..0000000 --- a/opj_decompress.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- ./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"); diff --git a/sources b/sources index 5c4b39a..df0a8a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fotoxx-22.15.tar.gz) = 4f317a34a72db2e6289e17c9d2d036150e0e633ac84a0bcd0dd8b00367a3c31ea6172b7cceab0f358c0db46057d9e0331e0f0a304ebe86b9a1b717f6fa4f54fd +SHA512 (fotoxx-22.16.tar.gz) = ff78b0d7bbde0de5d98ac42d63c36f4bdcd425ae210dfcda6f64f4307be02dfca2966475df3f962751f73afc8e9442d2eb975725db31745109e174fe1665f804