From nobody Wed Feb 1 18:51:11 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 4P6WGR5YXQz3bTR8; Wed, 1 Feb 2023 18:51:11 +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 4P6WGR56k1z3mhh; Wed, 1 Feb 2023 18:51:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675277471; 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=uP/Y3vbbHKUT9pEiFhbHZUV9AvQ423+gSoTRTTTp1u8=; b=u2q1wzuVHprU+C6+y2BJNsVtoSbYP3zAsxw3RbyfmVZMxc0j3J4hB0wzHclgUxMK/IjIJF Ui1L+vQM610JHXldy16YUNwRm5fFqj0T4l4u66KdXF9HrlsZf+S/idBFkSIPOCj2rK6lCU GYGFXSP1Kww4OJ8nI5WSq6c/6g8bVgXUJ6ngz3owY3kVmii/y153okQTUZ13RPox53Oy87 iy2wcbVUEhjA4pneqqUENSR8KBauzRDbB+Jhf3/M9IUZD48skbr+FPP5/o9U9rHH+U9ubc YClQM1RXG5T7NiZsX3bQn6T5EcROGlhTRQAKg9PkKg1aYhRn5FhT1xfP6185dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675277471; 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=uP/Y3vbbHKUT9pEiFhbHZUV9AvQ423+gSoTRTTTp1u8=; b=q0xI/loMLtpBjlahqgDPlwYa5zGBXZZokzP9jc7t2fECCNbnhIo/RiF7cleJgLwRmS4f2v M8DFEtcE9oPUJ+YDGrIqxBA0nXx+V89GXDKQ54ToG1cvvN2Nt/pIF687J5rcks+sJ3iV9Z jwCAPHnLYUsh7b8QRNesP154qsgIehEH6G1LYjy+QDqyVnSFP6pvd3z6JdM5uamcCkTV6M 88+H9x/JMbMwKQo9nICwK/97Oqszp1ZtOHEW2hziMp4HUYybWfKQrz4pGEEwCkn5jso0z8 6L3MMEX835fWr3Z7eyuxy4uEdAi8h12JQrd2tMmL1h8k4FHLZPkgkl0TZvDjfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675277471; a=rsa-sha256; cv=none; b=lexEW8SBnnmGtDB1eFu7fzPmy4evRIS+FjsWN64Ne+5sXbdeGNhw1CJ/gtzvqVI5SejsMq 5whrNP4HLleo35GObYYV+0FayOFEy8mqIZ5Q5qToyMTq7j1RPl/KbDcjCfaOHnPjobN+fP Ee70Xe65+B4ZOefBlcXN9zPWN3bLH3xB2LRPmirpv8kBK+Kc3HuukKF6Ho7/Gol2UJCqm7 V82p2+6B20jDQzNY0oEJ+Aw0hBNwbReugOrKB/6KVl7Q16bP7T4tJxf2gij2IOk2rqbmci qBu1ST/cQfV6t8vI918q3AYDsP/QlfewDOibSUseuQdpHLQfnV08zT7tidXE3Q== 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 4P6WGR3sGszQ0P; Wed, 1 Feb 2023 18:51:11 +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 311IpBok068159; Wed, 1 Feb 2023 18:51:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311IpB2h068158; Wed, 1 Feb 2023 18:51:11 GMT (envelope-from git) Date: Wed, 1 Feb 2023 18:51:11 GMT Message-Id: <202302011851.311IpB2h068158@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: 790a53bad21e - main - graphics/fotoxx: update the port to version 23.1 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: 790a53bad21ef482acc13a36265785a548c2baaa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=790a53bad21ef482acc13a36265785a548c2baaa commit 790a53bad21ef482acc13a36265785a548c2baaa Author: Alexey Dokuchaev AuthorDate: 2023-02-01 18:50:08 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-02-01 18:50:08 +0000 graphics/fotoxx: update the port to version 23.1 When disabling needless CXXFLAGS pollution, simply guard the Makefile part with an unset variable instead of removing all the code, this simplifies the patch and (hopefully) makes it more robust against future changes. Reported by: portscout --- graphics/fotoxx/Makefile | 2 +- graphics/fotoxx/distinfo | 6 ++--- graphics/fotoxx/files/patch-Makefile | 44 +++++++++++------------------------ graphics/fotoxx/files/patch-zfuncs.cc | 6 ++--- graphics/fotoxx/pkg-plist | 1 - 5 files changed, 20 insertions(+), 39 deletions(-) diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index 306197694bce..0211030edb33 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -1,5 +1,5 @@ PORTNAME= fotoxx -PORTVERSION= 23.0 +PORTVERSION= 23.1 CATEGORIES= graphics MASTER_SITES= https://kornelix.net/downloads/downloads/ diff --git a/graphics/fotoxx/distinfo b/graphics/fotoxx/distinfo index 52982493ab33..37042b8b235a 100644 --- a/graphics/fotoxx/distinfo +++ b/graphics/fotoxx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672669839 -SHA256 (fotoxx-23.0.tar.gz) = 7629edde4053ea6ebb815e84f5717e32982ad2c2ef0d00412c9719294f5122d7 -SIZE (fotoxx-23.0.tar.gz) = 9258345 +TIMESTAMP = 1675202410 +SHA256 (fotoxx-23.1.tar.gz) = 2043daedac89d5826699ff2833e6e697caad707ae174bebb9470e21b692312c1 +SIZE (fotoxx-23.1.tar.gz) = 9198469 diff --git a/graphics/fotoxx/files/patch-Makefile b/graphics/fotoxx/files/patch-Makefile index 9e8d9f64bc29..893519013c6e 100644 --- a/graphics/fotoxx/files/patch-Makefile +++ b/graphics/fotoxx/files/patch-Makefile @@ -1,39 +1,21 @@ ---- Makefile.orig 2022-08-01 12:52:28 UTC +--- Makefile.orig 2023-01-31 21:43:57 UTC +++ Makefile -@@ -1,40 +1,12 @@ +@@ -1,5 +1,6 @@ # fotoxx Makefile --# --# export CXX=g++ gnu compiler --# export CXX=clang++ clang compiler --# export DEBUG=x debug build with address checking + # ++ifdef WANT_EXTRA_CXXFLAGS + # export CXX=g++ gnu compiler + # export CXX=clang++ clang compiler + # export DEBUG=x debug build with address checking +@@ -28,6 +29,7 @@ else # GCC + CXXFLAGS += -Wall -g2 -rdynamic -O2 -Wno-format-truncation -Wno-stringop-truncation + endif + endif ++endif -- --# Try to fix warning from champlain-tile.h but none of this works --# CXXFLAGS += -D GTimeVal=GDateTime --# MAKEDIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) --# CXXFLAGS += -I $(MAKEDIR) -- -- --ifeq ($(CXX), clang++) # CLANG -- ifdef DEBUG -- CXXFLAGS += -Wall -g -O0 -fsanitize=address -Wno-stringop-truncation -- LDFLAGS += -fsanitize=address -- else -- CXXFLAGS += -Wall -g -O2 -- endif --else # GCC -- ifdef DEBUG -- CXXFLAGS += -Wall -g2 -rdynamic -O0 -fsanitize=address \ -- -Wno-format-truncation -Wno-stringop-truncation -- LDFLAGS += -fsanitize=address -- else -- CXXFLAGS += -Wall -g2 -rdynamic -O2 -Wno-format-truncation -Wno-stringop-truncation -- endif --endif -- PKG_CONFIG ?= pkg-config - CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \ +@@ -35,7 +37,7 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c `$(PKG_CONFIG) --cflags gtk+-3.0 --libs champlain-gtk-0.12` LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` \ diff --git a/graphics/fotoxx/files/patch-zfuncs.cc b/graphics/fotoxx/files/patch-zfuncs.cc index ccd16436e512..116014da25a0 100644 --- a/graphics/fotoxx/files/patch-zfuncs.cc +++ b/graphics/fotoxx/files/patch-zfuncs.cc @@ -141,9 +141,9 @@ *********************************************************************************/ - int zfind(cchar *pattern, char **&flist, int &NF) + int zfind(ch *pattern, ch **&flist, int &NF) { - char **zfind_filelist = 0; // list of filespecs returned + ch **zfind_filelist = 0; // list of filespecs returned +#ifdef GLOB_PERIOD int globflags = GLOB_PERIOD; // include dotfiles +#else @@ -151,7 +151,7 @@ +#endif int ii, jj, err, cc; glob_t globdata; - char *pp; + ch *pp; @@ -5805,9 +5850,16 @@ int zinitapp(cchar *appvers, int argc, char *argv[]) if (argc > 1 && strmatchV(argv[1],"-ver","-v",0)) exit(0); // exit if nothing else wanted diff --git a/graphics/fotoxx/pkg-plist b/graphics/fotoxx/pkg-plist index 0dc28fa3e115..498e96fc3cfc 100644 --- a/graphics/fotoxx/pkg-plist +++ b/graphics/fotoxx/pkg-plist @@ -295,7 +295,6 @@ share/applications/fotoxx.desktop %%DATADIR%%/images/rotate.jpg %%DATADIR%%/images/saturation.jpg %%DATADIR%%/images/save.png -%%DATADIR%%/images/search-images-metadata.jpg %%DATADIR%%/images/search-images.jpg %%DATADIR%%/images/select-area-finish.jpg %%DATADIR%%/images/select-area.jpg