git: 19bd125b7990 - main - x11/libxfce4windowing: Update to 4.20.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Mon, 18 Aug 2025 14:48:18 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=19bd125b7990d5be2e0cf3ed5a43f786f40cd256

commit 19bd125b7990d5be2e0cf3ed5a43f786f40cd256
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2025-08-18 14:36:49 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-08-18 14:48:12 +0000

    x11/libxfce4windowing: Update to 4.20.4
    
    - Fix DOCS option importing missing distribution files from upstream [1]
    - Add VAPI option for vala bindings
    
    [1] Issue reported upstream here:
    https://gitlab.xfce.org/xfce/libxfce4windowing/-/issues/51
---
 x11/libxfce4windowing/Makefile                     |  23 +++--
 x11/libxfce4windowing/distinfo                     |   6 +-
 .../files/libxfce4windowing-docs.xml.in            |  83 +++++++++++++++++
 .../files/libxfce4windowingui-docs.xml.in          |  55 +++++++++++
 x11/libxfce4windowing/pkg-plist                    | 101 +++++++++++----------
 5 files changed, 208 insertions(+), 60 deletions(-)

diff --git a/x11/libxfce4windowing/Makefile b/x11/libxfce4windowing/Makefile
index 995e7ea970b1..440db67f7047 100644
--- a/x11/libxfce4windowing/Makefile
+++ b/x11/libxfce4windowing/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	libxfce4windowing
-DISTVERSION=	4.20.3
-PORTREVISION=	1
+DISTVERSION=	4.20.4
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
@@ -21,28 +20,34 @@ USE_XFCE=	xdt
 USE_XORG=	x11 xrandr
 SHEBANG_FILES=	xdt-gen-visibility
 
-MESON_ARGS=	-Dgtk-doc=false \
-		-Dx11=enabled
+MESON_ARGS=	-Dx11=enabled
 
-OPTIONS_DEFINE=		GIR NLS WAYLAND
-OPTIONS_DEFAULT=	GIR WAYLAND
+OPTIONS_DEFINE=		DOCS GIR NLS VAPI WAYLAND
+OPTIONS_DEFAULT=	GIR VAPI WAYLAND
 OPTIONS_SUB=		yes
 
 GIR_DESC=	GObject Introspection support
 
-# At present gtk-doc is broken due to missing files in the distribution
-#DOCS_MESON_TRUE=	gtk-doc
+DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
+DOCS_MESON_TRUE=	gtk-doc
 
 GIR_USE=	GNOME=introspection:build
 GIR_MESON_TRUE=	introspection
 
 NLS_USES=	gettext-runtime
 
+VAPI_USES=		vala:build
+VAPI_MESON_ENABLED=	vala
+
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
-WAYLAND_RUN_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+WAYLAND_RUN_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_MESON_ENABLED=	wayland
 
+post-patch:
+	@${CP} ${FILESDIR}/libxfce4windowing-docs.xml.in ${WRKSRC}/docs/reference/libxfce4windowing
+	@${CP} ${FILESDIR}/libxfce4windowingui-docs.xml.in ${WRKSRC}/docs/reference/libxfce4windowingui
+
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e "/^subdir('po')/d" ${WRKSRC}/meson.build
 
