Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / wireplumber


Commits:
0bac8120 by Jan Alexander Steffens (heftig) at 2024-05-23T04:10:52+02:00
0.5.2-2: Backport crash fix

Fixes: 
https://gitlab.archlinux.org/archlinux/packaging/packages/wireplumber/-/issues/4

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- − sphinx-no-parallel.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = wireplumber
        pkgdesc = Session / policy manager implementation for PipeWire
        pkgver = 0.5.2
-       pkgrel = 1
+       pkgrel = 2
        url = https://pipewire.pages.freedesktop.org/wireplumber/
        arch = x86_64
        license = MIT
@@ -24,13 +24,11 @@ pkgbase = wireplumber
        makedepends = systemd
        makedepends = systemd-libs
        source = 
git+https://gitlab.freedesktop.org/pipewire/wireplumber.git#tag=0.5.2
-       source = sphinx-no-parallel.patch
        b2sums = 
27cd96b6f8d7f3be588074db2e99e1ec253d5fe8f9098b7080699d9bef6beb258bd9a4b12a00ebe637078613c3363496d71f2ef344c91284b8ef5f71e4d24736
-       b2sums = 
771ea16e3c5c5ebcce0b451a2e9aa5d4e4098191a6a23c42350116d37fc756631cff71a5d3fb1226ed944e9953736d8a220187627cfe36ec453315c20b1032c8
 
 pkgname = wireplumber
        install = wireplumber.install
-       depends = libwireplumber=0.5.2-1
+       depends = libwireplumber=0.5.2-2
        depends = gcc-libs
        depends = glibc
        depends = libglib-2.0.so


=====================================
PKGBUILD
=====================================
@@ -8,7 +8,7 @@ pkgname=(
   wireplumber-docs
 )
 pkgver=0.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Session / policy manager implementation for PipeWire"
 url="https://pipewire.pages.freedesktop.org/wireplumber/";
 arch=(x86_64)
@@ -35,17 +35,18 @@ makedepends=(
 checkdepends=(pipewire-audio)
 source=(
   "git+https://gitlab.freedesktop.org/pipewire/$pkgbase.git#tag=$pkgver";
-  sphinx-no-parallel.patch
 )
-b2sums=('27cd96b6f8d7f3be588074db2e99e1ec253d5fe8f9098b7080699d9bef6beb258bd9a4b12a00ebe637078613c3363496d71f2ef344c91284b8ef5f71e4d24736'
-        
'771ea16e3c5c5ebcce0b451a2e9aa5d4e4098191a6a23c42350116d37fc756631cff71a5d3fb1226ed944e9953736d8a220187627cfe36ec453315c20b1032c8')
+b2sums=('27cd96b6f8d7f3be588074db2e99e1ec253d5fe8f9098b7080699d9bef6beb258bd9a4b12a00ebe637078613c3363496d71f2ef344c91284b8ef5f71e4d24736')
 
 prepare() {
   cd $pkgbase
 
-  # Parallel Sphinx is unreproducible; should be fixed in Sphinx 7.3+:
-  # 
https://github.com/sphinx-doc/sphinx/commit/8e768e6c231c67caadecd5b43c20eb1f3a594079
-  git apply -3 ../sphinx-no-parallel.patch
+  # Backport crash fix for aborted links
+  # 
https://gitlab.archlinux.org/archlinux/packaging/packages/wireplumber/-/issues/4
+  # https://gitlab.freedesktop.org/pipewire/wireplumber/-/merge_requests/644
+  git cherry-pick -n 1ddfbc532c87fb0ad18e128d574e5c3b72089416 \
+                     89b6766cd6a64c8d52512ae2c091de3f5aae034f \
+                     4ed51791e03b63adbaf792564aa201a6d71a1050
 }
 
 build() {


=====================================
sphinx-no-parallel.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/docs/meson.build b/docs/meson.build
-index f24ae6dd..19264cf0 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -86,7 +86,7 @@ if build_doc
-     command: [sphinx_p,
-       '-q',                       # quiet
-       '-E',                       # rebuild from scratch
--      '-j', 'auto',               # parallel build
-+      '-j', '1',                  # non-parallel build
-       '-d', '@PRIVATE_DIR@',      # doctrees dir
-       '-c', '@OUTDIR@',           # conf.py dir
-       '@CURRENT_SOURCE_DIR@/rst', # source dir



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/wireplumber/-/commit/0bac812091efc23c9ef315e1d3b7821f2c7ddf4e

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/wireplumber/-/commit/0bac812091efc23c9ef315e1d3b7821f2c7ddf4e
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to