From d6ba3cdb995d72f4e928ba1a4e394e8da02e879d Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Wed, 21 Feb 2024 03:41:42 +0000 Subject: graphics/fotoxx -> graphics/fotocx: the port had been renamed. --- MOVED | 1 + graphics/Makefile | 2 +- graphics/fotocx/Makefile | 36 +++ graphics/fotocx/distinfo | 3 + graphics/fotocx/files/patch-Makefile | 28 +++ graphics/fotocx/files/patch-f.file.cc | 20 ++ graphics/fotocx/files/patch-f.refine.cc | 29 +++ graphics/fotocx/files/patch-fotocx.cc | 28 +++ graphics/fotocx/files/patch-zfuncs.cc | 180 +++++++++++++++ graphics/fotocx/files/patch-zfuncs.h | 31 +++ graphics/fotocx/pkg-descr | 3 + graphics/fotocx/pkg-plist | 374 ++++++++++++++++++++++++++++++++ graphics/fotoxx/Makefile | 36 --- graphics/fotoxx/distinfo | 3 - graphics/fotoxx/files/patch-Makefile | 28 --- graphics/fotoxx/files/patch-f.file.cc | 20 -- graphics/fotoxx/files/patch-f.refine.cc | 29 --- graphics/fotoxx/files/patch-fotoxx.cc | 28 --- graphics/fotoxx/files/patch-zfuncs.cc | 180 --------------- graphics/fotoxx/files/patch-zfuncs.h | 31 --- graphics/fotoxx/pkg-descr | 3 - graphics/fotoxx/pkg-plist | 374 -------------------------------- 22 files changed, 734 insertions(+), 733 deletions(-) create mode 100644 graphics/fotocx/Makefile create mode 100644 graphics/fotocx/distinfo create mode 100644 graphics/fotocx/files/patch-Makefile create mode 100644 graphics/fotocx/files/patch-f.file.cc create mode 100644 graphics/fotocx/files/patch-f.refine.cc create mode 100644 graphics/fotocx/files/patch-fotocx.cc create mode 100644 graphics/fotocx/files/patch-zfuncs.cc create mode 100644 graphics/fotocx/files/patch-zfuncs.h create mode 100644 graphics/fotocx/pkg-descr create mode 100644 graphics/fotocx/pkg-plist delete mode 100644 graphics/fotoxx/Makefile delete mode 100644 graphics/fotoxx/distinfo delete mode 100644 graphics/fotoxx/files/patch-Makefile delete mode 100644 graphics/fotoxx/files/patch-f.file.cc delete mode 100644 graphics/fotoxx/files/patch-f.refine.cc delete mode 100644 graphics/fotoxx/files/patch-fotoxx.cc delete mode 100644 graphics/fotoxx/files/patch-zfuncs.cc delete mode 100644 graphics/fotoxx/files/patch-zfuncs.h delete mode 100644 graphics/fotoxx/pkg-descr delete mode 100644 graphics/fotoxx/pkg-plist diff --git a/MOVED b/MOVED index eee13163dcb2..44049d8db401 100644 --- a/MOVED +++ b/MOVED @@ -2992,3 +2992,4 @@ audio/taglib-extras||2024-02-17|Incompatible with taglib 2.x and unmaintained up security/py-pysha3||2024-02-17|Merged into python standard library since version 3.6 graphics/qcustomplot-qt5|graphics/qcustomplot|2024-02-19|Renamed to support flavors audio/play||2024-02-20|Has expired: Upstream vaporized and last release was in 2000 +graphics/fotoxx|graphics/fotocx|2024-02-21|Project was renamed upstream diff --git a/graphics/Makefile b/graphics/Makefile index 50eb59e0f8ae..7f5fc8a673d8 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -200,7 +200,7 @@ SUBDIR += flphoto SUBDIR += fly SUBDIR += fortytwo - SUBDIR += fotoxx + SUBDIR += fotocx SUBDIR += founts SUBDIR += fracplanet SUBDIR += fractgen diff --git a/graphics/fotocx/Makefile b/graphics/fotocx/Makefile new file mode 100644 index 000000000000..3011d84bfc05 --- /dev/null +++ b/graphics/fotocx/Makefile @@ -0,0 +1,36 @@ +PORTNAME= fotocx +PORTVERSION= 24.11 +CATEGORIES= graphics +MASTER_SITES= https://kornelix.net/downloads/downloads/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-source + +MAINTAINER= danfe@FreeBSD.org +COMMENT= Image editing and collection management program +WWW= https://kornelix.net/fotocx/fotocx.html + +LICENSE= GPLv3+ + +LIB_DEPENDS= libchamplain-gtk-0.12.so:graphics/libchamplain \ + libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ + liblcms2.so:graphics/lcms2 \ + libpng.so:graphics/png \ + libtiff.so:graphics/tiff +RUN_DEPENDS= xdg-open:devel/xdg-utils \ + exiftool:graphics/p5-Image-ExifTool \ + ufraw-batch:graphics/ufraw + +USES= desktop-file-utils gmake gnome jpeg pkgconfig +USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 +ALL_TARGET= ${PORTNAME} +CXXFLAGS+= -Wno-register -Wno-writable-strings + +WRKSRC= ${WRKDIR}/${PORTNAME} + +PORTDOCS= * + +OPTIONS_DEFINE= DOCS + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + +.include diff --git a/graphics/fotocx/distinfo b/graphics/fotocx/distinfo new file mode 100644 index 000000000000..053a90dab99c --- /dev/null +++ b/graphics/fotocx/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1707302474 +SHA256 (fotocx-24.11-source.tar.gz) = bc3e12a7ae2deb80ff41b14d392f15010eed93eb383dd184d605967c47a78b95 +SIZE (fotocx-24.11-source.tar.gz) = 16322678 diff --git a/graphics/fotocx/files/patch-Makefile b/graphics/fotocx/files/patch-Makefile new file mode 100644 index 000000000000..13f9425477bc --- /dev/null +++ b/graphics/fotocx/files/patch-Makefile @@ -0,0 +1,28 @@ +--- Makefile.orig 2023-11-01 13:01:41 UTC ++++ Makefile +@@ -1,6 +1,7 @@ + # fotoxx 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 + -Wno-format-truncation -Wno-stringop-truncation + endif + endif ++endif + + 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` + + LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \ +- -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg \ ++ -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg -lexecinfo \ + -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 new file mode 100644 index 000000000000..fe32d1f6e592 --- /dev/null +++ b/graphics/fotocx/files/patch-f.file.cc @@ -0,0 +1,20 @@ +--- 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-f.refine.cc b/graphics/fotocx/files/patch-f.refine.cc new file mode 100644 index 000000000000..6769e3308abc --- /dev/null +++ b/graphics/fotocx/files/patch-f.refine.cc @@ -0,0 +1,29 @@ +--- f.refine.cc.orig 2023-03-01 07:32:06 UTC ++++ f.refine.cc +@@ -223,7 +223,7 @@ void m_edit_dist(GtkWidget *, ch *menu) + EFedit_dist.Farea = 2; // select area usable + EFedit_dist.Frestart = 1; // restart allowed + EFedit_dist.Fscript = 1; // scripting supported +- EFedit_dist.threadfunc = thread; ++ EFedit_dist.threadfunc = edit_dist_names::thread; + if (! edit_setup(EFedit_dist)) return; // setup edit + + /*** +@@ -589,7 +589,7 @@ void m_flatdist(GtkWidget *, ch *menu) + EFflatdist.Frestart = 1; // restartable + EFflatdist.Fpaintedits = 1; // use with paint edits OK + EFflatdist.Fscript = 1; // scripting supported +- EFflatdist.threadfunc = thread; ++ EFflatdist.threadfunc = flatdist_names::thread; + if (! edit_setup(EFflatdist)) return; // setup edit + + Eww = E0pxm->ww; +@@ -1067,7 +1067,7 @@ void flatdist_func(int _radius, int _flatten, int _deb + EFflatdist.menufunc = m_flatdist; + EFflatdist.Farea = 2; // select area usable + EFflatdist.Fscript = 1; // scripting supported 23.4 +- EFflatdist.threadfunc = thread; ++ EFflatdist.threadfunc = flatdist_names::thread; + + if (! edit_setup(EFflatdist)) return; // setup edit + diff --git a/graphics/fotocx/files/patch-fotocx.cc b/graphics/fotocx/files/patch-fotocx.cc new file mode 100644 index 000000000000..dbacbec2de34 --- /dev/null +++ b/graphics/fotocx/files/patch-fotocx.cc @@ -0,0 +1,28 @@ +--- fotocx.cc.orig 2024-02-07 10:14:27 UTC ++++ fotocx.cc +@@ -317,7 +317,7 @@ int main(int argc, ch *argv[]) + // delete fotocx temp files if owner process is no longer running + + pidlist = 0; +- snprintf(buff,200,"pidof fotocx fotocx.x"); // get active fotocx PIDs 23.3 ++ snprintf(buff,200,"pgrep -d\\ fotocx fotocx.x"); + fid = popen(buff,"r"); + if (fid) { + pp = fgets_trim(buff,200,fid); +@@ -455,13 +455,15 @@ int main(int argc, ch *argv[]) + + // get SMP thread count // 23.3 + +- NSMP = 0; // assume at least 4 threads ++ NSMP = get_nprocs(); ++#if 0 + fid = popen("lscpu | grep 'CPU(s):'","r"); + if (fid) { + pp = fgets(buff,200,fid); // get CPU threads supported + pclose(fid); + if (pp && strmatchN(pp,"CPU(s):",7)) NSMP = atoi(pp+8); // default: 2 per P-core + 1 per E-core + } ++#endif + if (NSMP < 1) { // 23.80 + Plog(1,"cannot get SMP thread count, assume 4 \n"); + NSMP = 4; diff --git a/graphics/fotocx/files/patch-zfuncs.cc b/graphics/fotocx/files/patch-zfuncs.cc new file mode 100644 index 000000000000..8af1fb535815 --- /dev/null +++ b/graphics/fotocx/files/patch-zfuncs.cc @@ -0,0 +1,180 @@ +--- zfuncs.cc.orig 2023-12-02 22:45:44 UTC ++++ zfuncs.cc +@@ -565,6 +565,7 @@ int zmalloc_test(int64 cc) + + double realmemory() + { ++#if defined(__linux__) + FILE *fid; + ch buff[100], *pp; + double rmem = 0; +@@ -583,15 +584,45 @@ double realmemory() + } + + fclose(fid); ++#elif defined(__FreeBSD__) ++ long rmem; ++ rmem = sysconf(_SC_PAGESIZE) / 1024 * sysconf(_SC_PHYS_PAGES) / 1024; ++#endif + return rmem; + } + ++#ifdef __FreeBSD__ ++static int ++freeswap() // return total free swap space in megabytes ++{ ++ struct xswdev xsw; ++ size_t mibsize, size; ++ int mib[16], n, total; + ++ mibsize = sizeof mib / sizeof mib[0]; ++ if (sysctlnametomib("vm.swap_info", mib, &mibsize) == -1) { ++ perror("sysctlnametomib()"); ++ return -1; ++ } ++ ++ int pagesize = getpagesize() / 1024; ++ for (total = n = 0; ; ++n) { ++ mib[mibsize] = n; ++ size = sizeof xsw; ++ if (sysctl(mib, mibsize + 1, &xsw, &size, NULL, 0) == -1) ++ break; ++ total += pagesize * (xsw.xsw_nblks - xsw.xsw_used) / 1024; ++ } ++ return total; ++} ++#endif ++ + // get available memory in MB units (includes swap space) + // typical < 0.1 milliseconds + + double availmemory() + { ++#if defined(__linux__) + FILE *fid; + ch buff[100], *pp; + double avmem = 0; +@@ -616,6 +647,11 @@ double availmemory() + } + + fclose(fid); ++#elif defined(__FreeBSD__) ++ double avmem; ++ avmem = realmemory(); ++ avmem += freeswap(); ++#endif + return avmem; + } + +@@ -755,7 +791,7 @@ void zappcrash(ch *format, ... ) + + uname(&unbuff); // get cpu arch. 32/64 bit + arch = unbuff.machine; +- fid1 = popen("lsb_release -d","r"); // get Linux flavor and release ++ fid1 = popen("uname -nv","r"); + if (fid1) { + ii = fscanf(fid1,"%s %s %s",OS1,OS2,OS3); + pclose(fid1); +@@ -1060,7 +1096,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; +@@ -1109,7 +1145,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; + } + +@@ -1117,7 +1153,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; +@@ -1812,6 +1848,10 @@ int wait_Jthread(pthread_t tid) + return 0; + } + ++int get_nprocs() ++{ ++ return sysconf(_SC_NPROCESSORS_ONLN); ++} + + /********************************************************************************/ + +@@ -1862,7 +1902,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; +@@ -1873,7 +1913,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; + } +@@ -2274,7 +2315,7 @@ uint diskspace(ch *file) + FILE *fid; + + 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"); +@@ -4135,14 +4176,18 @@ ch * SearchWildCase(ch *wpath, int &uflag) + flist and flist[*] are subjects for zfree(). + + zfind() works for files containing quotes (") +- dotfiles (/. and /..) are not included ++ dotfiles (/. and /..) are not included, if possible + + *********************************************************************************/ + + int zfind(ch *pattern, ch **&flist, int &NF) + { + ch **zfind_filelist = 0; // list of filespecs returned ++#ifdef GLOB_PERIOD + int globflags = GLOB_PERIOD; // include dotfiles ++#else ++ int globflags = 0;; ++#endif + int ii, jj, err, cc; + glob_t globdata; + ch *pp; +@@ -6109,9 +6154,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 + + progexe = 0; ++#if defined(__linux__) + cc = readlink("/proc/self/exe",buff,300); // get my executable program path + if (cc <= 0) zexit(1,"readlink() /proc/self/exe) failed"); + buff[cc] = 0; // readlink() quirk ++#elif defined(__FreeBSD__) ++ const int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; ++ size_t len = sizeof(buff); ++ cc = sysctl(mib, 4, buff, &len, 0x0, 0); ++ if (cc == -1) zexit(1,"sysctl(KERN_PROC_PATHNAME) failed"); ++#endif + progexe = zstrdup(buff,"zinitapp"); + + Plog(1,"program exe: %s \n",progexe); // executable path diff --git a/graphics/fotocx/files/patch-zfuncs.h b/graphics/fotocx/files/patch-zfuncs.h new file mode 100644 index 000000000000..e020ff283690 --- /dev/null +++ b/graphics/fotocx/files/patch-zfuncs.h @@ -0,0 +1,31 @@ +--- zfuncs.h.orig 2021-10-17 20:02:26 UTC ++++ zfuncs.h +@@ -17,14 +17,17 @@ + + *********************************************************************************/ + +-#include ++#include ++#include ++#include + #include + #include + #include + #include + #include + #include +-#include ++#include ++#include + #include + #include + #include +@@ -130,6 +133,8 @@ 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 diff --git a/graphics/fotocx/pkg-descr b/graphics/fotocx/pkg-descr new file mode 100644 index 000000000000..e86d1a4715e9 --- /dev/null +++ b/graphics/fotocx/pkg-descr @@ -0,0 +1,3 @@ +Fotoxx is a free, open-source program for photo editing and +collection management. The goal is to meet most user needs +while remaining fast and easy to use. diff --git a/graphics/fotocx/pkg-plist b/graphics/fotocx/pkg-plist new file mode 100644 index 000000000000..d53ba1556704 --- /dev/null +++ b/graphics/fotocx/pkg-plist @@ -0,0 +1,374 @@ +bin/fotocx +share/applications/fotocx.desktop +%%DATADIR%%/data/KB_shortcuts_E +%%DATADIR%%/data/README +%%DATADIR%%/data/colorwheel.jpg +%%DATADIR%%/data/custom_kernel/blur5 +%%DATADIR%%/data/custom_kernel/brighten3 +%%DATADIR%%/data/custom_kernel/color lines 3 +%%DATADIR%%/data/custom_kernel/color lines 5 +%%DATADIR%%/data/custom_kernel/colors3 +%%DATADIR%%/data/custom_kernel/darken3 +%%DATADIR%%/data/custom_kernel/denoise3 +%%DATADIR%%/data/custom_kernel/emboss3 +%%DATADIR%%/data/custom_kernel/emboss3-B&W +%%DATADIR%%/data/custom_kernel/emboss5 +%%DATADIR%%/data/custom_kernel/emboss5+color +%%DATADIR%%/data/custom_kernel/last-used +%%DATADIR%%/data/custom_kernel/outlines3 +%%DATADIR%%/data/custom_kernel/outlines5 +%%DATADIR%%/data/custom_kernel/shake3 +%%DATADIR%%/data/custom_kernel/sharpen3 +%%DATADIR%%/data/custom_kernel/sharpen5 +%%DATADIR%%/data/custom_kernel/sketch3 +%%DATADIR%%/data/custom_menu +%%DATADIR%%/data/custom_scripts/brightness and white point +%%DATADIR%%/data/custom_scripts/cartoon-emboss +%%DATADIR%%/data/custom_scripts/denoise-sharpen +%%DATADIR%%/data/custom_scripts/emboss-test +%%DATADIR%%/data/custom_scripts/line-drawing-emboss +%%DATADIR%%/data/custom_scripts/painting-texture +%%DATADIR%%/data/custom_scripts/sketch-cartoon-emboss +%%DATADIR%%/data/meta_picklist_E +%%DATADIR%%/data/netmap_locations +%%DATADIR%%/data/palettes/Golden Heavy Body Acrylics.gpl +%%DATADIR%%/data/palettes/Liquitex Heavy Body Artist colors.gpl +%%DATADIR%%/data/palettes/Rembrandt Extra Fine.gpl +%%DATADIR%%/data/patterns/aqua.jpg +%%DATADIR%%/data/patterns/bathroom.jpg +%%DATADIR%%/data/patterns/blocks.jpg +%%DATADIR%%/data/patterns/brick_wall.jpg +%%DATADIR%%/data/patterns/bulging.jpg +%%DATADIR%%/data/patterns/burlap.jpg +%%DATADIR%%/data/patterns/canvas2.jpg +%%DATADIR%%/data/patterns/canvas_blue.jpg +%%DATADIR%%/data/patterns/cheese.jpg +%%DATADIR%%/data/patterns/confetti.jpg +%%DATADIR%%/data/patterns/fluffy.jpg +%%DATADIR%%/data/patterns/fuzzy-blue.jpg +%%DATADIR%%/data/patterns/fuzzy-darkgrey.jpg +%%DATADIR%%/data/patterns/geometry2.jpg +%%DATADIR%%/data/patterns/geometry3.jpg +%%DATADIR%%/data/patterns/gregre.jpg +%%DATADIR%%/data/patterns/grypaws.jpg +%%DATADIR%%/data/patterns/imitation_leather.jpg +%%DATADIR%%/data/patterns/lawn-artificial.jpg +%%DATADIR%%/data/patterns/lawn.jpg +%%DATADIR%%/data/patterns/lightblue-wet.jpg +%%DATADIR%%/data/patterns/linen-fine.jpg +%%DATADIR%%/data/patterns/liquid-blue.jpg +%%DATADIR%%/data/patterns/marble.jpg +%%DATADIR%%/data/patterns/mazes.jpg +%%DATADIR%%/data/patterns/notes.jpg +%%DATADIR%%/data/patterns/pattern.jpg +%%DATADIR%%/data/patterns/pattern_114.jpg +%%DATADIR%%/data/patterns/pattern_117.jpg +%%DATADIR%%/data/patterns/pattern_131.jpg +%%DATADIR%%/data/patterns/pebble-light.jpg +%%DATADIR%%/data/patterns/pool.jpg +%%DATADIR%%/data/patterns/purple.jpg +%%DATADIR%%/data/patterns/rings-green.jpg +%%DATADIR%%/data/patterns/sand.jpg +%%DATADIR%%/data/patterns/soft-structure_grey.jpg +%%DATADIR%%/data/patterns/space.jpg +%%DATADIR%%/data/patterns/stone.jpg +%%DATADIR%%/data/patterns/structure_darkgreen.jpg +%%DATADIR%%/data/patterns/wall-grey.jpg +%%DATADIR%%/data/patterns/wet-turquoise.jpg +%%DATADIR%%/data/patterns/wood.jpg +%%DATADIR%%/data/plugins +%%DATADIR%%/data/raw_loader_commands +%%DATADIR%%/data/slideshow-tone.oga +%%DATADIR%%/data/tags_defined +%%DATADIR%%/data/userguide +%%DATADIR%%/data/widgets.css +%%DATADIR%%/data/worldcities.txt +%%DATADIR%%/icons/fotocx.png +%%DATADIR%%/images/HDF-paint.png +%%DATADIR%%/images/HDF.png +%%DATADIR%%/images/HDR-adjust.png +%%DATADIR%%/images/HDR.jpg +%%DATADIR%%/images/KB-shortcuts.png +%%DATADIR%%/images/KB-shortcuts2.png +%%DATADIR%%/images/RGB-dist.png +%%DATADIR%%/images/add-meta-items.png +%%DATADIR%%/images/add-motionblur1.jpg +%%DATADIR%%/images/add-motionblur2.png +%%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/alien-colors1.png +%%DATADIR%%/images/alien-colors2.png +%%DATADIR%%/images/anti-alias.png +%%DATADIR%%/images/area-blend.png +%%DATADIR%%/images/area-blend2.jpg +%%DATADIR%%/images/area-rescale.png +%%DATADIR%%/images/area-rescale2.png +%%DATADIR%%/images/batch-change-meta.png +%%DATADIR%%/images/batch-convert.png +%%DATADIR%%/images/batch-copy-move.png +%%DATADIR%%/images/batch-delete-trash.png +%%DATADIR%%/images/batch-geotags.png +%%DATADIR%%/images/batch-move-meta.png +%%DATADIR%%/images/batch-overlay.png +%%DATADIR%%/images/batch-photo-date1.png +%%DATADIR%%/images/batch-photo-date2.png +%%DATADIR%%/images/batch-raw.png +%%DATADIR%%/images/batch-rename-tags.png +%%DATADIR%%/images/batch-report-meta.png +%%DATADIR%%/images/batch-tags.png +%%DATADIR%%/images/batch-upright.png +%%DATADIR%%/images/batch.png +%%DATADIR%%/images/blackball.png +%%DATADIR%%/images/blank-image.png +%%DATADIR%%/images/blobs.png +%%DATADIR%%/images/blobs2.jpg +%%DATADIR%%/images/blueball.png +%%DATADIR%%/images/blur.jpg +%%DATADIR%%/images/bookmarks.png +%%DATADIR%%/images/brightness-steps.png +%%DATADIR%%/images/brite-ramp1.png +%%DATADIR%%/images/brite-ramp2.png +%%DATADIR%%/images/broken.png +%%DATADIR%%/images/calibrate-printer.png +%%DATADIR%%/images/cartoon.png +%%DATADIR%%/images/cartoon2.jpg +%%DATADIR%%/images/change-alpha.png +%%DATADIR%%/images/choose-captions.png +%%DATADIR%%/images/chromatic.png +%%DATADIR%%/images/chromaticA.png +%%DATADIR%%/images/color-depth1.png +%%DATADIR%%/images/color-depth2.png +%%DATADIR%%/images/color-mode.png +%%DATADIR%%/images/color-mode2.png +%%DATADIR%%/images/color-negative.jpg +%%DATADIR%%/images/combine.png +%%DATADIR%%/images/copy-from-image.png +%%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/custom-kernel.png +%%DATADIR%%/images/custom-widgets.png +%%DATADIR%%/images/custom.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-text.jpg +%%DATADIR%%/images/drawing.png +%%DATADIR%%/images/edit-any-metadata.png +%%DATADIR%%/images/edit-bookmarks.png +%%DATADIR%%/images/edit-dist.png +%%DATADIR%%/images/edit-metadata.png +%%DATADIR%%/images/edit.png +%%DATADIR%%/images/effects.png +%%DATADIR%%/images/emboss.png +%%DATADIR%%/images/emboss2.jpg +%%DATADIR%%/images/engrave.png +%%DATADIR%%/images/engrave2.png +%%DATADIR%%/images/escher-spiral.png +%%DATADIR%%/images/escher-spiralA.png +%%DATADIR%%/images/export-file-list.png +%%DATADIR%%/images/export-files.png +%%DATADIR%%/images/file-save-as.png +%%DATADIR%%/images/file-save.png +%%DATADIR%%/images/file.png +%%DATADIR%%/images/find-dups.png +%%DATADIR%%/images/first-index.png +%%DATADIR%%/images/fix-motion-blur.png +%%DATADIR%%/images/fix-motion-blur1.jpg +%%DATADIR%%/images/flatten-photo1.png +%%DATADIR%%/images/flatten-photo2.png +%%DATADIR%%/images/flatten1.png +%%DATADIR%%/images/flatten2.png +%%DATADIR%%/images/folder-tree.png +%%DATADIR%%/images/folder.png +%%DATADIR%%/images/fotocx-views.jpg +%%DATADIR%%/images/fotocx.png +%%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/gradients.png +%%DATADIR%%/images/gradients2.jpg +%%DATADIR%%/images/greenball.png +%%DATADIR%%/images/grid-lines.png +%%DATADIR%%/images/help.png +%%DATADIR%%/images/image-array.jpg +%%DATADIR%%/images/image-diffs.png +%%DATADIR%%/images/image-locations.jpg +%%DATADIR%%/images/image-management.png +%%DATADIR%%/images/index-files1.png +%%DATADIR%%/images/index-files2.png +%%DATADIR%%/images/inside-out1.png +%%DATADIR%%/images/inside-out2.png +%%DATADIR%%/images/interpolation.png +%%DATADIR%%/images/jpeg-artifacts.png +%%DATADIR%%/images/jpeg-artifacts1.png +%%DATADIR%%/images/jpeg-quality.png +%%DATADIR%%/images/local-retx.png +%%DATADIR%%/images/local-retx2.png +%%DATADIR%%/images/localcon.png +%%DATADIR%%/images/localcon2.png +%%DATADIR%%/images/localcon3.jpg +%%DATADIR%%/images/magnify-image.jpg +%%DATADIR%%/images/make-waves1.png +%%DATADIR%%/images/make-waves2.jpg +%%DATADIR%%/images/manage-albums.png +%%DATADIR%%/images/manage-tags.png +%%DATADIR%%/images/map-click.jpg +%%DATADIR%%/images/maps.png +%%DATADIR%%/images/margins.png +%%DATADIR%%/images/markup.jpg +%%DATADIR%%/images/mashup.jpg +%%DATADIR%%/images/mashup1.png +%%DATADIR%%/images/mashup2.png +%%DATADIR%%/images/mashup3.png +%%DATADIR%%/images/mashup4.png +%%DATADIR%%/images/mashup5.png +%%DATADIR%%/images/mashup6.png +%%DATADIR%%/images/mashup7.png +%%DATADIR%%/images/match-colors.png +%%DATADIR%%/images/measure-image.png +%%DATADIR%%/images/menu-summary.jpg +%%DATADIR%%/images/meta-view.jpg +%%DATADIR%%/images/metadata.png +%%DATADIR%%/images/moncolor-small.png +%%DATADIR%%/images/moncolor.png +%%DATADIR%%/images/mosaic1.png +%%DATADIR%%/images/mosaic2.jpg +%%DATADIR%%/images/netmap-locs.png +%%DATADIR%%/images/nonlinear slider.png +%%DATADIR%%/images/number-keys.png +%%DATADIR%%/images/outboard-programs.png +%%DATADIR%%/images/paint-edits.png +%%DATADIR%%/images/paint-image.jpg +%%DATADIR%%/images/paint-transp.png +%%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-align2.jpg +%%DATADIR%%/images/pattern1.png +%%DATADIR%%/images/pattern2.jpg +%%DATADIR%%/images/permissions.png +%%DATADIR%%/images/perspective1.png +%%DATADIR%%/images/perspective2.png +%%DATADIR%%/images/plugins-edit.png +%%DATADIR%%/images/plugins.png +%%DATADIR%%/images/prev-next.png +%%DATADIR%%/images/print-margins.png +%%DATADIR%%/images/print-setup.png +%%DATADIR%%/images/printer-cal-study.png +%%DATADIR%%/images/printer-calibrate-chart.png +%%DATADIR%%/images/printer-calibrate.png +%%DATADIR%%/images/quit.png +%%DATADIR%%/images/red-eyes1.png +%%DATADIR%%/images/red-eyes2.png +%%DATADIR%%/images/redball.png +%%DATADIR%%/images/refine.png +%%DATADIR%%/images/remove-dust.png +%%DATADIR%%/images/remove-dust2.png +%%DATADIR%%/images/remove-halo.png +%%DATADIR%%/images/remove-halo2.png +%%DATADIR%%/images/rename-folder.png +%%DATADIR%%/images/rename.png +%%DATADIR%%/images/repair.png +%%DATADIR%%/images/rescale.png +%%DATADIR%%/images/retouch.png +%%DATADIR%%/images/rotate-left.png +%%DATADIR%%/images/rotate-right.png +%%DATADIR%%/images/rotate.png +%%DATADIR%%/images/saturation.png +%%DATADIR%%/images/save.png +%%DATADIR%%/images/search-images-metadata.jpg +%%DATADIR%%/images/search-images.jpg +%%DATADIR%%/images/select-area-finish.png +%%DATADIR%%/images/select-area.jpg +%%DATADIR%%/images/select-image-files.jpg +%%DATADIR%%/images/select.png +%%DATADIR%%/images/settings.jpg +%%DATADIR%%/images/sharpen.png +%%DATADIR%%/images/shift-colors.png +%%DATADIR%%/images/show-RGB.png +%%DATADIR%%/images/sketch.jpg +%%DATADIR%%/images/slide-show.jpg +%%DATADIR%%/images/smart-erase.png +%%DATADIR%%/images/smart-erase2.png +%%DATADIR%%/images/soft-focus.png +%%DATADIR%%/images/soft-focus2.png +%%DATADIR%%/images/sphere.png +%%DATADIR%%/images/sphere2.jpg +%%DATADIR%%/images/stack-noise.png +%%DATADIR%%/images/stack-noise2.png +%%DATADIR%%/images/stack-paint.png +%%DATADIR%%/images/stack-paint2.jpg +%%DATADIR%%/images/stack-split.png +%%DATADIR%%/images/stack-split2.png +%%DATADIR%%/images/stack-versions.png +%%DATADIR%%/images/texture.png +%%DATADIR%%/images/texture2.png +%%DATADIR%%/images/tiles2a.png +%%DATADIR%%/images/tiles2b.png +%%DATADIR%%/images/timeline-report.jpg +%%DATADIR%%/images/tiny-planet.jpg +%%DATADIR%%/images/tools.png +%%DATADIR%%/images/top-panel.png +%%DATADIR%%/images/twist1.png +%%DATADIR%%/images/twist2.png +%%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-gallery.png +%%DATADIR%%/images/ug-help.png +%%DATADIR%%/images/ug-maps.png +%%DATADIR%%/images/ug-metadata.png +%%DATADIR%%/images/ug-refine.png +%%DATADIR%%/images/ug-repair.png +%%DATADIR%%/images/ug-select.png +%%DATADIR%%/images/ug-tools.png +%%DATADIR%%/images/ug-undo-redo.png +%%DATADIR%%/images/ug-warp.png +%%DATADIR%%/images/ug-zoom.png +%%DATADIR%%/images/unbend horz curved.png +%%DATADIR%%/images/unbend horz linear.png +%%DATADIR%%/images/unbend vert curved.png +%%DATADIR%%/images/unbend vert linear.png +%%DATADIR%%/images/unbend1.png +%%DATADIR%%/images/unbend2.png +%%DATADIR%%/images/undo-redo.png +%%DATADIR%%/images/unwarp-closeup1.png +%%DATADIR%%/images/unwarp-closeup2.png +%%DATADIR%%/images/upscale+sharpen.jpg +%%DATADIR%%/images/userguide.jpg +%%DATADIR%%/images/view-metadata.jpg +%%DATADIR%%/images/vignette.png +%%DATADIR%%/images/vignette2.png +%%DATADIR%%/images/vignette3.png +%%DATADIR%%/images/warning.png +%%DATADIR%%/images/warp.png +%%DATADIR%%/images/warp_radial.png +%%DATADIR%%/images/warps4.jpg +%%DATADIR%%/images/whiteball.png +%%DATADIR%%/images/zoom.png +share/man/man1/fotocx.1.gz +share/metainfo/kornelix.fotocx.metainfo.xml diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile deleted file mode 100644 index 3011d84bfc05..000000000000 --- a/graphics/fotoxx/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PORTNAME= fotocx -PORTVERSION= 24.11 -CATEGORIES= graphics -MASTER_SITES= https://kornelix.net/downloads/downloads/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-source - -MAINTAINER= danfe@FreeBSD.org -COMMENT= Image editing and collection management program -WWW= https://kornelix.net/fotocx/fotocx.html - -LICENSE= GPLv3+ - -LIB_DEPENDS= libchamplain-gtk-0.12.so:graphics/libchamplain \ - libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ - liblcms2.so:graphics/lcms2 \ - libpng.so:graphics/png \ - libtiff.so:graphics/tiff -RUN_DEPENDS= xdg-open:devel/xdg-utils \ - exiftool:graphics/p5-Image-ExifTool \ - ufraw-batch:graphics/ufraw - -USES= desktop-file-utils gmake gnome jpeg pkgconfig -USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 -ALL_TARGET= ${PORTNAME} -CXXFLAGS+= -Wno-register -Wno-writable-strings - -WRKSRC= ${WRKDIR}/${PORTNAME} - -PORTDOCS= * - -OPTIONS_DEFINE= DOCS - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - -.include diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo deleted file mode 100644 index 053a90dab99c..000000000000 --- a/graphics/fotoxx/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1707302474 -SHA256 (fotocx-24.11-source.tar.gz) = bc3e12a7ae2deb80ff41b14d392f15010eed93eb383dd184d605967c47a78b95 -SIZE (fotocx-24.11-source.tar.gz) = 16322678 diff --git a/graphics/fotoxx/files/patch-Makefile b/graphics/fotoxx/files/patch-Makefile deleted file mode 100644 index 13f9425477bc..000000000000 --- a/graphics/fotoxx/files/patch-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.orig 2023-11-01 13:01:41 UTC -+++ Makefile -@@ -1,6 +1,7 @@ - # fotoxx 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 - -Wno-format-truncation -Wno-stringop-truncation - endif - endif -+endif - - 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` - - LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \ -- -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg \ -+ -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg -lexecinfo \ - -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/fotoxx/files/patch-f.file.cc b/graphics/fotoxx/files/patch-f.file.cc deleted file mode 100644 index fe32d1f6e592..000000000000 --- a/graphics/fotoxx/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/fotoxx/files/patch-f.refine.cc b/graphics/fotoxx/files/patch-f.refine.cc deleted file mode 100644 index 6769e3308abc..000000000000 --- a/graphics/fotoxx/files/patch-f.refine.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- f.refine.cc.orig 2023-03-01 07:32:06 UTC -+++ f.refine.cc -@@ -223,7 +223,7 @@ void m_edit_dist(GtkWidget *, ch *menu) - EFedit_dist.Farea = 2; // select area usable - EFedit_dist.Frestart = 1; // restart allowed - EFedit_dist.Fscript = 1; // scripting supported -- EFedit_dist.threadfunc = thread; -+ EFedit_dist.threadfunc = edit_dist_names::thread; - if (! edit_setup(EFedit_dist)) return; // setup edit - - /*** -@@ -589,7 +589,7 @@ void m_flatdist(GtkWidget *, ch *menu) - EFflatdist.Frestart = 1; // restartable - EFflatdist.Fpaintedits = 1; // use with paint edits OK - EFflatdist.Fscript = 1; // scripting supported -- EFflatdist.threadfunc = thread; -+ EFflatdist.threadfunc = flatdist_names::thread; - if (! edit_setup(EFflatdist)) return; // setup edit - - Eww = E0pxm->ww; -@@ -1067,7 +1067,7 @@ void flatdist_func(int _radius, int _flatten, int _deb - EFflatdist.menufunc = m_flatdist; - EFflatdist.Farea = 2; // select area usable - EFflatdist.Fscript = 1; // scripting supported 23.4 -- EFflatdist.threadfunc = thread; -+ EFflatdist.threadfunc = flatdist_names::thread; - - if (! edit_setup(EFflatdist)) return; // setup edit - diff --git a/graphics/fotoxx/files/patch-fotoxx.cc b/graphics/fotoxx/files/patch-fotoxx.cc deleted file mode 100644 index dbacbec2de34..000000000000 --- a/graphics/fotoxx/files/patch-fotoxx.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- fotocx.cc.orig 2024-02-07 10:14:27 UTC -+++ fotocx.cc -@@ -317,7 +317,7 @@ int main(int argc, ch *argv[]) - // delete fotocx temp files if owner process is no longer running - - pidlist = 0; -- snprintf(buff,200,"pidof fotocx fotocx.x"); // get active fotocx PIDs 23.3 -+ snprintf(buff,200,"pgrep -d\\ fotocx fotocx.x"); - fid = popen(buff,"r"); - if (fid) { - pp = fgets_trim(buff,200,fid); -@@ -455,13 +455,15 @@ int main(int argc, ch *argv[]) - - // get SMP thread count // 23.3 - -- NSMP = 0; // assume at least 4 threads -+ NSMP = get_nprocs(); -+#if 0 - fid = popen("lscpu | grep 'CPU(s):'","r"); - if (fid) { - pp = fgets(buff,200,fid); // get CPU threads supported - pclose(fid); - if (pp && strmatchN(pp,"CPU(s):",7)) NSMP = atoi(pp+8); // default: 2 per P-core + 1 per E-core - } -+#endif - if (NSMP < 1) { // 23.80 - Plog(1,"cannot get SMP thread count, assume 4 \n"); - NSMP = 4; diff --git a/graphics/fotoxx/files/patch-zfuncs.cc b/graphics/fotoxx/files/patch-zfuncs.cc deleted file mode 100644 index 8af1fb535815..000000000000 --- a/graphics/fotoxx/files/patch-zfuncs.cc +++ /dev/null @@ -1,180 +0,0 @@ ---- zfuncs.cc.orig 2023-12-02 22:45:44 UTC -+++ zfuncs.cc -@@ -565,6 +565,7 @@ int zmalloc_test(int64 cc) - - double realmemory() - { -+#if defined(__linux__) - FILE *fid; - ch buff[100], *pp; - double rmem = 0; -@@ -583,15 +584,45 @@ double realmemory() - } - - fclose(fid); -+#elif defined(__FreeBSD__) -+ long rmem; -+ rmem = sysconf(_SC_PAGESIZE) / 1024 * sysconf(_SC_PHYS_PAGES) / 1024; -+#endif - return rmem; - } - -+#ifdef __FreeBSD__ -+static int -+freeswap() // return total free swap space in megabytes -+{ -+ struct xswdev xsw; -+ size_t mibsize, size; -+ int mib[16], n, total; - -+ mibsize = sizeof mib / sizeof mib[0]; -+ if (sysctlnametomib("vm.swap_info", mib, &mibsize) == -1) { -+ perror("sysctlnametomib()"); -+ return -1; -+ } -+ -+ int pagesize = getpagesize() / 1024; -+ for (total = n = 0; ; ++n) { -+ mib[mibsize] = n; -+ size = sizeof xsw; -+ if (sysctl(mib, mibsize + 1, &xsw, &size, NULL, 0) == -1) -+ break; -+ total += pagesize * (xsw.xsw_nblks - xsw.xsw_used) / 1024; -+ } -+ return total; -+} -+#endif -+ - // get available memory in MB units (includes swap space) - // typical < 0.1 milliseconds - - double availmemory() - { -+#if defined(__linux__) - FILE *fid; - ch buff[100], *pp; - double avmem = 0; -@@ -616,6 +647,11 @@ double availmemory() - } - - fclose(fid); -+#elif defined(__FreeBSD__) -+ double avmem; -+ avmem = realmemory(); -+ avmem += freeswap(); -+#endif - return avmem; - } - -@@ -755,7 +791,7 @@ void zappcrash(ch *format, ... ) - - uname(&unbuff); // get cpu arch. 32/64 bit - arch = unbuff.machine; -- fid1 = popen("lsb_release -d","r"); // get Linux flavor and release -+ fid1 = popen("uname -nv","r"); - if (fid1) { - ii = fscanf(fid1,"%s %s %s",OS1,OS2,OS3); - pclose(fid1); -@@ -1060,7 +1096,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; -@@ -1109,7 +1145,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; - } - -@@ -1117,7 +1153,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; -@@ -1812,6 +1848,10 @@ int wait_Jthread(pthread_t tid) - return 0; - } - -+int get_nprocs() -+{ -+ return sysconf(_SC_NPROCESSORS_ONLN); -+} - - /********************************************************************************/ - -@@ -1862,7 +1902,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; -@@ -1873,7 +1913,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; - } -@@ -2274,7 +2315,7 @@ uint diskspace(ch *file) - FILE *fid; - - 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"); -@@ -4135,14 +4176,18 @@ ch * SearchWildCase(ch *wpath, int &uflag) - flist and flist[*] are subjects for zfree(). - - zfind() works for files containing quotes (") -- dotfiles (/. and /..) are not included -+ dotfiles (/. and /..) are not included, if possible - - *********************************************************************************/ - - int zfind(ch *pattern, ch **&flist, int &NF) - { - ch **zfind_filelist = 0; // list of filespecs returned -+#ifdef GLOB_PERIOD - int globflags = GLOB_PERIOD; // include dotfiles -+#else -+ int globflags = 0;; -+#endif - int ii, jj, err, cc; - glob_t globdata; - ch *pp; -@@ -6109,9 +6154,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 - - progexe = 0; -+#if defined(__linux__) - cc = readlink("/proc/self/exe",buff,300); // get my executable program path - if (cc <= 0) zexit(1,"readlink() /proc/self/exe) failed"); - buff[cc] = 0; // readlink() quirk -+#elif defined(__FreeBSD__) -+ const int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t len = sizeof(buff); -+ cc = sysctl(mib, 4, buff, &len, 0x0, 0); -+ if (cc == -1) zexit(1,"sysctl(KERN_PROC_PATHNAME) failed"); -+#endif - progexe = zstrdup(buff,"zinitapp"); - - Plog(1,"program exe: %s \n",progexe); // executable path diff --git a/graphics/fotoxx/files/patch-zfuncs.h b/graphics/fotoxx/files/patch-zfuncs.h deleted file mode 100644 index e020ff283690..000000000000 --- a/graphics/fotoxx/files/patch-zfuncs.h +++ /dev/null @@ -1,31 +0,0 @@ ---- zfuncs.h.orig 2021-10-17 20:02:26 UTC -+++ zfuncs.h -@@ -17,14 +17,17 @@ - - *********************************************************************************/ - --#include -+#include -+#include -+#include - #include - #include - #include - #include - #include - #include --#include -+#include -+#include - #include - #include - #include -@@ -130,6 +133,8 @@ 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 diff --git a/graphics/fotoxx/pkg-descr b/graphics/fotoxx/pkg-descr deleted file mode 100644 index e86d1a4715e9..000000000000 --- a/graphics/fotoxx/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Fotoxx is a free, open-source program for photo editing and -collection management. The goal is to meet most user needs -while remaining fast and easy to use. diff --git a/graphics/fotoxx/pkg-plist b/graphics/fotoxx/pkg-plist deleted file mode 100644 index d53ba1556704..000000000000 --- a/graphics/fotoxx/pkg-plist +++ /dev/null @@ -1,374 +0,0 @@ -bin/fotocx -share/applications/fotocx.desktop -%%DATADIR%%/data/KB_shortcuts_E -%%DATADIR%%/data/README -%%DATADIR%%/data/colorwheel.jpg -%%DATADIR%%/data/custom_kernel/blur5 -%%DATADIR%%/data/custom_kernel/brighten3 -%%DATADIR%%/data/custom_kernel/color lines 3 -%%DATADIR%%/data/custom_kernel/color lines 5 -%%DATADIR%%/data/custom_kernel/colors3 -%%DATADIR%%/data/custom_kernel/darken3 -%%DATADIR%%/data/custom_kernel/denoise3 -%%DATADIR%%/data/custom_kernel/emboss3 -%%DATADIR%%/data/custom_kernel/emboss3-B&W -%%DATADIR%%/data/custom_kernel/emboss5 -%%DATADIR%%/data/custom_kernel/emboss5+color -%%DATADIR%%/data/custom_kernel/last-used -%%DATADIR%%/data/custom_kernel/outlines3 -%%DATADIR%%/data/custom_kernel/outlines5 -%%DATADIR%%/data/custom_kernel/shake3 -%%DATADIR%%/data/custom_kernel/sharpen3 -%%DATADIR%%/data/custom_kernel/sharpen5 -%%DATADIR%%/data/custom_kernel/sketch3 -%%DATADIR%%/data/custom_menu -%%DATADIR%%/data/custom_scripts/brightness and white point -%%DATADIR%%/data/custom_scripts/cartoon-emboss -%%DATADIR%%/data/custom_scripts/denoise-sharpen -%%DATADIR%%/data/custom_scripts/emboss-test -%%DATADIR%%/data/custom_scripts/line-drawing-emboss -%%DATADIR%%/data/custom_scripts/painting-texture -%%DATADIR%%/data/custom_scripts/sketch-cartoon-emboss -%%DATADIR%%/data/meta_picklist_E -%%DATADIR%%/data/netmap_locations -%%DATADIR%%/data/palettes/Golden Heavy Body Acrylics.gpl -%%DATADIR%%/data/palettes/Liquitex Heavy Body Artist colors.gpl -%%DATADIR%%/data/palettes/Rembrandt Extra Fine.gpl -%%DATADIR%%/data/patterns/aqua.jpg -%%DATADIR%%/data/patterns/bathroom.jpg -%%DATADIR%%/data/patterns/blocks.jpg -%%DATADIR%%/data/patterns/brick_wall.jpg -%%DATADIR%%/data/patterns/bulging.jpg -%%DATADIR%%/data/patterns/burlap.jpg -%%DATADIR%%/data/patterns/canvas2.jpg -%%DATADIR%%/data/patterns/canvas_blue.jpg -%%DATADIR%%/data/patterns/cheese.jpg -%%DATADIR%%/data/patterns/confetti.jpg -%%DATADIR%%/data/patterns/fluffy.jpg -%%DATADIR%%/data/patterns/fuzzy-blue.jpg -%%DATADIR%%/data/patterns/fuzzy-darkgrey.jpg -%%DATADIR%%/data/patterns/geometry2.jpg -%%DATADIR%%/data/patterns/geometry3.jpg -%%DATADIR%%/data/patterns/gregre.jpg -%%DATADIR%%/data/patterns/grypaws.jpg -%%DATADIR%%/data/patterns/imitation_leather.jpg -%%DATADIR%%/data/patterns/lawn-artificial.jpg -%%DATADIR%%/data/patterns/lawn.jpg -%%DATADIR%%/data/patterns/lightblue-wet.jpg -%%DATADIR%%/data/patterns/linen-fine.jpg -%%DATADIR%%/data/patterns/liquid-blue.jpg -%%DATADIR%%/data/patterns/marble.jpg -%%DATADIR%%/data/patterns/mazes.jpg -%%DATADIR%%/data/patterns/notes.jpg -%%DATADIR%%/data/patterns/pattern.jpg -%%DATADIR%%/data/patterns/pattern_114.jpg -%%DATADIR%%/data/patterns/pattern_117.jpg -%%DATADIR%%/data/patterns/pattern_131.jpg -%%DATADIR%%/data/patterns/pebble-light.jpg -%%DATADIR%%/data/patterns/pool.jpg -%%DATADIR%%/data/patterns/purple.jpg -%%DATADIR%%/data/patterns/rings-green.jpg -%%DATADIR%%/data/patterns/sand.jpg -%%DATADIR%%/data/patterns/soft-structure_grey.jpg -%%DATADIR%%/data/patterns/space.jpg -%%DATADIR%%/data/patterns/stone.jpg -%%DATADIR%%/data/patterns/structure_darkgreen.jpg -%%DATADIR%%/data/patterns/wall-grey.jpg -%%DATADIR%%/data/patterns/wet-turquoise.jpg -%%DATADIR%%/data/patterns/wood.jpg -%%DATADIR%%/data/plugins -%%DATADIR%%/data/raw_loader_commands -%%DATADIR%%/data/slideshow-tone.oga -%%DATADIR%%/data/tags_defined -%%DATADIR%%/data/userguide -%%DATADIR%%/data/widgets.css -%%DATADIR%%/data/worldcities.txt -%%DATADIR%%/icons/fotocx.png -%%DATADIR%%/images/HDF-paint.png -%%DATADIR%%/images/HDF.png -%%DATADIR%%/images/HDR-adjust.png -%%DATADIR%%/images/HDR.jpg -%%DATADIR%%/images/KB-shortcuts.png -%%DATADIR%%/images/KB-shortcuts2.png -%%DATADIR%%/images/RGB-dist.png -%%DATADIR%%/images/add-meta-items.png -%%DATADIR%%/images/add-motionblur1.jpg -%%DATADIR%%/images/add-motionblur2.png -%%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/alien-colors1.png -%%DATADIR%%/images/alien-colors2.png -%%DATADIR%%/images/anti-alias.png -%%DATADIR%%/images/area-blend.png -%%DATADIR%%/images/area-blend2.jpg -%%DATADIR%%/images/area-rescale.png -%%DATADIR%%/images/area-rescale2.png -%%DATADIR%%/images/batch-change-meta.png -%%DATADIR%%/images/batch-convert.png -%%DATADIR%%/images/batch-copy-move.png -%%DATADIR%%/images/batch-delete-trash.png -%%DATADIR%%/images/batch-geotags.png -%%DATADIR%%/images/batch-move-meta.png -%%DATADIR%%/images/batch-overlay.png -%%DATADIR%%/images/batch-photo-date1.png -%%DATADIR%%/images/batch-photo-date2.png -%%DATADIR%%/images/batch-raw.png -%%DATADIR%%/images/batch-rename-tags.png -%%DATADIR%%/images/batch-report-meta.png -%%DATADIR%%/images/batch-tags.png -%%DATADIR%%/images/batch-upright.png -%%DATADIR%%/images/batch.png -%%DATADIR%%/images/blackball.png -%%DATADIR%%/images/blank-image.png -%%DATADIR%%/images/blobs.png -%%DATADIR%%/images/blobs2.jpg -%%DATADIR%%/images/blueball.png -%%DATADIR%%/images/blur.jpg -%%DATADIR%%/images/bookmarks.png -%%DATADIR%%/images/brightness-steps.png -%%DATADIR%%/images/brite-ramp1.png -%%DATADIR%%/images/brite-ramp2.png -%%DATADIR%%/images/broken.png -%%DATADIR%%/images/calibrate-printer.png -%%DATADIR%%/images/cartoon.png -%%DATADIR%%/images/cartoon2.jpg -%%DATADIR%%/images/change-alpha.png -%%DATADIR%%/images/choose-captions.png -%%DATADIR%%/images/chromatic.png -%%DATADIR%%/images/chromaticA.png -%%DATADIR%%/images/color-depth1.png -%%DATADIR%%/images/color-depth2.png -%%DATADIR%%/images/color-mode.png -%%DATADIR%%/images/color-mode2.png -%%DATADIR%%/images/color-negative.jpg -%%DATADIR%%/images/combine.png -%%DATADIR%%/images/copy-from-image.png -%%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/custom-kernel.png -%%DATADIR%%/images/custom-widgets.png -%%DATADIR%%/images/custom.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-text.jpg -%%DATADIR%%/images/drawing.png -%%DATADIR%%/images/edit-any-metadata.png -%%DATADIR%%/images/edit-bookmarks.png -%%DATADIR%%/images/edit-dist.png -%%DATADIR%%/images/edit-metadata.png -%%DATADIR%%/images/edit.png -%%DATADIR%%/images/effects.png -%%DATADIR%%/images/emboss.png -%%DATADIR%%/images/emboss2.jpg -%%DATADIR%%/images/engrave.png -%%DATADIR%%/images/engrave2.png -%%DATADIR%%/images/escher-spiral.png -%%DATADIR%%/images/escher-spiralA.png -%%DATADIR%%/images/export-file-list.png -%%DATADIR%%/images/export-files.png -%%DATADIR%%/images/file-save-as.png -%%DATADIR%%/images/file-save.png -%%DATADIR%%/images/file.png -%%DATADIR%%/images/find-dups.png -%%DATADIR%%/images/first-index.png -%%DATADIR%%/images/fix-motion-blur.png -%%DATADIR%%/images/fix-motion-blur1.jpg -%%DATADIR%%/images/flatten-photo1.png -%%DATADIR%%/images/flatten-photo2.png -%%DATADIR%%/images/flatten1.png -%%DATADIR%%/images/flatten2.png -%%DATADIR%%/images/folder-tree.png -%%DATADIR%%/images/folder.png -%%DATADIR%%/images/fotocx-views.jpg -%%DATADIR%%/images/fotocx.png -%%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/gradients.png -%%DATADIR%%/images/gradients2.jpg -%%DATADIR%%/images/greenball.png -%%DATADIR%%/images/grid-lines.png -%%DATADIR%%/images/help.png -%%DATADIR%%/images/image-array.jpg -%%DATADIR%%/images/image-diffs.png -%%DATADIR%%/images/image-locations.jpg -%%DATADIR%%/images/image-management.png -%%DATADIR%%/images/index-files1.png -%%DATADIR%%/images/index-files2.png -%%DATADIR%%/images/inside-out1.png -%%DATADIR%%/images/inside-out2.png -%%DATADIR%%/images/interpolation.png -%%DATADIR%%/images/jpeg-artifacts.png -%%DATADIR%%/images/jpeg-artifacts1.png -%%DATADIR%%/images/jpeg-quality.png -%%DATADIR%%/images/local-retx.png -%%DATADIR%%/images/local-retx2.png -%%DATADIR%%/images/localcon.png -%%DATADIR%%/images/localcon2.png -%%DATADIR%%/images/localcon3.jpg -%%DATADIR%%/images/magnify-image.jpg -%%DATADIR%%/images/make-waves1.png -%%DATADIR%%/images/make-waves2.jpg -%%DATADIR%%/images/manage-albums.png -%%DATADIR%%/images/manage-tags.png -%%DATADIR%%/images/map-click.jpg -%%DATADIR%%/images/maps.png -%%DATADIR%%/images/margins.png -%%DATADIR%%/images/markup.jpg -%%DATADIR%%/images/mashup.jpg -%%DATADIR%%/images/mashup1.png -%%DATADIR%%/images/mashup2.png -%%DATADIR%%/images/mashup3.png -%%DATADIR%%/images/mashup4.png -%%DATADIR%%/images/mashup5.png -%%DATADIR%%/images/mashup6.png -%%DATADIR%%/images/mashup7.png -%%DATADIR%%/images/match-colors.png -%%DATADIR%%/images/measure-image.png -%%DATADIR%%/images/menu-summary.jpg -%%DATADIR%%/images/meta-view.jpg -%%DATADIR%%/images/metadata.png -%%DATADIR%%/images/moncolor-small.png -%%DATADIR%%/images/moncolor.png -%%DATADIR%%/images/mosaic1.png -%%DATADIR%%/images/mosaic2.jpg -%%DATADIR%%/images/netmap-locs.png -%%DATADIR%%/images/nonlinear slider.png -%%DATADIR%%/images/number-keys.png -%%DATADIR%%/images/outboard-programs.png -%%DATADIR%%/images/paint-edits.png -%%DATADIR%%/images/paint-image.jpg -%%DATADIR%%/images/paint-transp.png -%%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-align2.jpg -%%DATADIR%%/images/pattern1.png -%%DATADIR%%/images/pattern2.jpg -%%DATADIR%%/images/permissions.png -%%DATADIR%%/images/perspective1.png -%%DATADIR%%/images/perspective2.png -%%DATADIR%%/images/plugins-edit.png -%%DATADIR%%/images/plugins.png -%%DATADIR%%/images/prev-next.png -%%DATADIR%%/images/print-margins.png -%%DATADIR%%/images/print-setup.png -%%DATADIR%%/images/printer-cal-study.png -%%DATADIR%%/images/printer-calibrate-chart.png -%%DATADIR%%/images/printer-calibrate.png -%%DATADIR%%/images/quit.png -%%DATADIR%%/images/red-eyes1.png -%%DATADIR%%/images/red-eyes2.png -%%DATADIR%%/images/redball.png -%%DATADIR%%/images/refine.png -%%DATADIR%%/images/remove-dust.png -%%DATADIR%%/images/remove-dust2.png -%%DATADIR%%/images/remove-halo.png -%%DATADIR%%/images/remove-halo2.png -%%DATADIR%%/images/rename-folder.png -%%DATADIR%%/images/rename.png -%%DATADIR%%/images/repair.png -%%DATADIR%%/images/rescale.png -%%DATADIR%%/images/retouch.png -%%DATADIR%%/images/rotate-left.png -%%DATADIR%%/images/rotate-right.png -%%DATADIR%%/images/rotate.png -%%DATADIR%%/images/saturation.png -%%DATADIR%%/images/save.png -%%DATADIR%%/images/search-images-metadata.jpg -%%DATADIR%%/images/search-images.jpg -%%DATADIR%%/images/select-area-finish.png -%%DATADIR%%/images/select-area.jpg -%%DATADIR%%/images/select-image-files.jpg -%%DATADIR%%/images/select.png -%%DATADIR%%/images/settings.jpg -%%DATADIR%%/images/sharpen.png -%%DATADIR%%/images/shift-colors.png -%%DATADIR%%/images/show-RGB.png -%%DATADIR%%/images/sketch.jpg -%%DATADIR%%/images/slide-show.jpg -%%DATADIR%%/images/smart-erase.png -%%DATADIR%%/images/smart-erase2.png -%%DATADIR%%/images/soft-focus.png -%%DATADIR%%/images/soft-focus2.png -%%DATADIR%%/images/sphere.png -%%DATADIR%%/images/sphere2.jpg -%%DATADIR%%/images/stack-noise.png -%%DATADIR%%/images/stack-noise2.png -%%DATADIR%%/images/stack-paint.png -%%DATADIR%%/images/stack-paint2.jpg -%%DATADIR%%/images/stack-split.png -%%DATADIR%%/images/stack-split2.png -%%DATADIR%%/images/stack-versions.png -%%DATADIR%%/images/texture.png -%%DATADIR%%/images/texture2.png -%%DATADIR%%/images/tiles2a.png -%%DATADIR%%/images/tiles2b.png -%%DATADIR%%/images/timeline-report.jpg -%%DATADIR%%/images/tiny-planet.jpg -%%DATADIR%%/images/tools.png -%%DATADIR%%/images/top-panel.png -%%DATADIR%%/images/twist1.png -%%DATADIR%%/images/twist2.png -%%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-gallery.png -%%DATADIR%%/images/ug-help.png -%%DATADIR%%/images/ug-maps.png -%%DATADIR%%/images/ug-metadata.png -%%DATADIR%%/images/ug-refine.png -%%DATADIR%%/images/ug-repair.png -%%DATADIR%%/images/ug-select.png -%%DATADIR%%/images/ug-tools.png -%%DATADIR%%/images/ug-undo-redo.png -%%DATADIR%%/images/ug-warp.png -%%DATADIR%%/images/ug-zoom.png -%%DATADIR%%/images/unbend horz curved.png -%%DATADIR%%/images/unbend horz linear.png -%%DATADIR%%/images/unbend vert curved.png -%%DATADIR%%/images/unbend vert linear.png -%%DATADIR%%/images/unbend1.png -%%DATADIR%%/images/unbend2.png -%%DATADIR%%/images/undo-redo.png -%%DATADIR%%/images/unwarp-closeup1.png -%%DATADIR%%/images/unwarp-closeup2.png -%%DATADIR%%/images/upscale+sharpen.jpg -%%DATADIR%%/images/userguide.jpg -%%DATADIR%%/images/view-metadata.jpg -%%DATADIR%%/images/vignette.png -%%DATADIR%%/images/vignette2.png -%%DATADIR%%/images/vignette3.png -%%DATADIR%%/images/warning.png -%%DATADIR%%/images/warp.png -%%DATADIR%%/images/warp_radial.png -%%DATADIR%%/images/warps4.jpg -%%DATADIR%%/images/whiteball.png -%%DATADIR%%/images/zoom.png -share/man/man1/fotocx.1.gz -share/metainfo/kornelix.fotocx.metainfo.xml -- cgit v1.2.3