From nobody Fri Jun 30 07:18:21 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 4QsmrG087Zz4kp3L; Fri, 30 Jun 2023 07: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 4QsmrF2TCcz3kWs; Fri, 30 Jun 2023 07:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109501; 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=7UjFdjX5hVLZ+ivF2BU2XWPnvHdUfrtUf+YULTv/Gzk=; b=XwjZN+lp1Rgf+75TN/dFayf5k6aj3SwfiwQHIg+HSU9nAF6PYZC8v1QI+sn538fJyb2h3F Wmm2IRsqcda9eurgyg+axDuhAG+JU4VIXEnEvWquCAcKrwBhxTSMwRGAlO56BzB2jQwf1p 2QJzHNWCrT9TVjoVl73LoBCkW6hcHz6w039WB+6G05L/NscSLJyFOoCCqKS8poKOY6gTY2 TvkVTER8vOnoxPp7MLoxHWbUC7BDDlyIQi7xB86qGoo8ZJ4G/kKEaCFedbru+Fz3Kzf2wU Q9226WF0nwnY4cZX9vYDZTS3LzLlEGdWbKmcIcxK6mu2wbCXC7ytuJsl9P/nIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109501; 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=7UjFdjX5hVLZ+ivF2BU2XWPnvHdUfrtUf+YULTv/Gzk=; b=IkiY+7Ox5dgIiABsKWNphQWy6z1ofxNxmGROfKGDBBumz/rJYZkRe/hDV+oJsbfOJcaJB2 MSyg7LoDRVM4w/VrUQ0LIRkKDwyaxjBP1j+Ty7KDeEeV7h8hOUTG36lfBVPW8rO8Zj4+0K jqLaIm1Pb5qbs1mwGRCF4KhyKCoEP5w0r5DV90+mPZHAos2UOk6YwjuCinHqImV5bAwMJv 64fJREktNAQuP90g1O3Ic/utQFgBD/MuUFRr5UJW56makIXa0TndgnjXRwNPEfEm2inoY1 DgLxlS2OfV36aUlUZLhdKrW/p3oUUwA1smS8uOjODTkY2Lcn4a4nZExqXCSlfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109501; a=rsa-sha256; cv=none; b=ksdTEdU+G2ylagsrH31nNyiPqjt7NLEd/5hgbF9IjCw+dAv9bG5hUxHRauE5VdkklAqJ9A N9oVHOQUESRuGlg5SU2k3Uw9yZN1GzYo/if1R/q7LmxMFevn79eMsYefNoWuR118cIiUVt XUld7P85C3MJ0MDLPh0DITnVseoBMyySrQAaqWZYy5tq9C/XiuEwVm+ymI1e1gAgRtmqMO 6jEYzsHZVBkjt0wwpGN/fyqyn7NDRcoprr1T6gkxbnmhr34BPl8wtSata+WRnSujEBIGIl OA6tgy4COY/I+O7c1QAzmDyNEdN6vEqOYJeblqAnarO8d9XrTgFcgdCTww1+ew== 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 4QsmrF1YgPzq8n; Fri, 30 Jun 2023 07:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35U7ILtf064882; Fri, 30 Jun 2023 07:18:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7ILPX064881; Fri, 30 Jun 2023 07:18:21 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:18:21 GMT Message-Id: <202306300718.35U7ILPX064881@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 249dd4b7de80 - main - textproc/discount: Fix build with Clang 16 and remove the workaround 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 249dd4b7de80bddef241339dff6b4d7993414a33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=249dd4b7de80bddef241339dff6b4d7993414a33 commit 249dd4b7de80bddef241339dff6b4d7993414a33 Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:02:20 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:02:20 +0000 textproc/discount: Fix build with Clang 16 and remove the workaround --- textproc/discount/Makefile | 6 ------ textproc/discount/files/patch-clang16 | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile index a49535c576db..bec1db4494e5 100644 --- a/textproc/discount/Makefile +++ b/textproc/discount/Makefile @@ -38,12 +38,6 @@ EXTRA_CONFIGURE_ON= --with-dl=both --with-fenced-code --with-github-tags --with- SAMPLES_INSTALL_TARGET= install.samples TAB8_CONFIGURE_ON= --with-tabstops=8 -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 -CFLAGS+= -Wno-error=incompatible-function-pointer-types -.endif - post-install: ${INSTALL_DATA} ${WRKSRC}/libmarkdown.a ${STAGEDIR}${PREFIX}/lib/libmarkdown.a ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmarkdown.so diff --git a/textproc/discount/files/patch-clang16 b/textproc/discount/files/patch-clang16 new file mode 100644 index 000000000000..c16d5f6fae9f --- /dev/null +++ b/textproc/discount/files/patch-clang16 @@ -0,0 +1,11 @@ +--- main.c.orig 2022-03-30 19:34:50 UTC ++++ main.c +@@ -308,7 +308,7 @@ main(int argc, char **argv) + if ( squash ) + mkd_e_anchor(doc, (mkd_callback_t) anchor_format); + if ( use_e_codefmt ) +- mkd_e_code_format(doc, external_codefmt); ++ mkd_e_code_format(doc, (mkd_callback_t) external_codefmt); + + if ( use_e_codefmt || squash ) + mkd_e_free(doc, free_it);