From nobody Mon Mar 20 13:14:29 2023 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 4PgFZG2CFgz40hbt; Mon, 20 Mar 2023 13:14:30 +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 4PgFZG1Lqrz3LcK; Mon, 20 Mar 2023 13:14:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679318070; 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=0EdtOexsEYq6wim0LjoYWdDbrim3G9G3+8q6gnvZ5H4=; b=A/3PJYAtC5sjaFfoopc8M30/cWQPcQnzWemZIc5bxXeD1hGsDx4DX3PWMQWZzcR0Y1Cd1I JGGBx8cMW0dGUkDprBJTppNSoNtIeE+8sMzgeaQttJJh49W6E3k6kJNjBqBwWuHwPAbbvc GVJ9zan9A/0CX4sb+tR2lb33W0Ru+V4LtIvcbacH4c8Lra8Zy73I87x69sDGTJP6q5lm/L mTZEfoXcTJO3sKVKFtCHTmLFx5xK8wXxeMhs2asZQ8L2iDzFsaLbfF9RR4j0uPOSLM5qMM 1BsnYBg14DJdcpp8sYZj2yPGBKk/o0sgmtxBVeB6HM1Ch20keLf6KItnql8yaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679318070; 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=0EdtOexsEYq6wim0LjoYWdDbrim3G9G3+8q6gnvZ5H4=; b=bqs7Sr6NHbMRXI1DoOnA6Y2Q3cXJI2jk0Mv7gZajUx0W0EclG//4K9yBYktOHdHNjb5yjr uJyC9Vjmf1GTYGu1IhRzwjC5K3F5eOKgJ+sSzfrT0P0YTkvsCgoFuC7k9n3gBHIZEigrZl tec5m9sYjh17GABtzAl1HyqPk68PzMlE17dudVtRzluWwDxhbab3o+7eTO0BBsvVAePEJg vJWhOCjMnEL4x9UuZWAULRC4N5fhEs3zl8c6zK0gnK8AS64QXX76fzO6dDF3FZ+9+52exY vFMkDCJBRxkVRBbmpvifqX/ItuLpihZsej1pjZaR0pHTbyTkW7J2QIohKvXgdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679318070; a=rsa-sha256; cv=none; b=IpD5yItWskv0tgU94c0Pp1Qalejv3bKBiZylXICa4ZuFEK4H6q0ncqD8F4YLcaKrvkzcUz rcAQuFpELMsUM0nh3NuQ7qIlMPplITm304twYoLufvcu7BmH4BadHwwbKbNApM+YusJ9i/ Gf/GQ6kmI2ZA0ZSbk1HDxcF+LjkHNAoEf/2iuXDLm6tklV4NlzcGQxSe1oNUOADpI2KMr8 cyMd04hVEqZH5smv6+fWhEiKeGcThzbVtdwRgGIBpJPH5t6ICijbXc/mPOLWobnu78nLWG JeXdjTSAUAOjZEB5RJ1DitmFgvqorOrUwJnCHlmCIRAYxC53NoyJ/s/6HiaxmA== 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 4PgFZG0PYJzWnm; Mon, 20 Mar 2023 13:14:30 +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 32KDETd7041157; Mon, 20 Mar 2023 13:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDETwg041156; Mon, 20 Mar 2023 13:14:29 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:14:29 GMT Message-Id: <202303201314.32KDETwg041156@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: 7847fd718848 - main - x11-toolkits/gtk40: explicitly enable introspection 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: 7847fd71884884acfa8b9cee61f11ffa767e9ea6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7847fd71884884acfa8b9cee61f11ffa767e9ea6 commit 7847fd71884884acfa8b9cee61f11ffa767e9ea6 Author: Jan Beich AuthorDate: 2023-03-20 13:09:43 +0000 Commit: Jan Beich CommitDate: 2023-03-20 13:14:09 +0000 x11-toolkits/gtk40: explicitly enable introspection Upstream prefers misleading "auto" instead of "disabled" by default even if not consistent with other "auto" uses in Gtk's meson_options.txt --- x11-toolkits/gtk40/Makefile | 2 +- x11-toolkits/gtk40/files/patch-meson.build | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile index f8175c06e50b..be5430f33c43 100644 --- a/x11-toolkits/gtk40/Makefile +++ b/x11-toolkits/gtk40/Makefile @@ -32,7 +32,7 @@ USE_LDCONFIG= yes USE_PERL5= build USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango \ librsvg2:run -MESON_ARGS= -Dbuild-testsuite=false +MESON_ARGS= -Dintrospection=enabled -Dbuild-testsuite=false LDFLAGS+= -lexecinfo BINARY_ALIAS= python3=${PYTHON_CMD} diff --git a/x11-toolkits/gtk40/files/patch-meson.build b/x11-toolkits/gtk40/files/patch-meson.build deleted file mode 100644 index c93d9bf8c833..000000000000 --- a/x11-toolkits/gtk40/files/patch-meson.build +++ /dev/null @@ -1,14 +0,0 @@ -https://gitlab.gnome.org/GNOME/gtk/-/issues/5633 - ---- meson.build.orig 2023-03-14 11:50:49 UTC -+++ meson.build -@@ -740,8 +740,7 @@ endif - error('Introspection enabled, but g-ir-scanner not found.') - endif - --build_gir = gir.found() and (get_option('introspection').enabled() or -- (get_option('introspection').allowed() and get_option('gtk_doc'))) -+build_gir = gir.found() and get_option('introspection').allowed() - - project_build_root = meson.current_build_dir() -