From nobody Tue Jan 4 02:59:49 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 7313B192FCC9; Tue, 4 Jan 2022 02:59:50 +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 4JScm60kNRz3h7Z; Tue, 4 Jan 2022 02:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E319411709; Tue, 4 Jan 2022 02:59:49 +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 2042xnpK009242; Tue, 4 Jan 2022 02:59:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2042xnKg009241; Tue, 4 Jan 2022 02:59:49 GMT (envelope-from git) Date: Tue, 4 Jan 2022 02:59:49 GMT Message-Id: <202201040259.2042xnKg009241@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: 901d4d41f866 - main - x11-toolkits/pangomm: unbreak build with pango >= 1.50 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: 901d4d41f866b1cf8a7f61ea9494aab8193b6d80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641265190; 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=7feu/iISJnKHLAukuFct6T6WXBSsymfmfSjs8CozcII=; b=Sa1disyRWHONNQpYccVskZasClq5QaoYB+Abt8VXpDqTX84Kw9BuT3jrtjxh546e7FuGTp JLWwdDp0aGM66ogrEwMrxypzsfiVlkag1LpfzLPSRHjExj227JnsCmr6XnF3fwALGGWtnL oNK1d7+NEj3F6l5DfAf59Dvk8XVd6c94C+wBAhCMGijSQdjuqOE4e0G6uUklZwK4R2d/Us U6M+LC21e2w7/nhfJci9Q4Qpo96DBjRTxcib/YpiPQaszPgT1zM9mGtK03TViLmBgptXvv wuFkDkI5+NQp8XnCic4kbUROryH07tOJ+A6lXo2YMUv55PBigd6BFrwVVFDErw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641265190; a=rsa-sha256; cv=none; b=yZEQn9samU/dvUay3eJ+YwnSR+AtUoWBKIQp+1W5AEC7uDqgipaYeDOEg/h+s+SoOgE55V EoWmaB1AWUBH6n7u6WdNDgxCGoyIwCoa3U14X5a7fuy1Zu5v3OxGpjHX9pw6uHUeKs6C17 CNQh4zYARAcEgp+mTAZY7DfHeVQIVIKh2zUsEkJHgWK9v/s47ArGvRN1eljTOlXuD2sB+Q 7p9g/ZDH6U7AlaEvN/UqfkMwz0reX/+w/LSKy7mAJUfgBrlia2wbG3Ypf41YYOijPpRbFf JJXQ4eqmSzki2OYJ+uU6oGUVvNR/IpshnRwMrzWM+OteHmdwNXDFb84odIXW6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=901d4d41f866b1cf8a7f61ea9494aab8193b6d80 commit 901d4d41f866b1cf8a7f61ea9494aab8193b6d80 Author: Jan Beich AuthorDate: 2022-01-04 02:51:24 +0000 Commit: Jan Beich CommitDate: 2022-01-04 02:57:20 +0000 x11-toolkits/pangomm: unbreak build with pango >= 1.50 attrlist.cc:38:20: error: use of undeclared identifier 'pango_parse_markup' gboolean bTest = pango_parse_markup(markup_text.c_str(), -1 /* means null-terminated */, accel_marker, ^ attrlist.cc:65:20: error: use of undeclared identifier 'pango_parse_markup' gboolean bTest = pango_parse_markup(markup_text.c_str(), -1 /* means null-terminated */, accel_marker, ^ PR: 260916 Regressed by: https://gitlab.gnome.org/GNOME/pango/-/commit/d8df0da73752 --- .../pangomm/files/patch-pango_pangomm_attributes.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/x11-toolkits/pangomm/files/patch-pango_pangomm_attributes.h b/x11-toolkits/pangomm/files/patch-pango_pangomm_attributes.h new file mode 100644 index 000000000000..70e3f057e9f6 --- /dev/null +++ b/x11-toolkits/pangomm/files/patch-pango_pangomm_attributes.h @@ -0,0 +1,22 @@ +https://gitlab.gnome.org/GNOME/pangomm/-/commit/a8ab02ac9b96 +https://gitlab.gnome.org/GNOME/pangomm/-/commit/c098f35144ff + +attrlist.cc:38:20: error: use of undeclared identifier 'pango_parse_markup' + gboolean bTest = pango_parse_markup(markup_text.c_str(), -1 /* means null-terminated */, accel_marker, + ^ +attrlist.cc:65:20: error: use of undeclared identifier 'pango_parse_markup' + gboolean bTest = pango_parse_markup(markup_text.c_str(), -1 /* means null-terminated */, accel_marker, + ^ + +--- pango/pangomm/attributes.h.orig 2016-08-19 13:58:37 UTC ++++ pango/pangomm/attributes.h +@@ -30,6 +30,9 @@ + #include + #include + #include ++#if __has_include() ++#include ++#endif + #include + +