git: d5ac0122e957 - main - graphics/fotocx: update the port to version 25.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Dec 2025 17:50:17 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d5ac0122e957dc2be4c7e04b7dc30367236709eb
commit d5ac0122e957dc2be4c7e04b7dc30367236709eb
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2025-12-28 17:48:36 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2025-12-28 17:48:36 +0000
graphics/fotocx: update the port to version 25.5
Get rid of PORTDOCS=* while here, two files do not
warrant it as we already use flattened `pkg-plist'.
Reported by: portscout
---
graphics/fotocx/Makefile | 4 +-
graphics/fotocx/distinfo | 6 +--
graphics/fotocx/files/patch-Makefile | 19 ++++----
graphics/fotocx/files/patch-f.file.cc | 20 ---------
graphics/fotocx/files/patch-fotocx.cc | 22 ++++-----
graphics/fotocx/files/patch-zfuncs.cc | 84 +++++++++++------------------------
graphics/fotocx/files/patch-zfuncs.h | 17 +++----
graphics/fotocx/pkg-plist | 66 +++++++++++++++------------
8 files changed, 96 insertions(+), 142 deletions(-)
diff --git a/graphics/fotocx/Makefile b/graphics/fotocx/Makefile
index 41a5150ac635..1637f1a73129 100644
--- a/graphics/fotocx/Makefile
+++ b/graphics/fotocx/Makefile
@@ -1,5 +1,5 @@
PORTNAME= fotocx
-PORTVERSION= 25.0
+PORTVERSION= 25.5
CATEGORIES= graphics
MASTER_SITES= https://kornelix.net/downloads/downloads/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
@@ -25,8 +25,6 @@ CXXFLAGS+= -Wno-register -Wno-writable-strings
WRKSRC= ${WRKDIR}/${PORTNAME}
-PORTDOCS= *
-
OPTIONS_DEFINE= DOCS
post-patch:
diff --git a/graphics/fotocx/distinfo b/graphics/fotocx/distinfo
index 5f2dafac7856..185b9378034b 100644
--- a/graphics/fotocx/distinfo
+++ b/graphics/fotocx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735737004
-SHA256 (fotocx-25.0-source.tar.gz) = 1d78106e91fcabfb07343f2d00201a745cb114935fee273b0547e68c794a5f7e
-SIZE (fotocx-25.0-source.tar.gz) = 15651266
+TIMESTAMP = 1763459925
+SHA256 (fotocx-25.5-source.tar.gz) = c81699e92ee6b8653d6e22ea0c1198268b36dc5a60cd86c543f2c9e701c97b36
+SIZE (fotocx-25.5-source.tar.gz) = 14619485
diff --git a/graphics/fotocx/files/patch-Makefile b/graphics/fotocx/files/patch-Makefile
index 16a66a2853a8..ca3a7f0ea90c 100644
--- a/graphics/fotocx/files/patch-Makefile
+++ b/graphics/fotocx/files/patch-Makefile
@@ -1,14 +1,14 @@
---- Makefile.orig 2023-11-01 13:01:41 UTC
+--- Makefile.orig 2025-07-10 05:25:44 UTC
+++ Makefile
@@ -1,6 +1,7 @@
- # fotoxx Makefile
+ # fotocx Makefile
#
# Following commands choose compiler and debug options
+ifdef WANT_EXTRA_CXXFLAGS
# export CXX=g++ gnu compiler
# export CXX=clang++ clang compiler
# export DEBUG=x debug build with address checking
-@@ -26,14 +27,15 @@ else # GCC
+@@ -27,6 +28,7 @@ else
-Wno-format-truncation -Wno-stringop-truncation
endif
endif
@@ -16,13 +16,12 @@
PKG_CONFIG ?= pkg-config
- CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \
-- `$(PKG_CONFIG) --cflags gtk+-3.0 --libs champlain-gtk-0.12`
-+ `$(PKG_CONFIG) --cflags gtk+-3.0 --cflags champlain-gtk-0.12`
+@@ -34,7 +36,7 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c
+ `$(PKG_CONFIG) --cflags gtk+-3.0 --cflags champlain-gtk-0.12`
- LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \
-- -lrt -lpthread -ltiff -lpng -ljpeg \
+ LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \
+- -lrt -lpthread -ltiff -lpng -ljpeg \
+ -lrt -lpthread -ltiff -lpng -ljpeg -lexecinfo \
- -lclutter-1.0 -lclutter-gtk-1.0 -lchamplain-0.12 -lchamplain-gtk-0.12
+ -lclutter-1.0 -lclutter-gtk-1.0 \
+ -lchamplain-0.12 -lchamplain-gtk-0.12
- ALLFILES = fotoxx.o f.widgets.o f.file.o f.gallery.o f.albums.o f.select.o f.meta.o \
diff --git a/graphics/fotocx/files/patch-f.file.cc b/graphics/fotocx/files/patch-f.file.cc
deleted file mode 100644
index fe32d1f6e592..000000000000
--- a/graphics/fotocx/files/patch-f.file.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- f.file.cc.orig 2021-10-17 20:02:26 UTC
-+++ f.file.cc
-@@ -3687,13 +3687,17 @@ int find_imagefiles(cchar *folder, int flags, char **&
-
- if (flags & 1) Fimages = 1;
- if (flags & 2) Fthumbs = 1;
-+#ifdef GLOB_PERIOD
- if (flags & 4) globflags += GLOB_PERIOD;
-+#endif
- if (flags & 8) Fdirs = 1;
- if (flags & 16) Frecurse = 1;
- if (flags & 32) Fnolinks = 1;
-
-+#ifdef GLOB_ONLYDIR
- if (Fdirs && ! Fimages && ! Fthumbs)
- globflags += GLOB_ONLYDIR;
-+#endif
-
- globdata.gl_pathc = 0; // glob() setup
- globdata.gl_offs = 0;
diff --git a/graphics/fotocx/files/patch-fotocx.cc b/graphics/fotocx/files/patch-fotocx.cc
index 26af384d4207..19eeb192fad5 100644
--- a/graphics/fotocx/files/patch-fotocx.cc
+++ b/graphics/fotocx/files/patch-fotocx.cc
@@ -1,15 +1,6 @@
---- fotocx.cc.orig 2025-01-01 12:47:23 UTC
+--- fotocx.cc.orig 2025-11-18 09:44:35 UTC
+++ fotocx.cc
-@@ -240,7 +240,7 @@ int main(int argc, ch *argv[])
- Nblacklist = 0; // blacklist folders/files count
- Nfuncbusy = 0; // nothing busy
- Fescape = 0; // no escape key pressed
-- NSMP = 8; // default SMP (core) count
-+ NSMP = get_nprocs();
-
- imagefiletypes = zstrdup(".jpg .jpeg .png .jxl .tif .tiff .bmp .ico .ppm .gif .svg .xpm .tga " ,"params",100); // jxl
- RAWfiletypes = zstrdup(".arw .srf .sr2 .crw .cr2 .cr3 .dng .mdc .mrw .nef .nrw .raw .rw2 .srw ", "params",100);
-@@ -307,7 +307,7 @@ int main(int argc, ch *argv[])
+@@ -333,7 +333,7 @@ int main(int argc, ch *argv[])
// delete fotocx temp files if owner process is no longer running
pidlist = 0;
@@ -18,3 +9,12 @@
fid = popen(buff,"r");
if (fid) {
pp = fgets_trim(buff,200,fid);
+@@ -464,7 +464,7 @@ int main(int argc, ch *argv[])
+ // Report SMP (core) count for parallel threads. Hyperthreads and E-cores
+ // have marginal value, but the kernel scheduler does not discriminate.
+
+- NSMP = get_nprocs_conf(); // get actual CPU core count 25.2
++ NSMP = get_nprocs();
+ if (NSMP < 4) NSMP = 4; // minimum required for some functions
+ if (NSMP > XSMP) NSMP = XSMP; // compile time limit
+ printf("SMP thread count: %d \n",NSMP);
diff --git a/graphics/fotocx/files/patch-zfuncs.cc b/graphics/fotocx/files/patch-zfuncs.cc
index a29666c83897..720e49bde2d3 100644
--- a/graphics/fotocx/files/patch-zfuncs.cc
+++ b/graphics/fotocx/files/patch-zfuncs.cc
@@ -1,6 +1,6 @@
---- zfuncs.cc.orig 2024-07-01 07:25:41 UTC
+--- zfuncs.cc.orig 2025-11-18 09:44:35 UTC
+++ zfuncs.cc
-@@ -559,6 +559,7 @@ int zmalloc_test(int64 cc)
+@@ -490,6 +490,7 @@ int zmalloc_test(int64 cc)
double realmemory()
{
@@ -8,7 +8,7 @@
FILE *fid;
ch buff[100], *pp;
double rmem = 0;
-@@ -577,15 +578,45 @@ double realmemory()
+@@ -508,15 +509,45 @@ double realmemory()
}
fclose(fid);
@@ -54,7 +54,7 @@
FILE *fid;
ch buff[100], *pp;
double avmem = 0;
-@@ -610,6 +641,11 @@ double availmemory()
+@@ -541,6 +572,11 @@ double availmemory()
}
fclose(fid);
@@ -66,7 +66,7 @@
return avmem;
}
-@@ -749,7 +785,7 @@ void zappcrash(ch *format, ... )
+@@ -793,7 +829,7 @@ void zappcrash(ch *format, ... )
uname(&unbuff); // get cpu arch. 32/64 bit
arch = unbuff.machine;
@@ -75,34 +75,23 @@
if (fid1) {
ii = fscanf(fid1,"%s %s %s",OS1,OS2,OS3);
pclose(fid1);
-@@ -1062,7 +1098,7 @@ double get_seconds()
- timespec time1;
- double secs;
-
-- clock_gettime(CLOCK_MONOTONIC_RAW,&time1);
-+ clock_gettime(CLOCK_MONOTONIC,&time1);
- secs = time1.tv_sec;
- secs += time1.tv_nsec * 0.000000001;
- return secs;
-@@ -1111,7 +1147,7 @@ void logtime_init(ch *text)
- using namespace logtime_names;
-
- printf("logtime init: %s\n",text);
-- clock_gettime(CLOCK_MONOTONIC_RAW,&time1);
-+ clock_gettime(CLOCK_MONOTONIC,&time1);
- return;
- }
-
-@@ -1119,7 +1155,7 @@ void logtime(ch *text)
- {
- using namespace logtime_names;
-
-- clock_gettime(CLOCK_MONOTONIC_RAW,&time2);
-+ clock_gettime(CLOCK_MONOTONIC,&time2);
- elapsed = time2.tv_sec - time1.tv_sec;
- elapsed += 0.000000001 * (time2.tv_nsec - time1.tv_nsec);
- time1 = time2;
-@@ -1808,6 +1844,10 @@ int wait_Jthread(pthread_t tid)
+@@ -1049,13 +1085,13 @@ double get_seconds(int init)
+ static double secs1 = 0, secs2, secs3;
+
+ if (init == 0) {
+- clock_gettime(CLOCK_MONOTONIC_RAW,&time1);
++ clock_gettime(CLOCK_MONOTONIC,&time1);
+ secs1 = time1.tv_sec;
+ secs1 += time1.tv_nsec * 0.000000001;
+ return secs1;
+ }
+ else {
+- clock_gettime(CLOCK_MONOTONIC_RAW,&time1);
++ clock_gettime(CLOCK_MONOTONIC,&time1);
+ secs2 = time1.tv_sec;
+ secs2 += time1.tv_nsec * 0.000000001;
+ secs3 = secs2 - secs1;
+@@ -1977,6 +2013,10 @@ int samefolder(ch *file1, ch *file2)
return 0;
}
@@ -113,26 +102,7 @@
/********************************************************************************/
-@@ -1858,7 +1898,7 @@ void set_cpu_affinity(int cpu)
- {
- int err;
- static int ftf = 1, Nsmp;
-- cpu_set_t cpuset;
-+ cpuset_t cpuset;
-
- if (ftf) { // first call
- ftf = 0;
-@@ -1869,7 +1909,8 @@ void set_cpu_affinity(int cpu)
-
- CPU_ZERO(&cpuset);
- CPU_SET(cpu,&cpuset);
-- err = sched_setaffinity(0,sizeof(cpuset),&cpuset);
-+ err = cpuset_setaffinity(CPU_LEVEL_WHICH,CPU_WHICH_PID,0,
-+ sizeof(cpuset),&cpuset);
- if (err) Plog(2,"set_cpu_affinity() %s \n",strerror(errno));
- return;
- }
-@@ -2182,7 +2223,7 @@ uint diskspace(ch *file)
+@@ -2147,7 +2187,7 @@ uint diskspace(ch *file)
FILE *fid;
pp = zescape_quotes(file);
@@ -141,7 +111,7 @@
zfree(pp);
fid = popen(command,"r");
-@@ -4050,14 +4091,18 @@ ch * SearchWildCase(ch *wpath, int &uflag)
+@@ -3999,14 +4039,18 @@ ch * SearchWildCase(ch *wpath, int &uflag)
flist and flist[*] are subjects for zfree().
zfind() works for files containing quotes (")
@@ -161,8 +131,8 @@
int ii, jj, err, cc;
glob_t globdata;
ch *pp;
-@@ -6028,9 +6073,16 @@ int zinitapp(ch *appvers, int argc, ch *argv[])
- if (argc > 1 && strmatchV(argv[1],"-ver","-v",0)) exit(0); // exit if nothing else wanted
+@@ -6033,9 +6077,16 @@ int zinitapp(ch *appvers, int argc, ch *argv[])
+ if (argc > 1 && strmatchV(argv[1],"-ver","-v",null)) exit(0); // exit if nothing else wanted
progexe = 0;
+#if defined(__linux__)
@@ -177,4 +147,4 @@
+#endif
progexe = zstrdup(buff,"zinitapp");
- Plog(1,"program exe: %s \n",progexe); // executable path
+ printf("program exe: %s \n",progexe); // executable path
diff --git a/graphics/fotocx/files/patch-zfuncs.h b/graphics/fotocx/files/patch-zfuncs.h
index e020ff283690..bdbbec03236b 100644
--- a/graphics/fotocx/files/patch-zfuncs.h
+++ b/graphics/fotocx/files/patch-zfuncs.h
@@ -1,15 +1,13 @@
---- zfuncs.h.orig 2021-10-17 20:02:26 UTC
+--- zfuncs.h.orig 2025-11-18 09:44:35 UTC
+++ zfuncs.h
-@@ -17,14 +17,17 @@
+@@ -17,13 +17,15 @@
*********************************************************************************/
-#include <sys/sysinfo.h>
+#include <sys/param.h>
-+#include <sys/cpuset.h>
+#include <sys/sysctl.h>
#include <sys/time.h>
- #include <sys/timeb.h>
#include <sys/stat.h>
#include <sys/resource.h>
#include <sys/file.h>
@@ -20,12 +18,11 @@
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
-@@ -130,6 +133,8 @@ pthread_t start_Jthread(void * threadfunc(void *), voi
+@@ -131,6 +133,7 @@ pthread_t start_Jthread(void * threadfunc(void *), voi
int wait_Jthread(pthread_t tid); // wait for completion (join thread)
void synch_threads(int NT = 0); // synchronize NT threads
int main_thread(); // return 1 if main() thread, else 0
-+int get_nprocs();
-+ // get number of CPUs in the system
- void set_cpu_affinity(int cpu); // set cpu affinity for calling thread
- int zshell(cchar *options, cchar *command, ...); // do shell command and get status
- int zshell_gtk(cchar *options, cchar *command, ...); // same, with parallel gtk mainloop
++int get_nprocs(); // get number of online CPUs in the system
+ int zshell(ch *options, ch *command, ...); // do shell command and get status
+ int kill_procname(ch *wildname); // kill processes matching wilcard name
+ int signalProc(ch *pname, ch *signal); // send signal to process by process name
diff --git a/graphics/fotocx/pkg-plist b/graphics/fotocx/pkg-plist
index 64c8af048571..52a40f02f139 100644
--- a/graphics/fotocx/pkg-plist
+++ b/graphics/fotocx/pkg-plist
@@ -1,7 +1,9 @@
bin/fotocx
share/applications/fotocx.desktop
+%%PORTDOCS%%%%DOCSDIR%%/changelog
+%%PORTDOCS%%%%DOCSDIR%%/copyright
%%DATADIR%%/data/CIE1931.jpg
-%%DATADIR%%/data/KB_shortcuts_H
+%%DATADIR%%/data/KB_shortcuts_J
%%DATADIR%%/data/README_H
%%DATADIR%%/data/capskeys_H
%%DATADIR%%/data/custom_kernel/blur5
@@ -29,9 +31,14 @@ share/applications/fotocx.desktop
%%DATADIR%%/data/custom_scripts/cartoon-emboss
%%DATADIR%%/data/custom_scripts/ektar film process
%%DATADIR%%/data/custom_scripts/emboss
+%%DATADIR%%/data/custom_scripts/kuwahara-amplifyContrast
+%%DATADIR%%/data/custom_scripts/mosaic
+%%DATADIR%%/data/custom_scripts/painting-texture
+%%DATADIR%%/data/custom_scripts/sharpen-tiles2-emboss
%%DATADIR%%/data/custom_scripts/voodoo
+%%DATADIR%%/data/grid_picklist
%%DATADIR%%/data/map_regions_H
-%%DATADIR%%/data/meta_picklist_H
+%%DATADIR%%/data/meta_picklist_J
%%DATADIR%%/data/palettes/Bears.gpl
%%DATADIR%%/data/palettes/Bgold.gpl
%%DATADIR%%/data/palettes/Blues.gpl
@@ -115,7 +122,7 @@ share/applications/fotocx.desktop
%%DATADIR%%/data/patterns/wet-turquoise.jpg
%%DATADIR%%/data/patterns/wood.jpg
%%DATADIR%%/data/plugins_H
-%%DATADIR%%/data/raw_commands_I
+%%DATADIR%%/data/raw_commands_H
%%DATADIR%%/data/slideshow-tone.oga
%%DATADIR%%/data/tags_defined
%%DATADIR%%/data/userguide
@@ -129,13 +136,12 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/KB-shortcuts2.png
%%DATADIR%%/images/RGB-hist.png
%%DATADIR%%/images/add-meta-items.png
-%%DATADIR%%/images/add-motionblur1.jpg
%%DATADIR%%/images/add-noise.png
-%%DATADIR%%/images/add-subfolder.png
%%DATADIR%%/images/adjust-HSL.png
%%DATADIR%%/images/adjust-RGB.png
%%DATADIR%%/images/album-mass-update.png
%%DATADIR%%/images/album-replace-file.png
+%%DATADIR%%/images/albums.png
%%DATADIR%%/images/alien-colors1.png
%%DATADIR%%/images/alien-colors2.png
%%DATADIR%%/images/amplify-contrast.png
@@ -144,10 +150,9 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/area-blend.jpg
%%DATADIR%%/images/area-blend2.jpg
%%DATADIR%%/images/area-rescale.png
-%%DATADIR%%/images/area-rescale2.png
%%DATADIR%%/images/area_fill.png
%%DATADIR%%/images/batch-change-meta.png
-%%DATADIR%%/images/batch-convert.png
+%%DATADIR%%/images/batch-convert.jpg
%%DATADIR%%/images/batch-copy-move.png
%%DATADIR%%/images/batch-delete-trash.png
%%DATADIR%%/images/batch-geotags.png
@@ -184,30 +189,30 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/copy-from-image2.jpg
%%DATADIR%%/images/copy-in-image.png
%%DATADIR%%/images/copy-move.png
-%%DATADIR%%/images/copy-paste-colors.png
%%DATADIR%%/images/copy-prior-edit.png
-%%DATADIR%%/images/crop-buttons.png
-%%DATADIR%%/images/crop.png
+%%DATADIR%%/images/crop-buttons.jpg
+%%DATADIR%%/images/crop-image.jpg
%%DATADIR%%/images/custom-kernel.png
%%DATADIR%%/images/custom-menu.png
%%DATADIR%%/images/custom-widgets.png
%%DATADIR%%/images/custom.png
%%DATADIR%%/images/dark-bright-pixels.png
+%%DATADIR%%/images/debug.png
%%DATADIR%%/images/defog.png
%%DATADIR%%/images/defog2.png
%%DATADIR%%/images/delete-trash.png
%%DATADIR%%/images/denoise.jpg
-%%DATADIR%%/images/devmenu.png
%%DATADIR%%/images/dither1.png
%%DATADIR%%/images/dither2.jpg
-%%DATADIR%%/images/draw-box.png
-%%DATADIR%%/images/draw-line.png
-%%DATADIR%%/images/draw-oval.png
+%%DATADIR%%/images/draw-arrow.jpg
+%%DATADIR%%/images/draw-box.jpg
+%%DATADIR%%/images/draw-oval.jpg
%%DATADIR%%/images/draw-text.jpg
%%DATADIR%%/images/edit-any-metadata.png
%%DATADIR%%/images/edit-bookmarks.png
%%DATADIR%%/images/edit-hist.png
%%DATADIR%%/images/edit-meta.jpg
+%%DATADIR%%/images/edit-selection.jpg
%%DATADIR%%/images/edit.png
%%DATADIR%%/images/effects.png
%%DATADIR%%/images/emboss.png
@@ -236,14 +241,16 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/fotocx.png
%%DATADIR%%/images/fringes.png
%%DATADIR%%/images/fringesA.png
+%%DATADIR%%/images/fusion.png
+%%DATADIR%%/images/fusion2.jpg
%%DATADIR%%/images/gallery-screen.png
%%DATADIR%%/images/gallery-sort.png
%%DATADIR%%/images/gallery-view.jpg
%%DATADIR%%/images/gallery.png
%%DATADIR%%/images/global-retx.png
-%%DATADIR%%/images/global-retx2.png
+%%DATADIR%%/images/global-retx2.jpg
%%DATADIR%%/images/greenball.png
-%%DATADIR%%/images/grid-lines.png
+%%DATADIR%%/images/grid-settings.jpg
%%DATADIR%%/images/help.png
%%DATADIR%%/images/image-array.jpg
%%DATADIR%%/images/image-diffs.png
@@ -255,7 +262,7 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/inside-out2.png
%%DATADIR%%/images/interpolation.png
%%DATADIR%%/images/jpeg-artifacts.png
-%%DATADIR%%/images/jpeg-artifacts1.png
+%%DATADIR%%/images/jpeg-artifacts1.jpg
%%DATADIR%%/images/jpeg-quality.png
%%DATADIR%%/images/local-retx.png
%%DATADIR%%/images/local-retx2.png
@@ -302,14 +309,14 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/paint-transp2.png
%%DATADIR%%/images/painting1.png
%%DATADIR%%/images/painting2.png
-%%DATADIR%%/images/pano-adjust.png
-%%DATADIR%%/images/pano-align1.png
+%%DATADIR%%/images/pano-adjust.jpg
+%%DATADIR%%/images/pano-align1.jpg
%%DATADIR%%/images/pano-align2.jpg
%%DATADIR%%/images/pattern1.png
%%DATADIR%%/images/pattern2.jpg
%%DATADIR%%/images/permissions.png
%%DATADIR%%/images/perspective1.png
-%%DATADIR%%/images/perspective2.png
+%%DATADIR%%/images/perspective2.jpg
%%DATADIR%%/images/plugins-edit.jpg
%%DATADIR%%/images/plugins.png
%%DATADIR%%/images/prev-next.png
@@ -355,16 +362,16 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/smart-erase.png
%%DATADIR%%/images/smart-erase2.png
%%DATADIR%%/images/soft-focus.png
-%%DATADIR%%/images/soft-focus2.png
+%%DATADIR%%/images/soft-focus2.jpg
%%DATADIR%%/images/sphere.png
%%DATADIR%%/images/sphere2.jpg
+%%DATADIR%%/images/split-screen1.jpg
+%%DATADIR%%/images/split-screen2.png
%%DATADIR%%/images/stack-layers.png
%%DATADIR%%/images/stack-noise.png
%%DATADIR%%/images/stack-noise2.jpg
%%DATADIR%%/images/stack-paint.png
%%DATADIR%%/images/stack-paint2.jpg
-%%DATADIR%%/images/stack-split.png
-%%DATADIR%%/images/stack-split2.png
%%DATADIR%%/images/texture.png
%%DATADIR%%/images/texture2.png
%%DATADIR%%/images/tiles2a.png
@@ -375,18 +382,21 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/top-panel.png
%%DATADIR%%/images/twist1.png
%%DATADIR%%/images/twist2.png
+%%DATADIR%%/images/ug-albums.jpg
%%DATADIR%%/images/ug-batch.png
%%DATADIR%%/images/ug-combine.png
%%DATADIR%%/images/ug-custom.png
-%%DATADIR%%/images/ug-edit.png
-%%DATADIR%%/images/ug-effects.png
-%%DATADIR%%/images/ug-file.png
+%%DATADIR%%/images/ug-edit.jpg
+%%DATADIR%%/images/ug-effects.jpg
+%%DATADIR%%/images/ug-file.jpg
%%DATADIR%%/images/ug-gallery.png
%%DATADIR%%/images/ug-help.png
-%%DATADIR%%/images/ug-maps.png
+%%DATADIR%%/images/ug-maps.jpg
%%DATADIR%%/images/ug-metadata.png
+%%DATADIR%%/images/ug-prev-next.jpg
%%DATADIR%%/images/ug-refine.png
%%DATADIR%%/images/ug-repair.png
+%%DATADIR%%/images/ug-save.jpg
%%DATADIR%%/images/ug-select.png
%%DATADIR%%/images/ug-tools.png
%%DATADIR%%/images/ug-undo-redo.png
@@ -400,7 +410,7 @@ share/applications/fotocx.desktop
%%DATADIR%%/images/unbend2.png
%%DATADIR%%/images/undo-redo.png
%%DATADIR%%/images/unwarp-closeup1.png
-%%DATADIR%%/images/unwarp-closeup2.png
+%%DATADIR%%/images/unwarp-closeup2.jpg
%%DATADIR%%/images/upscale+sharpen.jpg
%%DATADIR%%/images/userguide.jpg
%%DATADIR%%/images/view-metadata.jpg