commit: 8b53f1d94092e8fa279539f49222ea3ddd001177 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Fri Nov 16 17:24:22 2018 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Fri Nov 16 17:24:57 2018 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8b53f1d9
gnome-base/gnome-desktop: load ld.so.conf in sandbox Closes: https://bugs.gentoo.org/654096 Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> .../files/3.26.2-load-ld-so-cache.patch | 12 ++++ .../gnome-desktop/gnome-desktop-3.26.2-r1.ebuild | 64 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch b/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch new file mode 100644 index 00000000..ac81e1c7 --- /dev/null +++ b/gnome-base/gnome-desktop/files/3.26.2-load-ld-so-cache.patch @@ -0,0 +1,12 @@ +diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c +index 99d83ac..72f4459 100644 +--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c +@@ -508,6 +508,7 @@ add_bwrap (GPtrArray *array, + "--ro-bind", "/usr", "/usr", + "--ro-bind", "/lib", "/lib", + "--ro-bind", "/lib64", "/lib64", ++ "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", + "--proc", "/proc", + "--dev", "/dev", + "--symlink", "usr/bin", "/bin", diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild new file mode 100644 index 00000000..93c9caee --- /dev/null +++ b/gnome-base/gnome-desktop/gnome-desktop-3.26.2-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 virtualx + +DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" +HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"; + +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" +SLOT="3/12" # subslot = libgnome-desktop-3 soname version +IUSE="debug +introspection seccomp udev" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# cairo[X] needed for gnome-bg +# automagic dependency on seccomp +COMMON_DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.53.0:2[dbus] + >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] + >=x11-libs/gtk+-3.3.6:3[X,introspection?] + x11-libs/cairo:=[X] + x11-libs/libX11 + x11-misc/xkeyboard-config + >=gnome-base/gsettings-desktop-schemas-3.5.91 + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) + seccomp? ( sys-libs/libseccomp ) + udev? ( + sys-apps/hwids + virtual/libudev:= ) +" +RDEPEND="${COMMON_DEPEND} + !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.14 + >=dev-util/intltool-0.40.6 + dev-util/itstool + sys-devel/gettext + x11-base/xorg-proto + virtual/pkgconfig +" +# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto + +PATCHES=( + "${FILESDIR}"/${PV}-load-ld-so-cache.patch +) + +src_configure() { + gnome2_src_configure \ + --disable-static \ + --with-gnome-distributor=Gentoo \ + --enable-desktop-docs \ + $(usex debug --enable-debug=yes ' ') \ + $(use_enable debug debug-tools) \ + $(use_enable introspection) \ + $(use_enable udev) +} + +src_test() { + virtx emake check +}
