public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/cinnamon-desktop] rawhide: Fix non-deterministic bubblewrap sandbox support
@ 2026-07-25 17:46 Michal Schorm
  0 siblings, 0 replies; only message in thread
From: Michal Schorm @ 2026-07-25 17:46 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/cinnamon-desktop
            Branch : rawhide
            Commit : e7afadad1d6a11a34207f1e7c179ad142d0e9b7b
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-25T15:55:52+02:00
            Stats  : +5/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/cinnamon-desktop/c/e7afadad1d6a11a34207f1e7c179ad142d0e9b7b?branch=rawhide

            Log:
            Fix non-deterministic bubblewrap sandbox support

The bubblewrap meson option (type: feature, default: auto) depends on
'libseccomp' and 'fontconfig' being present in the buildroot. Without
explicit BuildRequires for these, bubblewrap support was silently
enabled or disabled depending on the buildroot state.

'meson_options.txt' lines 8-11: option('bubblewrap', type: 'feature', value: 'auto')
https://github.com/linuxmint/cinnamon-desktop/blob/6.7.2-unstable/meson_options.txt#L8-L11

'meson.build' lines 51-61: bubblewrap/seccomp/fontconfig dependency block
https://github.com/linuxmint/cinnamon-desktop/blob/6.7.2-unstable/meson.build#L51-L61

'meson.build' line 59: dependency('libseccomp', required: bwrap_opt)
https://github.com/linuxmint/cinnamon-desktop/blob/6.7.2-unstable/meson.build#L59

'meson.build' line 60: dependency('fontconfig', required: bwrap_opt)
https://github.com/linuxmint/cinnamon-desktop/blob/6.7.2-unstable/meson.build#L60

'meson.build' line 52: host_machine.cpu_family() in ['x86_64', 'aarch64']
https://github.com/linuxmint/cinnamon-desktop/blob/6.7.2-unstable/meson.build#L52

Add 'pkgconfig(libseccomp)' and 'pkgconfig(fontconfig)' to
BuildRequires and explicitly enable bubblewrap on x86_64 and aarch64
(the only architectures with a seccomp_extra_arches table upstream),
disable on all others.

This matches Linux Mint's 'debian/rules', which explicitly enables on
amd64/arm64 and disables elsewhere:
https://github.com/linuxmint/cinnamon-desktop/blob/6.7.2-unstable/debian/rules#L9-L14

LM also lists 'libseccomp-dev' unconditionally in 'debian/control'
Build-Depends:
https://github.com/linuxmint/cinnamon-desktop/blob/6.7.2-unstable/debian/control#L17

'fontconfig' is not listed by LM (likely pulled transitively), but we
add it for spec completeness.

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec
index b29df85..f63314b 100644
--- a/cinnamon-desktop.spec
+++ b/cinnamon-desktop.spec
@@ -31,7 +31,9 @@ BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(glib-2.0)  >= %{glib2_version}
 BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(iso-codes)
+BuildRequires: pkgconfig(fontconfig)
 BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libseccomp)
 BuildRequires: pkgconfig(libsystemd)
 BuildRequires: pkgconfig(udev)
 BuildRequires: pkgconfig(x11)
@@ -64,7 +66,9 @@ libcinnamon-desktop.
 %build
 %meson \
  -Dalsa=true \
-%ifarch ppc64le s390x
+%ifarch x86_64 aarch64
+ -Dbubblewrap=enabled \
+%else
  -Dbubblewrap=disabled \
 %endif
  -Ddeprecation_warnings=false

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-25 17:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-25 17:46 [rpms/cinnamon-desktop] rawhide: Fix non-deterministic bubblewrap sandbox support Michal Schorm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox