nautilus-extension patch added (thx: russo79, fedora)

6 files changed, 56 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9b77f8de4fc..fde18ddb0167 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eiciel
 	pkgdesc = GNOME file ACL editor
 	pkgver = 0.9.12.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://rofi.roger-ferrer.org/eiciel/
 	arch = i686
 	arch = x86_64
@@ -12,13 +12,11 @@ pkgbase = eiciel
 	depends = desktop-file-utils
 	options = !libtool
 	source = http://rofi.roger-ferrer.org/eiciel/files/eiciel-0.9.12.1.tar.bz2
-	source = configure.ac.patch
-	source = configure.patch
-	source = xattr_manager.hpp.patch
+	source = rename_attr-xattr_to_sys-xattr.patch
+	source = gnome-3.36_avoid_cpp_nautilus-extension.patch::https://src.fedoraproject.org/rpms/eiciel/raw/39db553efacba0ed9272a533b829b3ba8d8ac315/f/eiciel-0.9.12.1-nautilus-exports.patch
 	sha512sums = f54fbb149eed7f8fd534b77ec5e2d0f579c68a39afd7417a2298d75c7e95c459b49fc8ccb66d0188956ffaadf3bcc8a3eb048425cb82fc875573eb131f4b0494
-	sha512sums = 8b20cdd57f73c13c429ba37a1196eae60eae3af64de28687c51ea52ec5a696e32ad045d544db157a810b4ad290b47827a4c81b0201e31ec20508a9dfc78d346b
-	sha512sums = 04daf4f326e51a9013f409064ee00714ecfc5870617b866a094dc33a04d84680d54ada3e8b0df722ca34262a06e5f96ca57f111621592d44b9dc11592cade2c2
-	sha512sums = 926461f759663b3329323665834473a4e3e3a8e64ae9fdf8456d2e972ab33a24f57cb066ca9a8fa2a4bbbafad0e160bb45b06c16179139051bf9bb11384c619a
+	sha512sums = db612691b1fae68b476d1d244d6bd3e54a770994a50c7f3644c87da9dfe6b0ae4fc1d5a9b0f02b8ea4d3d8a7e8ff46178fe605e9ff283eeeed50d1c21cf84b53
+	sha512sums = b391287588a9383fa051926a2597bff97bea70015efe2b427d51286a8087a4e4ed8afd677484799bb77eaaaf02cabb97742a8a8f2b539c0819d47e8424c0f845
 
 pkgname = eiciel
 
diff --git a/PKGBUILD b/PKGBUILD
index e4144ce9dc97..88cae5d3c737 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=eiciel
 pkgver=0.9.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GNOME file ACL editor"
 arch=('i686' 'x86_64')
 url="http://rofi.roger-ferrer.org/eiciel/"
