From nobody Fri Apr 14 15:47:00 2023
X-Original-To: dev-commits-ports-all@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 4Pygmj1htNz45Tfy;
Fri, 14 Apr 2023 15:47:01 +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 4Pygmh6nGkz3DDv;
Fri, 14 Apr 2023 15:47:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681487221;
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=BchW4ybdSLGVAVwyho5dWRJnSKgcncGEE66fdSHUeUQ=;
b=d8sFC+i/tRJ8hREPLqZ42kg/sMcX3xt+3wBHECOr5SzfoVtyrLv9QN21Z/S/NzEHE1M/Mu
BDEPDNl/qmBc9kdLnVXwjpKOBiTcxHjYaKyXEP//31EeEIzsVcofNqTOOJf65xSD+xdfEt
zodO744zG5Bj6s0xf5how1XZiI5b/TxvVTWLc5JHKa3+HoowpCaJiPruJ1sqPsZR/2M0uJ
UcKYBti+LPDG8xPausm3sRo+rXf1QHIqp4F3BALj8p9ziuUOMDjIUYuKZtX4ONV7oMA44e
iuUUkm0QjC7j0BBuiKSoIKPnLxJqO9b/TT1zcsI4AfyULGzpOKfZe7/6PG5qbA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681487221;
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=BchW4ybdSLGVAVwyho5dWRJnSKgcncGEE66fdSHUeUQ=;
b=t7pKB/10vOQ8wLo3G0DxzQxadhjlm45A6SD6wTmDm2F6tmZQaZXhXhSIuoJ8E1+egPKvTK
4a9DrISDriNerK490ZcGl27CIE+KJu1wyrTypBOrFUvgXarjMG+JoqejTAcb2+X6q03Re7
A7352CnxnoP1R552Aq9fi9kj53SZMpPMQr6/m/dIPkxuS+JrlBMa/5NPoiSmoaVCLjhcIe
WoQpLlb6g9i7dk7mQZJKoYdcWl7WwWbe0EPIKdOhv0FtOWQqNwaRD2wuAQ+qh/rZw27g+I
6TKeqHzWmmeaa+E3tx+pAoqLp/lTPU2JKddnJJmV8f4mz19ITGVozw7ICHPoBw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681487221; a=rsa-sha256; cv=none;
b=kreJHtkNoZITU6irJTOEroRU51yOu0o92tJ8fRU0Os+fjwRozWv/SOB/iynWeKvkGcLGif
B2AQxrfU7MXiSfJfkX6xS4pNbe2Ryvfoht+pIxeGhxLDbphyKSJDYqOxUXqCIA2yRJYLaC
+azm9E/UmBEBfFUk9SgUgmm2DGA54GUjcWwLk3R+BD0zbLOGoprAZ2v2H6RLTkZ8gf7hPg
SXkXd5HWOeyZkxQgy7SHQXElsVzo/3zqSvdF4wW4KgDpeblsVVaF9WbU4E0yZixPA4KJA0
nhLsBOwK9ek7wLAhI2XPvN0TNQ8MS4UjCfdxvdENoNkCS+5oJI52dOSxpuKEGQ==
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 4Pygmh5M3LzVgn;
Fri, 14 Apr 2023 15:47:00 +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 33EFl0BV057041;
Fri, 14 Apr 2023 15:47:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EFl0YF057040;
Fri, 14 Apr 2023 15:47:00 GMT
(envelope-from git)
Date: Fri, 14 Apr 2023 15:47:00 GMT
Message-Id: <202304141547.33EFl0YF057040@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Subject: git: bdca11102a7f - main - graphics/fotoxx: the port had been updated to version 23.32
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-all@freebsd.org
X-BeenThere: dev-commits-ports-all@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: bdca11102a7ff71a23a24ea5d160127d7053746f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=bdca11102a7ff71a23a24ea5d160127d7053746f
commit bdca11102a7ff71a23a24ea5d160127d7053746f
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-04-14 15:46:36 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-04-14 15:46:36 +0000
graphics/fotoxx: the port had been updated to version 23.32
- Mute the `-Wwritable-strings' warnings (ISO C++11 does not allow
conversion from string literal to `char *') for the time being:
there are tons of them and they clobber the build log, making it
hard to look for more important warnings and errors
- While here, make `pkg-plist' better sorted against LC_COLLATE=C
---
graphics/fotoxx/Makefile | 3 ++-
graphics/fotoxx/distinfo | 6 +++---
graphics/fotoxx/files/patch-zfuncs.cc | 10 +++++-----
graphics/fotoxx/pkg-plist | 11 ++++++-----
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index a451331ad8bd..8edbb32e1c9a 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,5 +1,5 @@
PORTNAME= fotoxx
-PORTVERSION= 23.2
+PORTVERSION= 23.32
CATEGORIES= graphics
MASTER_SITES= https://kornelix.net/downloads/downloads/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
@@ -22,6 +22,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
+CXXFLAGS+= -Wno-writable-strings
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo
index 24b804d75adb..85f1176fc7a8 100644
--- a/graphics/fotoxx/distinfo
+++ b/graphics/fotoxx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677658228
-SHA256 (fotoxx-23.2-source.tar.gz) = 9e8098582c4b3dec51c6bf232670204e939372d0e9b66f281a0661ac36c2cce9
-SIZE (fotoxx-23.2-source.tar.gz) = 9233622
+TIMESTAMP = 1680699420
+SHA256 (fotoxx-23.32-source.tar.gz) = 3d88f483b671f4ba7005a9f9195994408ceb97289a77acd3981462ac92397537
+SIZE (fotoxx-23.32-source.tar.gz) = 9273650
diff --git a/graphics/fotoxx/files/patch-zfuncs.cc b/graphics/fotoxx/files/patch-zfuncs.cc
index 116014da25a0..b83322379cad 100644
--- a/graphics/fotoxx/files/patch-zfuncs.cc
+++ b/graphics/fotoxx/files/patch-zfuncs.cc
@@ -45,7 +45,7 @@
+}
+#endif
+
- // get available memory in MB units
+ // get available memory in MB units (includes swap space)
// typical < 0.1 milliseconds
double availmemory()
@@ -68,13 +68,13 @@
@@ -996,7 +1032,7 @@ double get_seconds()
timespec time1;
- double time2;
+ double secs;
- clock_gettime(CLOCK_MONOTONIC_RAW,&time1);
+ clock_gettime(CLOCK_MONOTONIC,&time1);
- time2 = time1.tv_sec;
- time2 += time1.tv_nsec * 0.000000001;
- return time2;
+ secs = time1.tv_sec;
+ secs += time1.tv_nsec * 0.000000001;
+ return secs;
@@ -1020,7 +1056,7 @@ void logtime_init(cchar *text)
using namespace logtime_names;
diff --git a/graphics/fotoxx/pkg-plist b/graphics/fotoxx/pkg-plist
index 6bf31c2d3394..bb993b920cbb 100644
--- a/graphics/fotoxx/pkg-plist
+++ b/graphics/fotoxx/pkg-plist
@@ -2,7 +2,6 @@ bin/fotoxx
share/applications/fotoxx.desktop
%%DATADIR%%/data/KB_shortcuts_E
%%DATADIR%%/data/README
-%%DATADIR%%/data/capskeys
%%DATADIR%%/data/colorwheel.jpg
%%DATADIR%%/data/custom_kernel/blur5
%%DATADIR%%/data/custom_kernel/brighten3
@@ -103,6 +102,7 @@ share/applications/fotoxx.desktop
%%DATADIR%%/images/albums-popmenu.jpg
%%DATADIR%%/images/alien-colors1.jpg
%%DATADIR%%/images/alien-colors2.jpg
+%%DATADIR%%/images/anti-alias.jpg
%%DATADIR%%/images/area-rescale.jpg
%%DATADIR%%/images/area-rescale2.jpg
%%DATADIR%%/images/batch-change-meta.jpg
@@ -132,6 +132,7 @@ share/applications/fotoxx.desktop
%%DATADIR%%/images/burn-DVD.jpg
%%DATADIR%%/images/calibrate-printer.jpg
%%DATADIR%%/images/cartoon.jpg
+%%DATADIR%%/images/change-alpha.jpg
%%DATADIR%%/images/choose-captions.jpg
%%DATADIR%%/images/chromatic1.jpg
%%DATADIR%%/images/chromatic1A.jpg
@@ -174,7 +175,6 @@ share/applications/fotoxx.desktop
%%DATADIR%%/images/edit-bookmarks.jpg
%%DATADIR%%/images/edit-dist.jpg
%%DATADIR%%/images/edit-metadata.jpg
-%%DATADIR%%/images/edit-plugins.jpg
%%DATADIR%%/images/edit.png
%%DATADIR%%/images/effects.png
%%DATADIR%%/images/emboss.jpg
@@ -193,8 +193,8 @@ share/applications/fotoxx.desktop
%%DATADIR%%/images/flatten-photo2.jpg
%%DATADIR%%/images/flatten1.jpg
%%DATADIR%%/images/flatten2.jpg
-%%DATADIR%%/images/folder.png
%%DATADIR%%/images/folder-tree.jpg
+%%DATADIR%%/images/folder.png
%%DATADIR%%/images/fotoxx-views.jpg
%%DATADIR%%/images/fotoxx.png
%%DATADIR%%/images/gallery-screen.jpg
@@ -231,6 +231,7 @@ share/applications/fotoxx.desktop
%%DATADIR%%/images/manage-tags.jpg
%%DATADIR%%/images/map-click.jpg
%%DATADIR%%/images/maps.png
+%%DATADIR%%/images/margins.jpg
%%DATADIR%%/images/markup.jpg
%%DATADIR%%/images/mashup.jpg
%%DATADIR%%/images/mashup1.jpg
@@ -268,6 +269,7 @@ share/applications/fotoxx.desktop
%%DATADIR%%/images/permissions.jpg
%%DATADIR%%/images/perspective1.jpg
%%DATADIR%%/images/perspective2.jpg
+%%DATADIR%%/images/plugins-edit.jpg
%%DATADIR%%/images/plugins.jpg
%%DATADIR%%/images/prev-next.png
%%DATADIR%%/images/print-margins.jpg
@@ -280,7 +282,6 @@ share/applications/fotoxx.desktop
%%DATADIR%%/images/red-eyes2.jpg
%%DATADIR%%/images/redball.png
%%DATADIR%%/images/refine.png
-%%DATADIR%%/images/remove-alpha.jpg
%%DATADIR%%/images/remove-dust.jpg
%%DATADIR%%/images/remove-dust2.jpg
%%DATADIR%%/images/remove-halo.jpg
@@ -295,8 +296,8 @@ share/applications/fotoxx.desktop
%%DATADIR%%/images/rotate.jpg
%%DATADIR%%/images/saturation.jpg
%%DATADIR%%/images/save.png
-%%DATADIR%%/images/search-images.jpg
%%DATADIR%%/images/search-images-metadata.jpg
+%%DATADIR%%/images/search-images.jpg
%%DATADIR%%/images/select-area-finish.jpg
%%DATADIR%%/images/select-area.jpg
%%DATADIR%%/images/select.png