diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 8edbb32e1c9a1..ca3855b6a0a56 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -1,5 +1,5 @@ PORTNAME= fotoxx -PORTVERSION= 23.32 +PORTVERSION= 23.50 CATEGORIES= graphics MASTER_SITES= https://kornelix.net/downloads/downloads/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo index 85f1176fc7a8f..73759f2d0953a 100644 --- a/graphics/fotoxx/distinfo +++ b/graphics/fotoxx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680699420 -SHA256 (fotoxx-23.32-source.tar.gz) = 3d88f483b671f4ba7005a9f9195994408ceb97289a77acd3981462ac92397537 -SIZE (fotoxx-23.32-source.tar.gz) = 9273650 +TIMESTAMP = 1684151497 +SHA256 (fotoxx-23.50-source.tar.gz) = 795c48f95fdad95549bc4decfdeceb1c0ef01c413475fb401968828589f6f5dc +SIZE (fotoxx-23.50-source.tar.gz) = 9344552 diff --git a/graphics/fotoxx/files/patch-f.refine.cc b/graphics/fotoxx/files/patch-f.refine.cc index 7867f66b007f9..6769e3308abc6 100644 --- a/graphics/fotoxx/files/patch-f.refine.cc +++ b/graphics/fotoxx/files/patch-f.refine.cc @@ -21,7 +21,7 @@ @@ -1067,7 +1067,7 @@ void flatdist_func(int _radius, int _flatten, int _deb EFflatdist.menufunc = m_flatdist; EFflatdist.Farea = 2; // select area usable - EFflatdist.Frestart = 1; // restartable + EFflatdist.Fscript = 1; // scripting supported 23.4 - EFflatdist.threadfunc = thread; + EFflatdist.threadfunc = flatdist_names::thread; diff --git a/graphics/fotoxx/files/patch-zfuncs.cc b/graphics/fotoxx/files/patch-zfuncs.cc index b83322379cad3..238953dcea7d5 100644 --- a/graphics/fotoxx/files/patch-zfuncs.cc +++ b/graphics/fotoxx/files/patch-zfuncs.cc @@ -124,14 +124,14 @@ return; } @@ -2234,7 +2275,7 @@ int diskspace(cchar *file) - int avail; FILE *fid; -- snprintf(command,200,"df --output=avail \"%s\" ",file); -+ snprintf(command,200,"df -k '%s' | awk '{print $4}'",file); - pp = strchr(command,'/'); - if (! pp) return 0; + pp = zescape_quotes(file); // 23.4 +- snprintf(command,200,"df --output=avail \"%s\" ",pp); ++ snprintf(command,200,"df -k '%s' | awk '{print $4}'",pp); + zfree(pp); + fid = popen(command,"r"); @@ -4115,14 +4156,18 @@ cchar * SearchWildCase(cchar *wpath, int &uflag) flist and flist[*] are subjects for zfree(). diff --git a/graphics/fotoxx/pkg-plist b/graphics/fotoxx/pkg-plist index bb993b920cbb7..0025af8fcb640 100644 --- a/graphics/fotoxx/pkg-plist +++ b/graphics/fotoxx/pkg-plist @@ -154,7 +154,7 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/crop-buttons.jpg %%DATADIR%%/images/crop.jpg %%DATADIR%%/images/custom-kernel.jpg -%%DATADIR%%/images/custom-widgets.jpg +%%DATADIR%%/images/custom-widgets.png %%DATADIR%%/images/custom.png %%DATADIR%%/images/defog.jpg %%DATADIR%%/images/defog2.jpg @@ -188,7 +188,6 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/first-startup.jpg %%DATADIR%%/images/fix-motion-blur.jpg %%DATADIR%%/images/fix-motion-blur1.jpg -%%DATADIR%%/images/fix-motion-blur2.jpg %%DATADIR%%/images/flatten-photo1.jpg %%DATADIR%%/images/flatten-photo2.jpg %%DATADIR%%/images/flatten1.jpg @@ -209,15 +208,17 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/greenball.png %%DATADIR%%/images/grid-lines.jpg %%DATADIR%%/images/help.png +%%DATADIR%%/images/image-array.jpg %%DATADIR%%/images/image-diffs.jpg %%DATADIR%%/images/image-locations.jpg %%DATADIR%%/images/image-management.jpg -%%DATADIR%%/images/image-table.jpg %%DATADIR%%/images/index-files1.jpg %%DATADIR%%/images/index-files2.jpg %%DATADIR%%/images/inside-out1.jpg %%DATADIR%%/images/inside-out2.jpg %%DATADIR%%/images/interpolation.jpg +%%DATADIR%%/images/jpeg-artifacts.jpg +%%DATADIR%%/images/jpeg-artifacts1.jpg %%DATADIR%%/images/jpeg-quality.jpg %%DATADIR%%/images/local-retx.jpg %%DATADIR%%/images/local-retx2.jpg @@ -253,6 +254,7 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/mosaic1.jpg %%DATADIR%%/images/mosaic2.jpg %%DATADIR%%/images/netmap-locs.jpg +%%DATADIR%%/images/nonlinear slider.png %%DATADIR%%/images/number-keys.jpg %%DATADIR%%/images/outboard-programs.jpg %%DATADIR%%/images/paint-edits.jpg @@ -289,7 +291,7 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/rename-folder.jpg %%DATADIR%%/images/rename.jpg %%DATADIR%%/images/repair.png -%%DATADIR%%/images/resize.jpg +%%DATADIR%%/images/rescale.jpg %%DATADIR%%/images/retouch.jpg %%DATADIR%%/images/rotate-left.png %%DATADIR%%/images/rotate-right.png