[packages/libxfce4windowing] - add missing files from git, fixed apidocs build, translated more options to meson
qboosh
qboosh at pld-linux.org
Sun Jun 1 22:35:15 CEST 2025
commit 263f44220f00a8f58fe5936a36bd10509e1455e4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Jun 1 22:34:33 2025 +0200
- add missing files from git, fixed apidocs build, translated more options to meson
libxfce4windowing-missing.patch | 144 ++++++++++++++++++++++++++++++++++++++++
libxfce4windowing.spec | 42 +++++-------
2 files changed, 159 insertions(+), 27 deletions(-)
---
diff --git a/libxfce4windowing.spec b/libxfce4windowing.spec
index a8e7709..343256a 100644
--- a/libxfce4windowing.spec
+++ b/libxfce4windowing.spec
@@ -1,6 +1,5 @@
#
# Conditional build:
-# TODO - Fix apidocs
%bcond_without apidocs # gtk-doc documentation
%bcond_with static_libs # static library
@@ -13,6 +12,7 @@ License: LGPL v2+
Group: Libraries
Source0: https://archive.xfce.org/src/xfce/libxfce4windowing/4.20/%{name}-%{version}.tar.bz2
# Source0-md5: 4d075b3ddd7be02d91041ff90aa049a3
+Patch0: %{name}-missing.patch
URL: https://docs.xfce.org/xfce/libxfce4windowing/start
BuildRequires: docbook-dtd412-xml
BuildRequires: gdk-pixbuf2-devel >= 2.42.8
@@ -21,16 +21,14 @@ BuildRequires: glib2-devel >= 1:2.72.0
BuildRequires: gobject-introspection-devel >= 1.72.0
BuildRequires: gtk+3-devel >= 3.24.10
%{?with_apidocs:BuildRequires: gtk-doc >= 1.30}
-BuildRequires: gtk-doc-automake >= 1.30
BuildRequires: libdisplay-info-devel >= 0.1.1
-BuildRequires: libtool >= 2:2.4
BuildRequires: libwnck-devel >= 3.14
BuildRequires: meson >= 0.57.0
BuildRequires: ninja
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: rpm-build >= 4.6
-BuildRequires: rpmbuild(macros) >= 1.98
+BuildRequires: rpmbuild(macros) >= 2.042
BuildRequires: wayland-devel >= 1.20
BuildRequires: wayland-protocols >= 1.25
BuildRequires: xfce4-dev-tools >= 4.20.0
@@ -107,17 +105,15 @@ Dokumentacja API libxfce4util.
%prep
%setup -q
+%patch -P0 -p1
%build
-#! configure \
-#! --enable-gtk-doc%{!?with_apidocs:=no} \
-#! --enable-wayland \
-#! --enable-x11 \
-#! --disable-silent-rules \
-#! %{?with_static_libs:--enable-static} \
-#! --with-html-dir=%{_gtkdocdir}
-
-%meson
+%meson \
+ %{!?with_static_libs:--default-library=shared} \
+ %{?with_apidocs:-Dgtk-doc=true} \
+ -Dwayland=enabled \
+ -Dx11=enabled
+
%meson_build
%install
@@ -125,14 +121,6 @@ rm -rf $RPM_BUILD_ROOT
%meson_install
-# removing docs
-#%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/libxfce4windowing}
-#%{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/libxfce4windowingui}
-
-# removing static libs
-%{!?with_static_libs:rm -rf $RPM_BUILD_ROOT%{_libdir}/libxfce4windowing-0.a}
-%{!?with_static_libs:rm -rf $RPM_BUILD_ROOT%{_libdir}/libxfce4windowingui-0.a}
-
# not supported by glibc (as of 2.32)
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
@@ -173,9 +161,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libxfce4windowingui-0.a
%endif
-#%if %{with apidocs}
-#%files apidocs
-#%defattr(644,root,root,755)
-#%{_gtkdocdir}/libxfce4windowing
-#%{_gtkdocdir}/libxfce4windowingui
-#%endif
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libxfce4windowing-0
+%{_gtkdocdir}/libxfce4windowingui-0
+%endif
diff --git a/libxfce4windowing-missing.patch b/libxfce4windowing-missing.patch
new file mode 100644
index 0000000..0268d36
--- /dev/null
+++ b/libxfce4windowing-missing.patch
@@ -0,0 +1,144 @@
+--- libxfce4windowing-4.20.3/docs/reference/libxfce4windowing/libxfce4windowing-docs.xml.in.orig 1970-01-01 01:00:00.000000000 +0100
++++ libxfce4windowing-4.20.3/docs/reference/libxfce4windowing/libxfce4windowing-docs.xml.in 1970-01-01 01:00:00.000000000 +0100
+@@ -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:
++-->
+--- libxfce4windowing-4.20.3/docs/reference/libxfce4windowingui/libxfce4windowingui-docs.xml.in.orig 1970-01-01 01:00:00.000000000 +0100
++++ libxfce4windowing-4.20.3/docs/reference/libxfce4windowingui/libxfce4windowingui-docs.xml.in 1970-01-01 01:00:00.000000000 +0100
+@@ -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>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libxfce4windowing.git/commitdiff/263f44220f00a8f58fe5936a36bd10509e1455e4
More information about the pld-cvs-commit
mailing list