From nobody Sat Nov 26 14:18:22 2022 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 4NKDNZ6MFtz4jTZK; Sat, 26 Nov 2022 14:18:22 +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 4NKDNZ5RZQz3jQF; Sat, 26 Nov 2022 14:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669472302; 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=/lMNDpW0CyPGRskYL9Wh3H/CqMEChj+PLA2NVPBLmpk=; b=i2fyB75ZPhS04Yy/ivr2couS/qczXaJSIXxK8p87LSK5eqwzaCRkBN3Xk72Pg8Wx+6IVyO TZZPoa58LXPVG4wUl9vaYzFic/lDyhmpdUpPRrSMotDyPRXMGM5eas8NuMFbd5ikcrCdCt ZSykeYrdc7lL6ogdYQ6TN0x4JIlcnYKrBbttRR8bXINlLAsJOuAtn7/RPdZ+hgIcRsEH3o x3JejHQDVPNJEW2RoSfsYITUvH4815lZYVo1oaQiZHDL3fvhMy1ZUcQTV8vPvD5e1Osugh dAbXlMl1EFcgRfOIgj6AT0Ov5AesqGCQimrTIAZIZwIrKZ43dNl2CbwNZZwTZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669472302; 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=/lMNDpW0CyPGRskYL9Wh3H/CqMEChj+PLA2NVPBLmpk=; b=hwSVlGYaRNcIG1UaUoDMeyxET3m8rz0c1b9O6nwsbCX4yAQCnyvEuQ66fvzX0owfNGg8cS BqV+q/irTpcj+qWmSUeX18VRm6ncGTI/kh/064LMy0LeWONTMVDLV5vRe7l3IkdcpIyVKI JacGYdMwSVYaFa3DWcPKxg114FHfhg5cJojrYgX980v1Uk9uVT03p7xgPCNYnIaf9zdlm4 j15uZJahEwGHV4jeiAVwC3z0kmL1zUSENxLb1FD2DOD6z5dOlb2MPMDFA7nHgpAPyDFPpo Amp1lI1iiA4Pu33RGBuzlrjqj5rsAorxSX4qy5936UNLJ/brKzy2DnpQDMWF3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669472302; a=rsa-sha256; cv=none; b=g1bQHCkdzhzHyM0OtAmDxRz30DJMNqW9WaO2ldA1Djq9tityaVt3uh5HQtEG0dgi04zuNc RfBYkaN2Ao3VtNga+HzJR2uHjr281E4jBhvEErvOmG5iOlgLHyj+RO5ylAXwUllza13Jzt V74yD0gOI9jcMZWQz6g5RMze9HoB2s8Iy30UAXOsxff9IiY3XAOe8ZBtCTRfcFJC88hRgY koXDfT01qDbsjCbsSDPPbhg+mhkpdCxHAITnHbDHZ8OnWJXgLlXfcxvpbHnrcketA3ZlmS XWqEVW1frsUAf0ot6t0TpDnMLjL+xmfbEFRZRz2ZVfJeP4MU5dVLMpSph9sQVg== 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 4NKDNZ4FqbzN2T; Sat, 26 Nov 2022 14:18:22 +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 2AQEIMJ8025549; Sat, 26 Nov 2022 14:18:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AQEIMm3025548; Sat, 26 Nov 2022 14:18:22 GMT (envelope-from git) Date: Sat, 26 Nov 2022 14:18:22 GMT Message-Id: <202211261418.2AQEIMm3025548@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 4b211242030e - main - devel/glib20: unbreak some C++ consumers after 27fe5eff9577 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b211242030e4160d54bd302770c253c5392d2ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b211242030e4160d54bd302770c253c5392d2ee commit 4b211242030e4160d54bd302770c253c5392d2ee Author: Jan Beich AuthorDate: 2022-11-26 14:01:23 +0000 Commit: Jan Beich CommitDate: 2022-11-26 14:17:10 +0000 devel/glib20: unbreak some C++ consumers after 27fe5eff9577 $ make -C lang/gjs [...] ../util/log.cpp:106:25: error: no matching function for call to 'strcmp' if (debug_output && g_str_equal(debug_output, "stderr")) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/glib-2.0/glib/ghash.h:165:30: note: expanded from macro 'g_str_equal' #define g_str_equal(v1, v2) (strcmp ((gconstpointer) (v1), (gconstpointer) (v2)) == 0) ^~~~~~ /usr/include/string.h:82:6: note: candidate function not viable: cannot convert argument of incomplete type 'gconstpointer' (aka 'const void *') to 'const char *' for 1st argument int strcmp(const char *, const char *) __pure; ^ Reported by: fluffy, cmt Regressed by: https://gitlab.gnome.org/GNOME/glib/-/commit/b46ed37c972f --- devel/glib20/Makefile | 1 + devel/glib20/files/patch-glib_ghash.h | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 7b19ba79cc27..d1f16fd6905d 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -1,5 +1,6 @@ PORTNAME= glib DISTVERSION= 2.74.2 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME diff --git a/devel/glib20/files/patch-glib_ghash.h b/devel/glib20/files/patch-glib_ghash.h new file mode 100644 index 000000000000..df795aae653e --- /dev/null +++ b/devel/glib20/files/patch-glib_ghash.h @@ -0,0 +1,13 @@ +https://gitlab.gnome.org/GNOME/glib/-/issues/2820 + +--- glib/ghash.h.orig 2022-11-24 12:29:05 UTC ++++ glib/ghash.h +@@ -162,7 +162,7 @@ gboolean g_str_equal (gconstpointer v1, + gconstpointer v2); + + /* Macro for optimization in the case it is not used as callback function */ +-#define g_str_equal(v1, v2) (strcmp ((gconstpointer) (v1), (gconstpointer) (v2)) == 0) ++#define g_str_equal(v1, v2) (strcmp ((const char *) (v1), (const char *) (v2)) == 0) + + GLIB_AVAILABLE_IN_ALL + guint g_str_hash (gconstpointer v);