Dylan Aïssi pushed to branch wip/daissi/enable-docs at X Strike Force / wayland / weston
Commits:
-
116ac817
by Dylan Aïssi at 2025-09-16T14:59:59+02:00
7 changed files:
- debian/changelog
- debian/control
- + debian/patches/Fix-sphinx-8-compatibility.patch
- + debian/patches/series
- debian/rules
- debian/salsa-ci.yml
- + debian/weston-doc.install
Changes:
| 1 | +weston (14.0.2-2) UNRELEASED; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Build Weston documentation and install it in weston-doc.
|
|
| 4 | + * salsa-ci: add jobs to test nodoc profile and cross-build.
|
|
| 5 | + |
|
| 6 | + -- Dylan Aïssi <daissi@debian.org> Tue, 16 Sep 2025 14:57:47 +0200
|
|
| 7 | + |
|
| 1 | 8 | weston (14.0.2-1) unstable; urgency=medium
|
| 2 | 9 | |
| 3 | 10 | * New upstream release.
|
| ... | ... | @@ -53,6 +53,10 @@ Build-Depends: debhelper-compat (= 13), |
| 53 | 53 | pkgconf,
|
| 54 | 54 | wayland-protocols (>= 1.33),
|
| 55 | 55 | xwayland
|
| 56 | +Build-Depends-Indep:
|
|
| 57 | + python3-breathe <!nodoc>,
|
|
| 58 | + python3-sphinx <!nodoc>,
|
|
| 59 | + python3-sphinx-rtd-theme <!nodoc>,
|
|
| 56 | 60 | Standards-Version: 4.7.2
|
| 57 | 61 | Vcs-Browser: https://salsa.debian.org/xorg-team/wayland/weston
|
| 58 | 62 | Vcs-Git: https://salsa.debian.org/xorg-team/wayland/weston.git
|
| ... | ... | @@ -90,6 +94,21 @@ Description: reference implementation of a wayland compositor (headers) |
| 90 | 94 | .
|
| 91 | 95 | This package includes the weston headers for plugin development.
|
| 92 | 96 | |
| 97 | +Package: weston-doc
|
|
| 98 | +Section: doc
|
|
| 99 | +Build-Profiles: <!nodoc>
|
|
| 100 | +Architecture: all
|
|
| 101 | +Multi-Arch: foreign
|
|
| 102 | +Depends: ${misc:Depends}
|
|
| 103 | +Description: reference implementation of a wayland compositor (doc)
|
|
| 104 | + Part of the Wayland project is also the Weston reference implementation
|
|
| 105 | + of a Wayland compositor. Weston can run as an X client or under Linux
|
|
| 106 | + KMS and ships with a few demo clients. The Weston compositor is a minimal
|
|
| 107 | + and fast compositor and is suitable for many embedded and mobile use
|
|
| 108 | + cases.
|
|
| 109 | + .
|
|
| 110 | + This package contains the Weston documentation.
|
|
| 111 | + |
|
| 93 | 112 | Package: libweston-14-0
|
| 94 | 113 | Architecture: linux-any
|
| 95 | 114 | Multi-Arch: same
|
| 1 | +Description: Fix compatibility with sphinx 8.x. Otherwise it FTBFS with:
|
|
| 2 | + ERROR: Invalid value `None` in intersphinx_mapping['https://docs.python.org/'].
|
|
| 3 | +Forwarded: not-needed
|
|
| 4 | +Origin: upstream, https://gitlab.freedesktop.org/wayland/weston/-/commit/a40c6380
|
|
| 5 | + |
|
| 6 | +--- a/doc/sphinx/conf.py.in
|
|
| 7 | ++++ b/doc/sphinx/conf.py.in
|
|
| 8 | +@@ -196,7 +196,7 @@
|
|
| 9 | + # -- Options for intersphinx extension ---------------------------------------
|
|
| 10 | +
|
|
| 11 | + # Example configuration for intersphinx: refer to the Python standard library.
|
|
| 12 | +-intersphinx_mapping = {'https://docs.python.org/3': None}
|
|
| 13 | ++intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
|
|
| 14 | +
|
|
| 15 | + # -- Options for todo extension ----------------------------------------------
|
|
| 16 | + |
| 1 | +Fix-sphinx-8-compatibility.patch |
| ... | ... | @@ -8,12 +8,19 @@ else |
| 8 | 8 | BACKEND_VNC=true
|
| 9 | 9 | endif
|
| 10 | 10 | |
| 11 | +ifeq (,$(filter weston-doc,$(shell dh_listpackages)))
|
|
| 12 | +CONFIGURE_FLAGS = -Ddoc=false
|
|
| 13 | +else
|
|
| 14 | +CONFIGURE_FLAGS = -Ddoc=true
|
|
| 15 | +endif
|
|
| 16 | + |
|
| 11 | 17 | override_dh_auto_configure:
|
| 12 | 18 | dh_auto_configure -- \
|
| 13 | 19 | -Dbackend-rdp=true \
|
| 14 | 20 | -Dbackend-vnc=$(BACKEND_VNC) \
|
| 15 | 21 | -Dscreenshare=true \
|
| 16 | - -Dsystemd=true
|
|
| 22 | + -Dsystemd=true \
|
|
| 23 | + $(CONFIGURE_FLAGS)
|
|
| 17 | 24 | |
| 18 | 25 | override_dh_auto_test:
|
| 19 | 26 | mkdir -p $(CURDIR)/debian/tmp/tmp/xdgruntimedir
|
| 1 | 1 | ---
|
| 2 | 2 | include:
|
| 3 | 3 | - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
|
| 4 | + |
|
| 5 | +variables:
|
|
| 6 | + SALSA_CI_DISABLE_CROSSBUILD_ARM64: 0
|
|
| 7 | + SALSA_CI_ENABLE_BUILD_PACKAGE_PROFILES: 1
|
|
| 8 | + BUILD_PROFILES: nodoc |
| 1 | +usr/share/doc |