[Libreoffice-commits] .: Branch 'feature/orcus-update' - 2 commits - configure.ac liborcus/liborcus_0.1.0-warnings.patch liborcus/UnpackedTarball_orcus.mk

[Libreoffice Gerrit user]

 configure.ac                           |    2 -
 liborcus/UnpackedTarball_orcus.mk      |    6 +--
 liborcus/liborcus_0.1.0-warnings.patch |   62 ---------------------------------
 3 files changed, 3 insertions(+), 67 deletions(-)

New commits:
commit 6f573b76ddbbc87b4e251c00831e8394f28e97f2
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Nov 26 16:01:52 2012 -0500

    Temporarily disable patches that don't apply.
    
    Change-Id: I77cd13301fb4ab98ba1ded49e5b4aa1f3974c8e1

diff --git a/configure.ac b/configure.ac
index e2c896e..71ab6f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8843,7 +8843,7 @@ if test "$with_system_orcus" = "yes"; then
     PKG_CHECK_MODULES(ORCUS, liborcus-0.4 >= 0.3.0)
 else
     AC_MSG_RESULT([internal])
-    ORCUS_TARBALL=1ae5b571b0aa391ef7779f91c7d9bcb3-liborcus_0.3.0.tar.bz2
+    ORCUS_TARBALL=28638e85e1f4626536cecf7759eea219-liborcus_0.3.0.tar.bz2
     SYSTEM_LIBORCUS=NO
 
     if test "$SYSTEM_BOOST" = "YES"; then
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index 6d2a7f2..0a662f5 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -17,10 +17,10 @@ orcus_patches :=
 # make config.sub recognize arm-linux-androideabi
 orcus_patches += liborcus_0.1.0-configure.patch
 # fix MinGW build
-orcus_patches += liborcus_0.1.0-mingw.patch
+#orcus_patches += liborcus_0.1.0-mingw.patch
 # disable boost "auto lib" in MSVC build
 orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
-orcus_patches += liborcus_0.1.0-link-with-Boost.System.patch
+#orcus_patches += liborcus_0.1.0-link-with-Boost.System.patch
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
 	vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
commit 85327b65584e558bf00ab1f0da3da4b83dc4894d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Nov 26 15:42:41 2012 -0500

    This one has been upstreamed.
    
    Change-Id: I1f55575b07cfc3cddd27b3d42ab354405f13fa60

diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index ec1f7c4..6d2a7f2 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
 
 orcus_patches :=
-# -Werror,-Wunused-variable -Werror,-Wunused-private-field
-orcus_patches += liborcus_0.1.0-warnings.patch
 # make config.sub recognize arm-linux-androideabi
 orcus_patches += liborcus_0.1.0-configure.patch
 # fix MinGW build
diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch
deleted file mode 100644
index 8ce6533..0000000
--- a/liborcus/liborcus_0.1.0-warnings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/liborcus/pstring.cpp	2012-09-07 06:00:35.000000000 +0200
-+++ src/liborcus/pstring.cpp	2012-09-07 16:56:14.000000000 +0200
-@@ -57,25 +57,25 @@
- 
- pstring pstring::intern(const char* str, size_t n)
- {
--    ::boost::mutex::scoped_lock(interned_strings.mtx);
-+    ::boost::mutex::scoped_lock lock(interned_strings.mtx);
-     return interned_strings.store.intern(str, n);
- }
- 
- void pstring::intern::dispose()
- {
--    ::boost::mutex::scoped_lock(interned_strings.mtx);
-+    ::boost::mutex::scoped_lock lock(interned_strings.mtx);
-     interned_strings.store.clear();
- }
- 
- size_t pstring::intern::size()
- {
--    ::boost::mutex::scoped_lock(interned_strings.mtx);
-+    ::boost::mutex::scoped_lock lock(interned_strings.mtx);
-     return interned_strings.store.size();
- }
- 
- void pstring::intern::dump()
- {
--    ::boost::mutex::scoped_lock(interned_strings.mtx);
-+    ::boost::mutex::scoped_lock lock(interned_strings.mtx);
-     interned_strings.store.dump();
- }
- 
---- src/liborcus/xml_map_tree.cpp	2012-09-07 06:00:35.000000000 +0200
-+++ src/liborcus/xml_map_tree.cpp	2012-09-07 16:59:23.000000000 +0200
-@@ -55,15 +55,14 @@
- {
-     const char* mp_char;
-     const char* mp_end;
--    size_t m_size;
- public:
--    xpath_parser(const char* p, size_t n) : mp_char(p), mp_end(p+n), m_size(n)
-+    xpath_parser(const char* p, size_t n) : mp_char(p), mp_end(p+n)
-     {
-         if (!n)
--            xml_map_tree::xpath_error("empty path");
-+            throw xml_map_tree::xpath_error("empty path");
- 
-         if (*p != '/')
--            xml_map_tree::xpath_error("first character must be '/'.");
-+            throw xml_map_tree::xpath_error("first character must be '/'.");
- 
-         ++mp_char;
-     }
-@@ -414,7 +413,7 @@
-     {
-         // Make sure the root element's names are the same.
-         if (mp_root->name != name)
--            xpath_error("path begins with inconsistent root level name.");
-+            throw xpath_error("path begins with inconsistent root level name.");
-     }
-     else
-     {