From nobody Wed Jan 12 01:25:17 2022 X-Original-To: dev-commits-ports-all@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 680901955CC5; Wed, 12 Jan 2022 01:25:18 +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 4JYVHL06Tkz3sMq; Wed, 12 Jan 2022 01:25:18 +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 D001323F09; Wed, 12 Jan 2022 01:25:17 +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 20C1PHtO002726; Wed, 12 Jan 2022 01:25:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20C1PHiG002725; Wed, 12 Jan 2022 01:25:17 GMT (envelope-from git) Date: Wed, 12 Jan 2022 01:25:17 GMT Message-Id: <202201120125.20C1PHiG002725@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: 3ef0580b55ca - main - devel/gobject-introspection: unbreak build with Meson 0.61.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 3ef0580b55cacc092002fc78780503c966837523 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641950718; 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=2MgsIpuUX3p4oYv87bB3EjUoHC1dIuEhCQ3LnL0kYLM=; b=JG7HxU4fUw0pEkswa/5pHqhnW54x6kmTb13dp9odoctGqejxmoxWGbxOa40wwbMgHyBs35 4BX7b6QhYqRmdyFziZWJnOSkV3unlX7qKh8Rnu76i8mUC6vhuaH2/U0jGXiDAgnK3C/cKF 0bcDU29+zScfPmgY7UzhpcyHi2WmSO8LFbpii7GD+ROnEOuCq6QO2Taqc9oTEm+/5+LB3f 5lyqljPg1gYs3wR7TIEIqa88AicyYiHwzrHOFbag9E0LnFqOiSjwyKmctcgAUdJOPn67+z TMa3XGE/5lgzOhfkwHWwf+CSl8St+m60pZ1pL7haKReIg1r0ms5VUL14vwB+/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641950718; a=rsa-sha256; cv=none; b=UDWXDGgrDueoYDBRDAcDnkBupUM4ESlcXlalz4kKjNM+yFWc1Ki4IWqcbzRmUagIe4j+Vd sS++l0mq0VDORPdF64GXRFBPM218Oa14X6gTfJBRTNkHDm4q4tl/o3V3hiJ6qZG/ailVZC yUCjckPVzrbsSndUKtPKMgheSyOQpnzvGcMB6Gf+TqsGNwVvlXC8dgu/II8gDo0JU+EfKH G2MbbWxgY6OBBCrC1v2z3ZVS/eq355NQZCpnMGm1L43Li8bimbHOw/b4qcKG3fZTMoWyV6 IICz/owwZPssjA9GBZ9hEOUV54LFwj28/Ek9p7VhLBCIMCSbVjeZ1QNRfwv+ow== 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=3ef0580b55cacc092002fc78780503c966837523 commit 3ef0580b55cacc092002fc78780503c966837523 Author: Jan Beich AuthorDate: 2022-01-12 01:14:29 +0000 Commit: Jan Beich CommitDate: 2022-01-12 01:24:59 +0000 devel/gobject-introspection: unbreak build with Meson 0.61.0 giscanner/meson.build:58:0: ERROR: File doctemplates does not exist. PR: 260943 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/1e5d7f212246 --- devel/gobject-introspection/Makefile | 6 ++++++ devel/gobject-introspection/distinfo | 2 ++ 2 files changed, 8 insertions(+) diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 2f8c09869d7a..a1739fa17b1c 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -7,6 +7,9 @@ CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome +PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/ +PATCHFILES+= effb1e09dee2.patch:-p1 # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/305 + MAINTAINER= desktop@FreeBSD.org COMMENT= Generate interface introspection data for GObject libraries @@ -36,4 +39,7 @@ post-stage: @${PYTHON_CMD} -O -m compileall -d ${PREFIX}/lib/${PORTNAME} \ "${STAGEDIR}${PREFIX}/lib/${PORTNAME}" +post-install: + @${RM} ${STAGEDIR}${PREFIX}/lib/gobject-introspection/giscanner/doctemplates/*/meson.build* + .include diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index fed07838303d..dceff007a506 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1636923576 SHA256 (gnome/gobject-introspection-1.70.0.tar.xz) = 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a SIZE (gnome/gobject-introspection-1.70.0.tar.xz) = 1029372 +SHA256 (gnome/effb1e09dee2.patch) = a3b6b4a834f9218718733f2da1e66efa73e3dd2c12e76b0d826c60cec9a5a784 +SIZE (gnome/effb1e09dee2.patch) = 6495