@@ -13,21 +13,20 @@ depends=('acl' 'gtkmm3' 'nautilus' 'desktop-file-utils')
 options=('!libtool')
 source=(
 	http://rofi.roger-ferrer.org/eiciel/files/${pkgname}-${pkgver}.tar.bz2
-	configure.ac.patch
-	configure.patch
-	xattr_manager.hpp.patch	
+	rename_attr-xattr_to_sys-xattr.patch
+	gnome-3.36_avoid_cpp_nautilus-extension.patch::https://src.fedoraproject.org/rpms/eiciel/raw/39db553efacba0ed9272a533b829b3ba8d8ac315/f/eiciel-0.9.12.1-nautilus-exports.patch
 )
 sha512sums=('f54fbb149eed7f8fd534b77ec5e2d0f579c68a39afd7417a2298d75c7e95c459b49fc8ccb66d0188956ffaadf3bcc8a3eb048425cb82fc875573eb131f4b0494'
-            '8b20cdd57f73c13c429ba37a1196eae60eae3af64de28687c51ea52ec5a696e32ad045d544db157a810b4ad290b47827a4c81b0201e31ec20508a9dfc78d346b'
-            '04daf4f326e51a9013f409064ee00714ecfc5870617b866a094dc33a04d84680d54ada3e8b0df722ca34262a06e5f96ca57f111621592d44b9dc11592cade2c2'
-            '926461f759663b3329323665834473a4e3e3a8e64ae9fdf8456d2e972ab33a24f57cb066ca9a8fa2a4bbbafad0e160bb45b06c16179139051bf9bb11384c619a')
+            'db612691b1fae68b476d1d244d6bd3e54a770994a50c7f3644c87da9dfe6b0ae4fc1d5a9b0f02b8ea4d3d8a7e8ff46178fe605e9ff283eeeed50d1c21cf84b53'
+            'b391287588a9383fa051926a2597bff97bea70015efe2b427d51286a8087a4e4ed8afd677484799bb77eaaaf02cabb97742a8a8f2b539c0819d47e8424c0f845')
 
 
 prepare() {
-	msg2 "Applying fast fix (v1) for: attr/xattr->sys/xattr"
-	patch -p1 < $srcdir/configure.ac.patch
-	patch -p1 < $srcdir/configure.patch
-	patch -p1 < $srcdir/xattr_manager.hpp.patch	
+	msg2 "Applying: rename attr/xattr -> sys/xattr"
+	patch -p1 < rename_attr-xattr_to_sys-xattr.patch
+
+	msg2 "Applying: gnome-3.36 - avoid C++ nautilus-extension (instead use extern C)"
+	patch -p0 < gnome-3.36_avoid_cpp_nautilus-extension.patch
 
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	msg2 "Applying fast fix for: aclocal>1.15"
diff --git a/configure.ac.patch b/configure.ac.patch
deleted file mode 100644
index 37b01baed81c..000000000000
--- a/configure.ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/eiciel-0.9.12.1/configure.ac	2018-01-16 19:41:43.000000000 +0000
-+++ src2/eiciel-0.9.12.1/configure.ac	2018-09-28 09:20:06.548646722 +0000
-@@ -156,7 +156,7 @@
- 
- if test x$enable_eua = xyes;
- then
--    AC_CHECK_HEADERS([attr/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
-+    AC_CHECK_HEADERS([sys/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
-     AC_DEFINE([ENABLE_USER_XATTR], [1], [Enables user extended attributes support])
- fi
- AM_CONDITIONAL(ENABLE_USER_XATTR, test x$enable_eua = xyes)
diff --git a/configure.patch b/configure.patch
deleted file mode 100644
index f5e66fc7da3d..000000000000
--- a/configure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/eiciel-0.9.12.1/configure	2018-01-16 19:41:51.000000000 +0000
-+++ src2/eiciel-0.9.12.1/configure	2018-09-28 09:00:29.392747415 +0000
-@@ -19169,9 +19169,9 @@
- if test x$enable_eua = xyes;
- then
- 
--for ac_header in attr/xattr.h
-+for ac_header in sys/xattr.h
- do :
--  ac_fn_cxx_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
-+  ac_fn_cxx_check_header_mongrel "$LINENO" "sys/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
- if test "x$ac_cv_header_attr_xattr_h" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_ATTR_XATTR_H 1
diff --git a/rename_attr-xattr_to_sys-xattr.patch b/rename_attr-xattr_to_sys-xattr.patch
new file mode 100644
index 000000000000..703ef8a182ee
--- /dev/null
+++ b/rename_attr-xattr_to_sys-xattr.patch
@@ -0,0 +1,41 @@
+--- src/eiciel-0.9.12.1/configure.ac	2018-01-16 19:41:43.000000000 +0000
++++ src2/eiciel-0.9.12.1/configure.ac	2018-09-28 09:20:06.548646722 +0000
+@@ -156,7 +156,7 @@
+ 
+ if test x$enable_eua = xyes;
+ then
+-    AC_CHECK_HEADERS([attr/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
++    AC_CHECK_HEADERS([sys/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
+     AC_DEFINE([ENABLE_USER_XATTR], [1], [Enables user extended attributes support])
+ fi
+ AM_CONDITIONAL(ENABLE_USER_XATTR, test x$enable_eua = xyes)
+
+--- src/eiciel-0.9.12.1/configure	2018-01-16 19:41:51.000000000 +0000
++++ src2/eiciel-0.9.12.1/configure	2018-09-28 09:00:29.392747415 +0000
+@@ -19169,9 +19169,9 @@
+ if test x$enable_eua = xyes;
+ then
+ 
+-for ac_header in attr/xattr.h
++for ac_header in sys/xattr.h
+ do :
+-  ac_fn_cxx_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
++  ac_fn_cxx_check_header_mongrel "$LINENO" "sys/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
+ if test "x$ac_cv_header_attr_xattr_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_ATTR_XATTR_H 1
+
+--- src/eiciel-0.9.12.1/src/xattr_manager.hpp	2014-08-20 08:06:00.000000000 +0000
++++ src2/eiciel-0.9.12.1/src/xattr_manager.hpp	2018-09-28 09:12:54.336485500 +0000
+@@ -26,7 +26,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
++#ifndef ENOATTR
++#define ENOATTR ENODATA
++#endif
+ 
+ #include <string>
+ #include <cstring>
diff --git a/xattr_manager.hpp.patch b/xattr_manager.hpp.patch
deleted file mode 100644
index 208ad34159d3..000000000000
--- a/xattr_manager.hpp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/eiciel-0.9.12.1/src/xattr_manager.hpp	2014-08-20 08:06:00.000000000 +0000
-+++ src2/eiciel-0.9.12.1/src/xattr_manager.hpp	2018-09-28 09:12:54.336485500 +0000
-@@ -26,7 +26,10 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
-+#ifndef ENOATTR
-+#define ENOATTR ENODATA
-+#endif
- 
- #include <string>
- #include <cstring>