diff --git a/x11/libxfce4windowing/distinfo b/x11/libxfce4windowing/distinfo
index 451f0cc0adff..935d2a77c2bf 100644
--- a/x11/libxfce4windowing/distinfo
+++ b/x11/libxfce4windowing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747849083
-SHA256 (xfce4/libxfce4windowing-4.20.3.tar.bz2) = df2419a6bd960c0bfac3307eff593050857524642597eb35a26fb4f8261a017b
-SIZE (xfce4/libxfce4windowing-4.20.3.tar.bz2) = 605237
+TIMESTAMP = 1755161257
+SHA256 (xfce4/libxfce4windowing-4.20.4.tar.bz2) = db467f9ac4bac8f1c4e82667902841fc0957af835c29603d6659a57440b6f8cb
+SIZE (xfce4/libxfce4windowing-4.20.4.tar.bz2) = 614876
diff --git a/x11/libxfce4windowing/files/libxfce4windowing-docs.xml.in b/x11/libxfce4windowing/files/libxfce4windowing-docs.xml.in
new file mode 100644
index 000000000000..c44e2cc4c942
--- /dev/null
+++ b/x11/libxfce4windowing/files/libxfce4windowing-docs.xml.in
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                      "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+  %gtkdocentities;
+]>
+
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>&package_name; Reference Manual</title>
+    <releaseinfo>
+      For &package_string;.
+      The latest version of this documentation can be found on-line at
+      <ulink role="online-location" url="https://developer.xfce.org/&package_name;/index.html">https://developer.xfce.org/&package_name;/</ulink>.
+    </releaseinfo>
+    <copyright>
+      <year>@COPYRIGHT_YEAR@</year>
+      <holder>The libxfce4windowing contributors</holder>
+    </copyright>
+  </bookinfo>
+
+  <part id="libxfce4windowing-introduction">
+    <title>Introduction</title>
+    <para>
+      Libxfce4windowing abstracts over several windowing concepts between the X11 and Wayland display systems.
+    </para>
+  </part>
+
+  <part id="libxfce4windowing-utilities">
+    <title>Windowing Utilities</title>
+    <xi:include href="xml/libxfce4windowing-config.xml"/>
+    <xi:include href="xml/xfw-util.xml"/>
+  </part>
+
+  <part id="libxfce4windowing-core">
+    <title>Core Library Interface</title>
+    <xi:include href="xml/xfw-screen.xml"/>
+    <xi:include href="xml/xfw-seat.xml"/>
+    <xi:include href="xml/xfw-workspace-manager.xml"/>
+    <xi:include href="xml/xfw-workspace-group.xml"/>
+    <xi:include href="xml/xfw-workspace.xml"/>
+    <xi:include href="xml/xfw-window.xml"/>
+    <xi:include href="xml/xfw-application.xml"/>
+    <xi:include href="xml/xfw-monitor.xml"/>
+  </part>
+
+  <part id="libxfce4windowing-backend">
+    <title>Backend-Specific Interfaces</title>
+    <xi:include href="xml/xfw-x11.xml"/>
+  </part>
+
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-4-19-1">
+    <title>Index of new symbols in 4.19.1</title>
+    <xi:include href="xml/api-index-4.19.1.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-4-19-3">
+    <title>Index of new symbols in 4.19.3</title>
+    <xi:include href="xml/api-index-4.19.3.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-4-19-4">
+    <title>Index of new symbols in 4.19.4</title>
+    <xi:include href="xml/api-index-4.19.4.xml"><xi:fallback /></xi:include>
+  </index>
+  <!--
+  <index id="api-index-deprecated">
+    <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+  </index>
+  -->
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
+</book>
+
+<!--
+  vi:set ts=2 sw=2 et ai syntax=docbkxml:
+-->
diff --git a/x11/libxfce4windowing/files/libxfce4windowingui-docs.xml.in b/x11/libxfce4windowing/files/libxfce4windowingui-docs.xml.in
new file mode 100644
index 000000000000..e3cebad59e2c
--- /dev/null
+++ b/x11/libxfce4windowing/files/libxfce4windowingui-docs.xml.in
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+[
+  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+  %gtkdocentities;
+]>
+
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>&package_name; Reference Manual</title>
+    <releaseinfo>
+      for &package_string;.
+      The latest version of this documentation can be found on-line at
+      <ulink role="online-location" url="https://developer.xfcr.org/&package_name;/index.html">https://developer.xfce.org/&package_name;/</ulink>.
+    </releaseinfo>
+    <copyright>
+      <year>@COPYRIGHT_YEAR@</year>
+      <holder>The libxfce4windowing contributors</holder>
+    </copyright>
+  </bookinfo>
+
+  <part id="libxfce4windowingui-introduction">
+    <title>Introduction</title>
+    <para>
+      Libxfce4windowingui is a UI widget utility library that makes use of libxfce4windowing primitives.
+    </para>
+  </part>
+
+  <part id="libxfce4windowingui-utilities">
+    <title>Windowing Utilities</title>
+    <xi:include href="xml/libxfce4windowingui-config.xml"/>
+  </part>
+
+  <part id="libxfce4windowing-widgets">
+    <title>Widgets</title>
+    <xi:include href="xml/xfw-window-action-menu.xml"/>
+    <xi:include href="xml/xfw-window-list-menu.xml"/>
+  </part>
+
+  <index id="api-index-full">
+    <title>Index of all symbols</title>
+    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
+  </index>
+  <!--
+  <index id="api-index-deprecated">
+    <title>Index of deprecated symbols</title>
+    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+  </index>
+  -->
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+
+</book>
diff --git a/x11/libxfce4windowing/pkg-plist b/x11/libxfce4windowing/pkg-plist
index a49555e12982..df8892973d5e 100644
--- a/x11/libxfce4windowing/pkg-plist
+++ b/x11/libxfce4windowing/pkg-plist
@@ -27,54 +27,55 @@ libdata/pkgconfig/libxfce4windowing-x11-0.pc
 libdata/pkgconfig/libxfce4windowingui-0.pc
 %%GIR%%share/gir-1.0/Libxfce4windowing-0.0.gir
 %%GIR%%share/gir-1.0/Libxfce4windowingui-0.0.gir
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/XfwApplication.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/XfwMonitor.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/XfwScreen.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/XfwSeat.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/XfwWindow.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/XfwWorkspace.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/XfwWorkspaceGroup.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/XfwWorkspaceManager.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/annotation-glossary.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/api-index-4-19-1.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/api-index-4-19-3.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/api-index-4-19-4.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/api-index-full.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/home.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/index.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/left-insensitive.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/left.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/libxfce4windowing-Library-Configuration.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/libxfce4windowing-Utilities.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/libxfce4windowing-X11-Backend.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/libxfce4windowing-backend.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/libxfce4windowing-core.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/libxfce4windowing-introduction.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/libxfce4windowing-utilities.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/libxfce4windowing.devhelp2
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/right-insensitive.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/right.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/style.css
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/up-insensitive.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowing/up.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/XfwWindowActionMenu.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/XfwWindowListMenu.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/annotation-glossary.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/api-index-full.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/home.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/index.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/left-insensitive.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/left.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/libxfce4windowing-widgets.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/libxfce4windowingui-Library-Configuration.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/libxfce4windowingui-introduction.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/libxfce4windowingui-utilities.html
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/libxfce4windowingui.devhelp2
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/right-insensitive.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/right.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/style.css
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/up-insensitive.png
-@comment %%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui/up.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/XfwApplication.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/XfwMonitor.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/XfwScreen.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/XfwSeat.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/XfwWindow.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/XfwWorkspace.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/XfwWorkspaceGroup.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/XfwWorkspaceManager.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/api-index-4-19-1.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/api-index-4-19-3.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/api-index-4-19-4.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/home.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/index.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/left.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/libxfce4windowing-0.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/libxfce4windowing-Library-Configuration.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/libxfce4windowing-Utilities.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/libxfce4windowing-X11-Backend.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/libxfce4windowing-backend.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/libxfce4windowing-core.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/libxfce4windowing-introduction.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/libxfce4windowing-utilities.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/right.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/style.css
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowing-0/up.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/XfwWindowActionMenu.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/XfwWindowListMenu.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/annotation-glossary.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/home.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/index.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/left-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/left.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/libxfce4windowing-widgets.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/libxfce4windowingui-0.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/libxfce4windowingui-Library-Configuration.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/libxfce4windowingui-introduction.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/libxfce4windowingui-utilities.html
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/right-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/right.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/style.css
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/up-insensitive.png
+%%PORTDOCS%%share/gtk-doc/html/libxfce4windowingui-0/up.png
+%%NLS%%share/locale/ar/LC_MESSAGES/libxfce4windowing.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/libxfce4windowing.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/libxfce4windowing.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/libxfce4windowing.mo
@@ -118,3 +119,7 @@ libdata/pkgconfig/libxfce4windowingui-0.pc
 %%NLS%%share/locale/uk/LC_MESSAGES/libxfce4windowing.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4windowing.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4windowing.mo
+%%VAPI%%share/vala/vapi/libxfce4windowing-0.deps
+%%VAPI%%share/vala/vapi/libxfce4windowing-0.vapi
+%%VAPI%%share/vala/vapi/libxfce4windowingui-0.deps
+%%VAPI%%share/vala/vapi/libxfce4windowingui-0.vapi