From owner-dev-commits-ports-main@freebsd.org Mon Jul 5 04:27:47 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B127652652; Mon, 5 Jul 2021 04:27:47 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GJCN20Jq5z3l3F; Mon, 5 Jul 2021 04:27:45 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: by mail-wr1-x42b.google.com with SMTP id p8so20359319wrr.1; Sun, 04 Jul 2021 21:27:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version; bh=6UUb+3CLV6FeOS86am5XtFj01C0Vq//UEHFUZZL+YAg=; b=oLBwayhCcV7m+mgg9574nGzsq2dbru00uwb+tnRwCbC4Jo2DavrTbJ6uA9tEqbNpAh 1/PJdpD6UAK8IoBUL9h+hbytQ3g0EEseXPcYq84EugOAlfbRHjjW1l5MjTFBH8nDhZbu 19oi42dU/rKPsRu4OeCBbgP0EJMI8/D2x75y+hfShOODiRCpFZkcUXgTvuzYZnGJnlJq Zp/PMoWLPL4eYxdbH+HW3COalGq3pJ76GGM9UbYgWZeyj0E1jwaofSGIaKcU3LVoy6mO Hm32gkSNDI4noM6TI+KnMSO8woHb1ZMW7VLWx12LmRA8c5FCb46+caLhrnSHrl6vEgPd FGkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version; bh=6UUb+3CLV6FeOS86am5XtFj01C0Vq//UEHFUZZL+YAg=; b=jZIReWCsMzdRqY3uB6N1TKlooQ6F5MUrvMkekJrZg4lVNU419yVl71HSXEBblrgmSn wmMISG+HOvjyzKmBIrRENyGojjrW/XCMCBSfHgemHK66TYkirTNG9n7Bpnq3fw6WxGuV ar8lPghv5Zmnl0pYXDTi8piQ/h0TYelznVyeAsLQkeuk4YcDzEfcmJ9LAZfNyiLIdr3Z yQZRvRolviYXeEiXw4jFbdbIALuzg6H5xIR0vITV4c8x0fPhguO48vXtFgwBXgxxU7yA ROlfhXlMT6I1Zqf3jqdFTDIh1Rx5FC3gcRm3Ia1LpqF6yFVCzFYoqVnHmIMDtd5kqW7V B8sQ== X-Gm-Message-State: AOAM532bbD/4WaGo16tj1aJz/EH7kU0H09UfIVVa1KMkpJrDTPgNAN77 h+ZwKvlTKqf3THgqGt2hnY4X+K5XlZQ= X-Google-Smtp-Source: ABdhPJxc+1ETdKe2evruJBioEPbZC/y5nR9N1iYuSbHb4r5tpW8EzZkwmEGCrGIGKXUvvGO/vY+KMA== X-Received: by 2002:a5d:4d8c:: with SMTP id b12mr13281605wru.332.1625459264558; Sun, 04 Jul 2021 21:27:44 -0700 (PDT) Received: from angua.firefly ([2a02:168:5daf:0:e2d5:5eff:fe2a:8bfb]) by smtp.gmail.com with ESMTPSA id a9sm11813508wrn.8.2021.07.04.21.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 21:27:44 -0700 (PDT) From: "Tobias C. Berner" To: Alexey Dokuchaev Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: bc02049bf8bb - main - graphics/inkscape: update to 1.1 Date: Mon, 05 Jul 2021 06:27:36 +0200 Message-ID: <2627985.TYJnH3iKXO@angua.firefly> In-Reply-To: References: <202107042022.164KMF2R002159@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart7719469.iDzAj6rjnq"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Rspamd-Queue-Id: 4GJCN20Jq5z3l3F X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=oLBwayhC; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of tcberner@gmail.com designates 2a00:1450:4864:20::42b as permitted sender) smtp.mailfrom=tcberner@gmail.com X-Spamd-Result: default: False [-3.08 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::42b:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FREEFALL_USER(0.00)[tcberner]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; NEURAL_SPAM_SHORT(0.05)[0.055]; NEURAL_SPAM_MEDIUM(0.96)[0.961]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::42b:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::42b:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-ports-all,dev-commits-ports-main] X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jul 2021 04:27:47 -0000 --nextPart7719469.iDzAj6rjnq Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii"; protected-headers="v1" From: "Tobias C. Berner" To: Alexey Dokuchaev Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: bc02049bf8bb - main - graphics/inkscape: update to 1.1 Date: Mon, 05 Jul 2021 06:27:36 +0200 Message-ID: <2627985.TYJnH3iKXO@angua.firefly> In-Reply-To: References: <202107042022.164KMF2R002159@gitrepo.freebsd.org> Moin moin Am Montag, 5. Juli 2021, 04:22:46 CEST schrieb Alexey Dokuchaev: > On Sun, Jul 04, 2021 at 08:22:15PM +0000, Tobias C. Berner wrote: > > commit bc02049bf8bbba23d78ca07d75c02d7940b98995 > > > > graphics/inkscape: update to 1.1 > > > > ... > > +-#ifdef __APPLE__ > > ++#if defined(__APPLE__) || defined(__FreeBSD__) > > + // workaround for > > + // > > static_assert(__is_cpp17_forward_iterator<_ForwardIterator>::value > > + auto const n = std::vector(nodes.begin(), > > nodes.end()); > Interesting... Is this the bug in Clang or Inkscape? >From what I gather, it seems like it was a way to follow the standard in clang [1] . > > > ++#elif defined(__FreeBSD__) > > ++ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; > > ++ char buf[MAXPATHLEN]; > > ++ size_t cb = sizeof(buf); > > ++ if (sysctl(mib, 4, buf, &cb, NULL, 0) == 0) { > > ++ program_name = realpath(buf, nullptr); > > I've recently had to patch one program in a similar way, and it looks > like returned path is already normalized on FreeBSD, so you don't have > to call realpath(), contrary to Linux' /proc/self/exe. If the buffer > is expected to be free()able, s/char buf[...]/char *buf = malloc(...)/ > and change the condition to ``if (!buf || sysctl(...) == -1)'' as they > both would set errno and thus could be handled in one if(). Indeed, a quick (probably not complete) test agrees with realpath being unnecessary. I added it to match the NetBSD implementation of the same [2]. > > ./danfe mfg Tobias [1] https://stackoverflow.com/questions/57596150/why-does-clang-not-like-boosttransform-iterator [2] https://gitlab.com/inkscape/inkscape/-/commit/ ca31162e74eab75e02a6441a2caf33c56d0f8183 --nextPart7719469.iDzAj6rjnq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEulg44mHRo8gJYMULAh23OlApOtAFAmDiijhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEJB NTgzOEUyNjFEMUEzQzgwOTYwQzUwQjAyMURCNzNBNTAyOTNBRDAACgkQAh23OlAp OtBIBAf/XXl2XTe97feKYziADIcy9ugXpLk/M8FIgNZs+g+gwSGBuvNjPaRUmJD2 vJdTqtRQbvd9pjaSDXWtNmIpv68BKQETEsh+CXYVXrUgU0vRWyqdmnjVpUhlDUc9 W7JMne0tGII8AYdXMMtfq1JHvMjZPk+tyOLWh0o8000ti3niqL1Ojqau2lfUiQ5T NPKWCrSlihxPmrxu4GsOLvSVO2L76fVtU1sSM9PXpeeFvTPVYesazXNfglsrfjwR uYPKHHQj/WsDkbxfScCPbTME83EEDrVN2XCzB2b/mxiQBaY882qF6RKf7RnbWtXA al9EMPAuWnGAfV5zfvNhX0AtGF299w== =M/cf -----END PGP SIGNATURE----- --nextPart7719469.iDzAj6rjnq--