From nobody Wed Feb 21 03:42:42 2024 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 4TfhtV3dhQz5BJX9; Wed, 21 Feb 2024 03:42:42 +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 4TfhtV2fr1z4YKB; Wed, 21 Feb 2024 03:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486962; 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=Vp/mczRZ3tN8XfUOwmx8FGEEbWLFS70a8XaJlvw7Wj8=; b=vnPgM5Jg4Fix19E9D4UnpzHyxU1A/gRT3jYQKXZC8BINVFgprEDHoThRxjGK1Y/6VmO+rb 36tvzsrLsDhWaUOOlPEr6GeBCL+5eQ8S25vLQIN3yPlAcLszEJhxrTHA09+fjrx4iJt65/ nkbRfdjbiELW3bRWs1MlqDaNbeZWh0swWR9wzzw8i7cKDI94cx19CcFMB3SYCmUrDKtgot KbQzxcnF9fWC0m0VYW2qECkG5oEtLkIup2dSJu4l5ZqWkl98Nx4KG/7KIwgBd7XI2ugR/F em7Fo/Bo8z4DxqG9V919mjxlJ4VXzRVvd8VD88CIRxN3O3Vwv8JTQ5pFbrPEkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486962; 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=Vp/mczRZ3tN8XfUOwmx8FGEEbWLFS70a8XaJlvw7Wj8=; b=G6tMCTPUVsOgI+fQ4PDCWQj6toSOsSy7fg8JSXnAHbJ3FZZU9+lLTecSADKRHO/6+QlsCD mV/T9aSpoCOSOlr15ZBMVd2NXvRs5XBn8t3OlNwJsMZuAK+oYjMBmL8RdMNo66tT7J6D5T eDkatJVj/ek3EILKvbgegrW05W+bN9Vg8D3D+CQieNiE51ohS6G7JqCXwvPwjnykWxBToV eMwxRE7gtl3kjVjpOd7bxJf/zHmIkl51mipq40zSQL/BPl+JNGSQ/wIZf32RjvgbLUFyYO 4KsDGweYnfCE1Vq1JA/qrOGu5rKcXaFMLjWdeEnxk/sUQiEy+rs0nKNdbrU2ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708486962; a=rsa-sha256; cv=none; b=CqJgfJgqLDFlKwRaCrCNy0hyhBTmDL/qFj1JWz5SBiMDYMNDwCIYLpfoxaPEVM9u9Z8FiV srF2VvfdifdlGML14izfFeoeBlQn+SC1V72cjIRKNIY3yPk1FBLeO5GnhoL+t4o+JqQKGK i8tnyGzFaLBlwXdNEZufAMpaERVDpA6Sb0nqpSWIVrnHFlhwlMl7pxz8rsDSsxRKZSpRQo EZshvVxVDw91eAobYQpyc0vW1RjcnZ9ZXOpTlKRz1EqxdeOuUROjRXf1pZuE+eg6Bdm5bT VFEeKJd+zs9Tt4ZpZhzSv7M7pFE0LtTC8udjpU7t+LkEL2cHP/Fd8UE+ptdkUQ== 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 4TfhtV1jQ1zmSp; Wed, 21 Feb 2024 03:42:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L3gg5N037027; Wed, 21 Feb 2024 03:42:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L3ggua037024; Wed, 21 Feb 2024 03:42:42 GMT (envelope-from git) Date: Wed, 21 Feb 2024 03:42:42 GMT Message-Id: <202402210342.41L3ggua037024@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: 8027fcb9ab62 - main - graphics/fotoxx: update the port to version 24.11 (under the old name) 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: 8027fcb9ab622bacfe95f7c826c55345f7e5b91c Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8027fcb9ab622bacfe95f7c826c55345f7e5b91c commit 8027fcb9ab622bacfe95f7c826c55345f7e5b91c Author: Alexey Dokuchaev AuthorDate: 2024-02-21 03:35:18 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-02-21 03:35:18 +0000 graphics/fotoxx: update the port to version 24.11 (under the old name) The project was renamed to Fotocx. This was done because a web search for "fotoxx" returns pornographic web pages ("foto xx") after a few legitimate results. This has been a plague for years, and the author had decided to end it. --- graphics/fotoxx/Makefile | 15 +++++---------- graphics/fotoxx/distinfo | 6 +++--- graphics/fotoxx/files/patch-fotoxx.cc | 22 +++++++++++----------- graphics/fotoxx/pkg-plist | 20 +++++++++----------- 4 files changed, 28 insertions(+), 35 deletions(-) diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index a5c223f6affd..3011d84bfc05 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -1,13 +1,12 @@ -PORTNAME= fotoxx -PORTVERSION= 23.82 -PORTREVISION= 1 +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/fotoxx/fotoxx.html +WWW= https://kornelix.net/fotocx/fotocx.html LICENSE= GPLv3+ @@ -22,7 +21,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ USES= desktop-file-utils gmake gnome jpeg pkgconfig USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 -ALL_TARGET= fotoxx +ALL_TARGET= ${PORTNAME} CXXFLAGS+= -Wno-register -Wno-writable-strings WRKSRC= ${WRKDIR}/${PORTNAME} @@ -31,11 +30,7 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e \ - '/#include/s,wait\.h,sys/&,' ${WRKSRC}/fotoxx.h - post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo index 98715c3b8ba0..053a90dab99c 100644 --- a/graphics/fotoxx/distinfo +++ b/graphics/fotoxx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1702722295 -SHA256 (fotoxx-23.82-source.tar.gz) = 323c34903fa4fd96b38a3f5997af970e4ed4f33200b579fdb36165f248d31eb3 -SIZE (fotoxx-23.82-source.tar.gz) = 16257916 +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-fotoxx.cc b/graphics/fotoxx/files/patch-fotoxx.cc index da35de45266d..dbacbec2de34 100644 --- a/graphics/fotoxx/files/patch-fotoxx.cc +++ b/graphics/fotoxx/files/patch-fotoxx.cc @@ -1,19 +1,19 @@ ---- fotoxx.cc.orig 2023-12-02 22:45:44 UTC -+++ fotoxx.cc -@@ -294,7 +294,7 @@ int main(int argc, ch *argv[]) - // delete fotoxx temp files if owner process is no longer running - +--- 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 fotoxx fotoxx.x"); // get active fotoxx PIDs 23.3 -+ snprintf(buff,200,"pgrep -d\\ fotoxx fotoxx.x"); +- 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); -@@ -432,13 +432,15 @@ int main(int argc, ch *argv[]) + 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 = 0; // assume at least 4 threads + NSMP = get_nprocs(); +#if 0 fid = popen("lscpu | grep 'CPU(s):'","r"); @@ -23,6 +23,6 @@ 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 + if (NSMP < 1) { // 23.80 Plog(1,"cannot get SMP thread count, assume 4 \n"); NSMP = 4; diff --git a/graphics/fotoxx/pkg-plist b/graphics/fotoxx/pkg-plist index e48cf37e04e1..d53ba1556704 100644 --- a/graphics/fotoxx/pkg-plist +++ b/graphics/fotoxx/pkg-plist @@ -1,5 +1,5 @@ -bin/fotoxx -share/applications/fotoxx.desktop +bin/fotocx +share/applications/fotocx.desktop %%DATADIR%%/data/KB_shortcuts_E %%DATADIR%%/data/README %%DATADIR%%/data/colorwheel.jpg @@ -77,14 +77,13 @@ share/applications/fotoxx.desktop %%DATADIR%%/data/patterns/wet-turquoise.jpg %%DATADIR%%/data/patterns/wood.jpg %%DATADIR%%/data/plugins -%%DATADIR%%/data/popup_text %%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/fotoxx.png +%%DATADIR%%/icons/fotocx.png %%DATADIR%%/images/HDF-paint.png %%DATADIR%%/images/HDF.png %%DATADIR%%/images/HDR-adjust.png @@ -164,8 +163,7 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/denoise.jpg %%DATADIR%%/images/devmenu.png %%DATADIR%%/images/dither1.png -%%DATADIR%%/images/dither2.png -%%DATADIR%%/images/dither3.jpg +%%DATADIR%%/images/dither2.jpg %%DATADIR%%/images/draw-box.png %%DATADIR%%/images/draw-line.png %%DATADIR%%/images/draw-oval.png @@ -198,8 +196,8 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/flatten2.png %%DATADIR%%/images/folder-tree.png %%DATADIR%%/images/folder.png -%%DATADIR%%/images/fotoxx-views.jpg -%%DATADIR%%/images/fotoxx.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 @@ -324,7 +322,6 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/stack-split.png %%DATADIR%%/images/stack-split2.png %%DATADIR%%/images/stack-versions.png -%%DATADIR%%/images/stretch.png %%DATADIR%%/images/texture.png %%DATADIR%%/images/texture2.png %%DATADIR%%/images/tiles2a.png @@ -369,8 +366,9 @@ share/applications/fotoxx.desktop %%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/fotoxx.1.gz -share/metainfo/kornelix.fotoxx.metainfo.xml +share/man/man1/fotocx.1.gz +share/metainfo/kornelix.fotocx.metainfo.xml