mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-05 11:35:01 +00:00
Code Issues Releases Activity

x11-toolkits/pango: fix DOCS option

Browse Source 
- 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
This commit is contained in:
Sergey Akhmatov 2021-05-27 10:04:52 +02:00 committed by Tobias C. Berner
parent 247067631c
commit 10b57e8488
3 changed files with 83 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11-toolkits/pango/Makefile
View File

@ -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

14
x11-toolkits/pango/files/patch-meson.build Normal file
View File

@ -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')

134
x11-toolkits/pango/pkg-plist
View File

@ -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