[gentoo-commits] repo/gentoo:master commit in: mate-base/caja/files/, mate-base/caja/

[Adam Feldman]

commit:     bce3e9d6ae2888ed328003fddb2c1dd8d88b79cf
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  8 02:20:29 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 20:32:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bce3e9d6

mate-base/caja: Fix libselinux automagic

Bug: https://bugs.gentoo.org/637414
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 mate-base/caja/caja-1.24.0-r2.ebuild               | 98 ++++++++++++++++++++++
 .../caja-1.24.0-fix-selinux-automagic-dep.patch    | 46 ++++++++++
 2 files changed, 144 insertions(+)

diff --git a/mate-base/caja/caja-1.24.0-r2.ebuild b/mate-base/caja/caja-1.24.0-r2.ebuild
new file mode 100644
index 00000000000..e77b01f49dd
--- /dev/null
+++ b/mate-base/caja/caja-1.24.0-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Caja file manager for the MATE desktop"
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="+introspection +mate packagekit selinux xmp"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.58.1:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.17.3:0
+	>=media-libs/libexif-0.6.14:0
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/libnotify-0.7.0:0
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	>=x11-libs/pango-1.1.2
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	packagekit? ( app-admin/packagekit-base )
+	selinux? ( sys-libs/libselinux )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!mate-base/mate-file-manager
+"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5:=
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
+
+# TODO: Test fails because Caja is not merged yet:
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-1.24.0-fix-selinux-automagic-dep.patch" )
+
+src_prepare() {
+	# Remove unnecessary CFLAGS.
+	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
+		configure.ac eel/Makefile.am || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable selinux) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog "Caja can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview."
+}

diff --git a/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch b/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
new file mode 100644
index 00000000000..ffc0a2903d1
--- /dev/null
+++ b/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index 052b4d0..12c818d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -169,17 +169,24 @@ dnl ****************************
+ dnl *** Check for libselinux ***
+ dnl ****************************
+ 
++AC_ARG_ENABLE(selinux,
++    [AC_HELP_STRING([--enable-selinux],
++                    [build with selinux support])])
++AM_CONDITIONAL([ENABLE_SELINUX],[test "x$enable_selinux" = "xyes"])
++
+ SELINUX_LIBS=
+ msg_selinux=no
+-AC_CHECK_LIB(selinux, is_selinux_enabled,
+-   [AC_CHECK_HEADERS(selinux/selinux.h,
+-     [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
+-       [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
+-        SELINUX_LIBS="-lselinux"
+-        msg_selinux=yes])
+-     ])
+-   ])
+-AC_SUBST(SELINUX_LIBS)
++if test "x$enable_selinux" != "xno"; then
++    AC_CHECK_LIB(selinux, is_selinux_enabled,
++       [AC_CHECK_HEADERS(selinux/selinux.h,
++         [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
++           [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
++            SELINUX_LIBS="-lselinux"
++            msg_selinux=yes])
++         ])
++       ])
++    AC_SUBST(SELINUX_LIBS)
++fi
+ 
+ 
+ AC_ARG_ENABLE(empty_view,
+@@ -353,6 +360,7 @@ caja-$VERSION:
+     warning flags:                ${WARNING_CFLAGS}
+     xmp support:                  $msg_xmp
+     PackageKit support:           $msg_packagekit
++    SELinux support:              $msg_selinux
+     Self check:                   $msg_self_check
+ 
+     caja-extension documentation: ${enable_gtk_doc}