[gtk-osx] Patch p11-kit for Apple dirfd macro.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Patch p11-kit for Apple dirfd macro.
- Date: Sat, 28 Feb 2015 21:10:19 +0000 (UTC)
commit 41fd173b1b647d6f946cb7ced32174e1010152d3
Author: John Ralls <jralls ceridwen us>
Date: Sat Feb 28 13:04:10 2015 -0800
Patch p11-kit for Apple dirfd macro.
modulesets-stable/gtk-osx-unsupported.modules | 6 +++++-
patches/p11-kit-dirfd.patch | 17 +++++++++++++++++
2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index e810520..5d946e8 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -70,7 +70,11 @@
<autotools id="p11-kit" autogen-sh="configure"
autogenargs="--without-trust-paths">
- <branch repo="p11-glue" version="0.22.1" module="p11-kit-0.22.1.tar.gz"/>
+ <branch repo="p11-glue" version="0.22.1"
+ module="p11-kit-0.22.1.tar.gz">
+<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/p11-kit-dirfd.patch"
+ strip="1"/>
+ </branch>
<dependencies>
<dep package="libtasn1"/>
</dependencies>
diff --git a/patches/p11-kit-dirfd.patch b/patches/p11-kit-dirfd.patch
new file mode 100644
index 0000000..fd7a13f
--- /dev/null
+++ b/patches/p11-kit-dirfd.patch
@@ -0,0 +1,17 @@
+diff -c /Users/john/Development/gtk-sources/p11-kit-0.22.1/common/compat.c\~
/Users/john/Development/gtk-sources/p11-kit-0.22.1/common/compat.c
+--- a/common/compat.c~ Sun Oct 5 22:29:32 2014
++++ b/common/compat.c Fri Feb 20 12:48:53 2015
+@@ -918,7 +918,11 @@
+
+ /* didn't parse or is the opendir() fd */
+ if (!end || *end != '\0' ||
++#if defined(__APPLE__)
++ (int)num == dir->__dd_fd)
++#else
+ (int)num == dirfd (dir))
++#endif
+ continue;
+
+ fd = num;
+
+Diff finished. Sun Feb 22 13:37:16 2015
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]