diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-11 19:49:15 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-13 01:54:40 -0400 |
| commit | 4eb2211230d3ff327e8965a52953d0e83b031e91 (patch) | |
| tree | cfcf538bb9b866599a963bf28ddd5a88ba06344f /liborcus | |
| parent | f14e7094f8683ffedbe9173da4f19d32f89d2a47 (diff) | |
This patch has been upstreamed.
Change-Id: I7ba26813e1dfdd138096c597abd9f67c953aca4d
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/UnpackedTarball_orcus.mk | 3 | ||||
| -rw-r--r-- | liborcus/liborcus_0.1.0-boost-include.patch.1 | 26 |
2 files changed, 1 insertions, 28 deletions
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk index 13be4e64b5e3..d09b3f4025a2 100644 --- a/liborcus/UnpackedTarball_orcus.mk +++ b/liborcus/UnpackedTarball_orcus.mk @@ -15,11 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0)) orcus_patches := # make config.sub recognize arm-linux-androideabi -orcus_patches += liborcus_0.1.0-configure.patch +# orcus_patches += liborcus_0.1.0-configure.patch <- does not apply # <https://gitorious.org/orcus/orcus/merge_requests/2# # f60d6eecee72349993a392a9a63ddf3383d3b8c8- # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>: -orcus_patches += liborcus_0.1.0-boost-include.patch.1 $(eval $(call gb_UnpackedTarball_add_patches,orcus,\ $(foreach patch,$(orcus_patches),liborcus/$(patch)) \ diff --git a/liborcus/liborcus_0.1.0-boost-include.patch.1 b/liborcus/liborcus_0.1.0-boost-include.patch.1 deleted file mode 100644 index 07558b0b1748..000000000000 --- a/liborcus/liborcus_0.1.0-boost-include.patch.1 +++ /dev/null @@ -1,26 +0,0 @@ -From f60d6eecee72349993a392a9a63ddf3383d3b8c8 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Sat, 16 Feb 2013 13:25:44 +0100 -Subject: [PATCH] Missing include <boost/noncopyable.hpp> - -(at least when compiling against Boost 1.53.0) ---- - src/liborcus/dom_tree.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/liborcus/dom_tree.cpp b/src/liborcus/dom_tree.cpp -index ecf7beb..14725ad 100644 ---- a/src/liborcus/dom_tree.cpp -+++ b/src/liborcus/dom_tree.cpp -@@ -34,6 +34,8 @@ - #include <iostream> - #include <sstream> - -+#include <boost/noncopyable.hpp> -+ - using namespace std; - - namespace orcus { --- -1.8.1.2 - |