pool/gnome-desktop
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 521737 from GNOME:Next

Browse Source 
- Add gnome-desktop-no-usr-merge.patch: Also link /lib and /lib64
  into the bubblewrap container, as we do not (yet) have all the
  libs in /usr.
- Add bubblewrap dependency to libgnome-desktop-3-12.

OBS-URL: https://build.opensuse.org/request/show/521737
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=240
This commit is contained in:
Dominique Leuenberger 2017-09-06 19:39:50 +00:00 committed by Git OBS Bridge
parent 36fc4efc0b
commit c916011836
3 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnome-desktop-no-usr-merge.patch Normal file
View File

@ -0,0 +1,35 @@
From 9761561a3bc9dc8665e5f5aca7f7177429f87be2 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 2 Sep 2017 00:05:23 +0200
Subject: [PATCH] thumbnailer: also add /lib(64)? to bwrap's link-mounted
directory list
As not all distros have libs moves from /lib(64)? to /usr/lib(64), we need
to also bind-mount those directories, or the thumbnailers will fail to load
the required libraries.
https://bugzilla.gnome.org/show_bug.cgi?id=787072
---
libgnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
index 52dbf7b8..89ad5c3b 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
@@ -506,10 +506,10 @@ add_bwrap (GPtrArray *array,
add_args (array,
"bwrap",
"--ro-bind", "/usr", "/usr",
+ "--ro-bind", "/lib", "/lib",
+ "--ro-bind", "/lib64", "/lib64",
"--proc", "/proc",
"--dev", "/dev",
- "--symlink", "usr/lib", "/lib",
- "--symlink", "usr/lib64", "/lib64",
"--symlink", "usr/bin", "/bin",
"--symlink", "usr/sbin", "/sbin",
"--chdir", "/",
--
2.14.0

8
gnome-desktop.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 1 21:57:22 UTC 2017 - dimstar@opensuse.org
- Add gnome-desktop-no-usr-merge.patch: Also link /lib and /lib64
into the bubblewrap container, as we do not (yet) have all the
libs in /usr.
- Add bubblewrap dependency to libgnome-desktop-3-12.
-------------------------------------------------------------------
Wed Aug 23 12:37:42 UTC 2017 - zaitor@opensuse.org

17
gnome-desktop.spec
View File

@ -17,7 +17,6 @@
%define IS_DEFAULT_GNOME_DESKTOP 1
Name: gnome-desktop
Version: 3.25.91.1
Release: 0
@ -27,6 +26,8 @@ Group: System/GUI/GNOME
Url: http://www.gnome.org
Source: https://download.gnome.org/sources/gnome-desktop/3.25/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM gnome-desktop-no-usr-merge.patch bgo#787072 dimstar@opensuse.org -- Also consider /lib(64)? for the bubblewrap
Patch0: gnome-desktop-no-usr-merge.patch
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel
BuildRequires: intltool
@ -48,13 +49,11 @@ BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: gnome-common
BuildRequires: gtk-doc
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This package contains the desktop-wide files.
%if %IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS}
%package -n gnome-version
Summary: GNOME version
Group: System/GUI/GNOME
@ -80,6 +79,8 @@ Group: System/GUI/GNOME
Requires: gsettings-desktop-schemas
# Data files for libgnome-desktop, split in an own package for SLPP compliancy
Requires: libgnome-desktop-3_0-common >= %{version}
# the library calls out to bwrap in order to fire up thumbnailers in a secure container
Requires: bubblewrap
Recommends: %{name}-lang
Provides: %{name} = %{version}
%if %IS_DEFAULT_GNOME_DESKTOP
@ -107,9 +108,9 @@ libgnome-desktop.
Summary: The GNOME Desktop API Library -- Development Files
Group: Development/Libraries/GNOME
Requires: libgnome-desktop-3-12 = %{version}
Requires: typelib-1_0-GnomeDesktop-3_0 = %{version}
# Needed as /usr/include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h includes X11/extensions/XKBrules.h
Requires: libxkbfile-devel
Requires: typelib-1_0-GnomeDesktop-3_0 = %{version}
%if %IS_DEFAULT_GNOME_DESKTOP
Provides: %{name}-devel = %{version}
Obsoletes: %{name}-devel < %{version}
@ -123,8 +124,10 @@ on the desktop, but that cannot live in the platform for various
reasons.
%lang_package
%prep
%setup -q
%patch0 -p1
%if !0%{?is_opensuse}
translation-update-upstream
%endif
@ -152,12 +155,9 @@ make %{?_smp_mflags}
%if ! (%IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS})
rm %{buildroot}%{_datadir}/gnome/gnome-version.xml
%endif
%{__rm} -vf %{buildroot}%{_libdir}/*.la
rm -vf %{buildroot}%{_libdir}/*.la
%fdupes %{buildroot}
%clean
rm -rf %{buildroot}
%post -n libgnome-desktop-3-12 -p /sbin/ldconfig
%postun -n libgnome-desktop-3-12 -p /sbin/ldconfig
@ -189,7 +189,6 @@ rm -rf %{buildroot}
%files lang -f %{name}-3.0.lang
%if %IS_DEFAULT_GNOME_DESKTOP || 0%{?BUILD_FROM_VCS}
%files -n gnome-version
%defattr (-, root, root)
%dir %{_datadir}/gnome