Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mate-base/caja/files/
Date: Sun, 11 Jul 2021 14:43:02
Message-Id: 1626014574.dfdb0ecc1aa82de108a760effb9bd1e483062335.conikost@gentoo
1 commit: dfdb0ecc1aa82de108a760effb9bd1e483062335
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Jul 11 11:33:56 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 11 14:42:54 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfdb0ecc
7
8 mate-base/caja: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/21598
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../caja-1.24.0-fix-selinux-automagic-dep.patch | 46 ----------------------
16 1 file changed, 46 deletions(-)
17
18 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
19 deleted file mode 100644
20 index ffc0a2903d1..00000000000
21 --- a/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
22 +++ /dev/null
23 @@ -1,46 +0,0 @@
24 -diff --git a/configure.ac b/configure.ac
25 -index 052b4d0..12c818d 100644
26 ---- a/configure.ac
27 -+++ b/configure.ac
28 -@@ -169,17 +169,24 @@ dnl ****************************
29 - dnl *** Check for libselinux ***
30 - dnl ****************************
31 -
32 -+AC_ARG_ENABLE(selinux,
33 -+ [AC_HELP_STRING([--enable-selinux],
34 -+ [build with selinux support])])
35 -+AM_CONDITIONAL([ENABLE_SELINUX],[test "x$enable_selinux" = "xyes"])
36 -+
37 - SELINUX_LIBS=
38 - msg_selinux=no
39 --AC_CHECK_LIB(selinux, is_selinux_enabled,
40 -- [AC_CHECK_HEADERS(selinux/selinux.h,
41 -- [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
42 -- [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
43 -- SELINUX_LIBS="-lselinux"
44 -- msg_selinux=yes])
45 -- ])
46 -- ])
47 --AC_SUBST(SELINUX_LIBS)
48 -+if test "x$enable_selinux" != "xno"; then
49 -+ AC_CHECK_LIB(selinux, is_selinux_enabled,
50 -+ [AC_CHECK_HEADERS(selinux/selinux.h,
51 -+ [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
52 -+ [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
53 -+ SELINUX_LIBS="-lselinux"
54 -+ msg_selinux=yes])
55 -+ ])
56 -+ ])
57 -+ AC_SUBST(SELINUX_LIBS)
58 -+fi
59 -
60 -
61 - AC_ARG_ENABLE(empty_view,
62 -@@ -353,6 +360,7 @@ caja-$VERSION:
63 - warning flags: ${WARNING_CFLAGS}
64 - xmp support: $msg_xmp
65 - PackageKit support: $msg_packagekit
66 -+ SELinux support: $msg_selinux
67 - Self check: $msg_self_check
68 -
69 - caja-extension documentation: ${enable_gtk_doc}