From owner-dev-commits-ports-main@freebsd.org Thu May 27 19:37:19 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6CE806436FD; Thu, 27 May 2021 19:37:19 +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 4FrdPW2cQ1z4knr; Thu, 27 May 2021 19:37:19 +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 41DFA1C2A; Thu, 27 May 2021 19:37:19 +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 14RJbJtB091782; Thu, 27 May 2021 19:37:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14RJbJfI091781; Thu, 27 May 2021 19:37:19 GMT (envelope-from git) Date: Thu, 27 May 2021 19:37:19 GMT Message-Id: <202105271937.14RJbJfI091781@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 10b57e848816 - main - x11-toolkits/pango: fix DOCS option MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10b57e848816a9dc7030d46167917dfff0b6106d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 19:37:19 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=10b57e848816a9dc7030d46167917dfff0b6106d commit 10b57e848816a9dc7030d46167917dfff0b6106d Author: Sergey Akhmatov AuthorDate: 2021-05-27 08:04:52 +0000 Commit: Tobias C. Berner CommitDate: 2021-05-27 19:36:01 +0000 x11-toolkits/pango: fix DOCS option - Disable the bundled gi-docgen, when gi-docgen is not installed, a fallback bundled version of it could be built when python3 is found. PR: 256161 Reported by: tech-lists@zyxst.net Pointy hat: nc --- x11-toolkits/pango/Makefile | 4 +- x11-toolkits/pango/files/patch-meson.build | 14 +++ x11-toolkits/pango/pkg-plist | 134 ++++++++++++++--------------- 3 files changed, 83 insertions(+), 69 deletions(-) diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index c7c2fb01efee..71bd1618feef 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \ PORTSCOUT= limitw:1,even -USES= compiler:c11 gettext gnome localbase meson pkgconfig tar:xz +USES= compiler:c11 gettext gnome localbase meson pkgconfig python:env tar:xz USE_LDCONFIG= yes USE_GNOME= cairo glib20 introspection:build @@ -38,7 +38,7 @@ OPTIONS_DEFINE= X11 DOCS OPTIONS_DEFAULT=X11 DOCS_MESON_TRUE= gtk_doc -DOCS_BUILD_DEPENDS= gi-docgen>=0:textproc/gi-docgen +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gi-docgen>=0:textproc/gi-docgen X11_MESON_ENABLED= xft X11_USES= xorg diff --git a/x11-toolkits/pango/files/patch-meson.build b/x11-toolkits/pango/files/patch-meson.build new file mode 100644 index 000000000000..031cac621b0a --- /dev/null +++ b/x11-toolkits/pango/files/patch-meson.build @@ -0,0 +1,14 @@ +Disable the fallback on subprojects/gi-docgen -- if py-docgen is not found +on the system, the shipped fallback in 'subprojects' would be tried. This is +unwanted behaviour. + +--- meson.build.orig 2021-05-27 18:22:12 UTC ++++ meson.build +@@ -585,7 +585,6 @@ pango_conf.set('HAVE_SYSPROF', libsysprof_capture_dep. + pango_deps += libsysprof_capture_dep + + gidocgen_dep = dependency('gi-docgen', version: '>= 2021.1', +- fallback: ['gi-docgen', 'dummy_dep'], + required: get_option('gtk_doc')) + + gnome = import('gnome') diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 6b1b0112ee05..39e9c295543a 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -921,70 +921,70 @@ share/man/man1/pango-view.1.gz %%PORTDOCS%%%%DOCSDIR%%/reference/PangoOT/style.css %%PORTDOCS%%%%DOCSDIR%%/reference/PangoOT/type_func.Info.get.html %%PORTDOCS%%%%DOCSDIR%%/reference/PangoOT/type_func.Ruleset.get_for_description.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/PangoXft.devhelp2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Black.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Black.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-BlackItalic.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-BlackItalic.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Bold.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Bold.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-BoldItalic.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-BoldItalic.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Medium.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Medium.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-MediumItalic.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-MediumItalic.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Regular.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Regular.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Bold.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Bold.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-BoldItalic.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-BoldItalic.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Italic.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Italic.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Medium.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Medium.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-MediumItalic.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-MediumItalic.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Regular.woff -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Regular.woff2 -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/callback.SubstituteFunc.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/class.Font.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/class.FontMap.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/class.Renderer.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/classes_hierarchy.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/ctor.Renderer.new.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/fonts.css -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.get_context.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.get_font_map.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.picture_render.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.render.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.render_layout.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.render_layout_line.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.render_transformed.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.set_default_substitute.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.shutdown_display.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.substitute_changed.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/fzy.js -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/go-up-symbolic.png -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/index.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/index.json -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/main.js -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.get_display.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.get_glyph.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.get_unknown_glyph.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.has_char.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.lock_face.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.unlock_face.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Renderer.set_default_color.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Renderer.set_draw.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/pango-name.png -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/pango_xft.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/property.Renderer.display.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/property.Renderer.screen.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/pygment.css -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/search.js -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/style.css -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/type_func.Font.get_font.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/vfunc.Renderer.composite_glyphs.html -%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/vfunc.Renderer.composite_trapezoids.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/PangoXft.devhelp2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Black.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Black.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-BlackItalic.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-BlackItalic.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Bold.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Bold.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-BoldItalic.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-BoldItalic.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Medium.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Medium.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-MediumItalic.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-MediumItalic.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Regular.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatDisplay-Regular.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Bold.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Bold.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-BoldItalic.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-BoldItalic.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Italic.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Italic.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Medium.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Medium.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-MediumItalic.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-MediumItalic.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Regular.woff +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/RedHatText-Regular.woff2 +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/callback.SubstituteFunc.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/class.Font.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/class.FontMap.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/class.Renderer.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/classes_hierarchy.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/ctor.Renderer.new.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/fonts.css +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.get_context.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.get_font_map.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.picture_render.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.render.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.render_layout.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.render_layout_line.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.render_transformed.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.set_default_substitute.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.shutdown_display.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/func.substitute_changed.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/fzy.js +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/go-up-symbolic.png +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/index.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/index.json +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/main.js +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.get_display.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.get_glyph.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.get_unknown_glyph.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.has_char.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.lock_face.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Font.unlock_face.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Renderer.set_default_color.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/method.Renderer.set_draw.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/pango-name.png +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/pango_xft.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/property.Renderer.display.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/property.Renderer.screen.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/pygment.css +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/search.js +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/style.css +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/type_func.Font.get_font.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/vfunc.Renderer.composite_glyphs.html +%%X11%%%%PORTDOCS%%%%DOCSDIR%%/reference/PangoXft/vfunc.Renderer.composite_trapezoids.html