[Libreoffice-commits] core.git: Branch 'feature/orcus-update' - 2 commits - download.lst liborcus/ExternalPackage_liborcus.mk liborcus/ExternalProject_liborcus.mk liborcus/liborcus_0.1.0-boost-include.patch.1 liborcus/UnpackedTarball_orcus.mk

[Kohei Yoshida]

 download.lst                                  |    2 +-
 liborcus/ExternalPackage_liborcus.mk          |    4 ++--
 liborcus/ExternalProject_liborcus.mk          |    1 -
 liborcus/UnpackedTarball_orcus.mk             |    3 +--
 liborcus/liborcus_0.1.0-boost-include.patch.1 |   26 --------------------------
 5 files changed, 4 insertions(+), 32 deletions(-)

New commits:
commit 6fd9ea7db2bd1e4670597f55e4a118e7f306c28b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Apr 11 19:49:15 2013 -0400

    This patch has been upstreamed.
    
    Change-Id: I7ba26813e1dfdd138096c597abd9f67c953aca4d

diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index 13be4e6..d09b3f4 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 at 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 07558b0..0000000
--- 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 at 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
-
commit 276be76a829d656e1117845914caced30c62dd9e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Apr 11 19:40:07 2013 -0400

    Update the internal liborcus package to 0.5.0.
    
    Change-Id: Ib0070ad8509ba4084a8b0871fbc8c24b550433d7

diff --git a/download.lst b/download.lst
index f0888a2..4399a4f 100644
--- a/download.lst
+++ b/download.lst
@@ -68,7 +68,7 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
-export ORCUS_TARBALL := 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
+export ORCUS_TARBALL := 8a43b3de758dcd529b16ac96b46069fb-liborcus-0.5.0.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
 export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
diff --git a/liborcus/ExternalPackage_liborcus.mk b/liborcus/ExternalPackage_liborcus.mk
index 159faac..d47e608 100644
--- a/liborcus/ExternalPackage_liborcus.mk
+++ b/liborcus/ExternalPackage_liborcus.mk
@@ -12,9 +12,9 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,liborcus,orcus))
 $(eval $(call gb_ExternalPackage_use_external_project,liborcus,liborcus))
 
 ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.4.lib))
+$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/orcus.lib,src/liborcus/.libs/liborcus-0.6.lib))
 else
-$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.4.a))
+$(eval $(call gb_ExternalPackage_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.6.a))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 21db367..4be7040 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -37,7 +37,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 			--with-pic \
 			--enable-static \
 			--disable-shared \
-			--without-libzip \
 			--disable-debug \
 			--disable-spreadsheet-model \
 			--disable-werror \