From nobody Fri May 19 04:14:29 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QMtlT31DBz4BPd3; Fri, 19 May 2023 04:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QMtlT2GSCz3JSd; Fri, 19 May 2023 04:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684469669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ug1k3hkPD4g6c5fWld22xrO/7K5c8Fh2b5XNtUR+QjE=; b=xMWhhFb23OceHUjWMtCFEzIF8yYQs2vtJVug8cVY0NF3v3WjHFRbPSxMI7S0DIKebwLsyH J/UmpSSsEDOQ8sxcn9TOUl9+x1qBXxixCVoBaPmT1vTiJXhXa14igcS8ovhffSxoC04+qk HAKMH44gTuBsU4dzXR422lvYLnrSC3CS9pkNdx/gyTEmd1pM4D42BcSFYV6megYlCUgZLR q/Cg7ltABRd3OsG9a3Zs8i7Ap5yIR5C/+fb/jHMi4VYLbLuSnJSjFNESetU3BD4sc6pxq+ iHmY+zI2yBADYYQiFHlOWn0uichzjNLy6H/fQxkkobPElu0jRlKO/WfnftK9cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684469669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ug1k3hkPD4g6c5fWld22xrO/7K5c8Fh2b5XNtUR+QjE=; b=Y3ogsDWWxpxQp1nMSJcXzghH1m5+TAudIneu+PVMZtYE/8ABGJbcqo/2y7Du93KNx9kjUw +YvHSESuz8GrkRAxLEVXpvv8lIWqo+0qdWPI93hsGfQqR0S8yYaVBuXsSfOjiZfEBiG3Ug aHFY37ABBykoQuY5/wJlk/8xy5QeYaeAta98siH5zPTv4W8QZFtlZNWw06nOinnJ+nYP14 gAoBLzEXb4xp7IFDkj+pYZ2Suy2TDtE1B00nfE9JUKJZGJuBLssm3OLj8c3pAWkPPxlUqA gql0m+KX2cbHpTLTWinmjkjCp3gUEAPsqgN9JauFqU/mJalx2gk4t3dj1v2hBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684469669; a=rsa-sha256; cv=none; b=jD3gXkA8Hp6xX+WQg9FvpifO2OeV1SNAOtoSuhKAlQ04Z+/EG+tKDHvew0B52nNxm3pwRc BbZo0LOYr2BxzZJY2eiHVO29gYjpUqFKLmGAbx7RMn8AIsizU91qXNQ65ryoEPnAIEmPMX DFxl9SWUp7vvmU70LqLlpIg0jHC9006yts03er0nmWTpCbI/lHDZGVDh/QlfliNw8c8CsZ 1RVsMtifkdBlCqfjoX+EloQ7uFnPV8uheeg9o6JOzlar/6tfbkYRII2xrB4cKtkn6jBk1B FXz8I+58UgdEci7U+62lKds2sNgGqIsD21KXey+8YLIM8PQf3qi+JZKqXqW9QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QMtlT1MqYzDmw; Fri, 19 May 2023 04:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34J4ETLm022359; Fri, 19 May 2023 04:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34J4ETsA022358; Fri, 19 May 2023 04:14:29 GMT (envelope-from git) Date: Fri, 19 May 2023 04:14:29 GMT Message-Id: <202305190414.34J4ETsA022358@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: b7fc2e5e31c1 - main - graphics/fotoxx: the port had been updated to version 23.50 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7fc2e5e31c13a5468705415f85b2c102e9b769f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7fc2e5e31c13a5468705415f85b2c102e9b769f commit b7fc2e5e31c13a5468705415f85b2c102e9b769f Author: Alexey Dokuchaev AuthorDate: 2023-05-19 04:13:26 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-19 04:13:26 +0000 graphics/fotoxx: the port had been updated to version 23.50 Previous version 23.4 had been skipped because it's incoherent with existing numbering scheme. --- graphics/fotoxx/Makefile | 2 +- graphics/fotoxx/distinfo | 6 +++--- graphics/fotoxx/files/patch-f.refine.cc | 2 +- graphics/fotoxx/files/patch-zfuncs.cc | 10 +++++----- graphics/fotoxx/pkg-plist | 10 ++++++---- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 8edbb32e1c9a..ca3855b6a0a5 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 85f1176fc7a8..73759f2d0953 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 7867f66b007f..6769e3308abc 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 b83322379cad..238953dcea7d 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 bb993b920cbb..0025af8fcb64 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