Rebase patches
Michael Biebl
3 years ago
debian/patches/0001-attr-xattr.h-is-deprecated.-Use-sys-xattr.h-instead.patch
less
more
| 0 | |
From: Lars Wendler <polynomial-c@gentoo.org>
|
| 1 | |
Date: Tue, 15 May 2018 13:40:37 +0200
|
| 2 | |
Subject: attr/xattr.h is deprecated. Use sys/xattr.h instead
|
| 3 | |
|
| 4 | |
See also:
|
| 5 | |
http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
|
| 6 | |
|
| 7 | |
(cherry picked from commit cf7e97ece39994d9c219bf3d4f3f70815e1c0867)
|
| 8 | |
---
|
| 9 | |
configure.ac | 2 +-
|
| 10 | |
src/xattr_manager.hpp | 5 ++++-
|
| 11 | |
2 files changed, 5 insertions(+), 2 deletions(-)
|
| 12 | |
|
| 13 | |
diff --git a/configure.ac b/configure.ac
|
| 14 | |
index 040e88f..bc769f3 100644
|
| 15 | |
--- a/configure.ac
|
| 16 | |
+++ b/configure.ac
|
| 17 | |
@@ -156,7 +156,7 @@ fi
|
| 18 | |
|
| 19 | |
if test x$enable_eua = xyes;
|
| 20 | |
then
|
| 21 | |
- AC_CHECK_HEADERS([attr/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
|
| 22 | |
+ AC_CHECK_HEADERS([sys/xattr.h], [], AC_MSG_ERROR([This header is mandatory for extended user attributes support]), [])
|
| 23 | |
AC_DEFINE([ENABLE_USER_XATTR], [1], [Enables user extended attributes support])
|
| 24 | |
fi
|
| 25 | |
AM_CONDITIONAL(ENABLE_USER_XATTR, test x$enable_eua = xyes)
|
| 26 | |
diff --git a/src/xattr_manager.hpp b/src/xattr_manager.hpp
|
| 27 | |
index 5f59e17..3d41443 100644
|
| 28 | |
--- a/src/xattr_manager.hpp
|
| 29 | |
+++ b/src/xattr_manager.hpp
|
| 30 | |
@@ -26,7 +26,10 @@
|
| 31 | |
#include <sys/stat.h>
|
| 32 | |
#include <unistd.h>
|
| 33 | |
|
| 34 | |
-#include <attr/xattr.h>
|
| 35 | |
+#include <sys/xattr.h>
|
| 36 | |
+#ifndef ENOATTR
|
| 37 | |
+#define ENOATTR ENODATA
|
| 38 | |
+#endif
|
| 39 | |
|
| 40 | |
#include <string>
|
| 41 | |
#include <cstring>
|
debian/patches/0002-Avoid-C-name-mangling-for-Nautilus-extension-symbols.patch
less
more
| 0 | |
From: Michael Schwendt <mschwendt@fedoraproject.org>
|
| 1 | |
Date: Sun, 17 May 2020 14:08:43 +0200
|
| 2 | |
Subject: Avoid C++ name mangling for Nautilus extension symbols
|
| 3 | |
|
| 4 | |
Patch taken from
|
| 5 | |
https://src.fedoraproject.org/rpms/eiciel/raw/39db553efacba0ed9272a533b829b3ba8d8ac315/f/eiciel-0.9.12.1-nautilus-exports.patch
|
| 6 | |
|
| 7 | |
Closes: #960082
|
| 8 | |
---
|
| 9 | |
src/eiciel_nautilus_page.cpp | 5 +++--
|
| 10 | |
1 file changed, 3 insertions(+), 2 deletions(-)
|
| 11 | |
|
| 12 | |
diff --git a/src/eiciel_nautilus_page.cpp b/src/eiciel_nautilus_page.cpp
|
| 13 | |
index 9b92a8a..b1dcc4b 100644
|
| 14 | |
--- a/src/eiciel_nautilus_page.cpp
|
| 15 | |
+++ b/src/eiciel_nautilus_page.cpp
|
| 16 | |
@@ -20,8 +20,9 @@
|
| 17 | |
#include <config.hpp>
|
| 18 | |
#include <gtkmm.h>
|
| 19 | |
#include <gtk/gtk.h>
|
| 20 | |
-#include <libnautilus-extension/nautilus-property-page.h>
|
| 21 | |
-#include <libnautilus-extension/nautilus-property-page-provider.h>
|
| 22 | |
+extern "C" {
|
| 23 | |
+#include <nautilus-extension.h>
|
| 24 | |
+}
|
| 25 | |
#include <gio/gio.h>
|
| 26 | |
#include <glib/gi18n-lib.h>
|
| 27 | |
|
| 9 | 9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
| 10 | 10 |
|
| 11 | 11 |
diff --git a/configure.ac b/configure.ac
|
| 12 | |
index bc769f3..5da39dc 100644
|
|
12 |
index f82ceb0..1ebb720 100644
|
| 13 | 13 |
--- a/configure.ac
|
| 14 | 14 |
+++ b/configure.ac
|
| 15 | 15 |
@@ -108,7 +108,7 @@ fi
|
| 0 | |
0001-attr-xattr.h-is-deprecated.-Use-sys-xattr.h-instead.patch
|
| 1 | |
0002-Avoid-C-name-mangling-for-Nautilus-extension-symbols.patch
|
| 2 | 0 |
0003-Don-t-hardcode-pkg-config-in-configure.ac.patch
|