[Libreoffice-commits] .: 2 commits - liborcus/liborcus_0.1.0-warnings.patch liborcus/makefile.mk

[Libreoffice Gerrit user]

 liborcus/liborcus_0.1.0-warnings.patch |   62 +++++++++++++++++++++++++++++++++
 liborcus/makefile.mk                   |    9 +++-
 2 files changed, 69 insertions(+), 2 deletions(-)

New commits:
commit 127d842cbb41db987ac5d03ca78520a32b6fb206
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 7 17:04:51 2012 +0200

    Fix liborcus warnings
    
    Change-Id: I6811e7d451c96d5e52e152e693b1c4739be308dc

diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch
new file mode 100644
index 0000000..a7e796a
--- /dev/null
+++ b/liborcus/liborcus_0.1.0-warnings.patch
@@ -0,0 +1,62 @@
+--- misc/liborcus_0.1.0/src/liborcus/pstring.cpp	2012-09-07 06:00:35.000000000 +0200
++++ misc/build/liborcus_0.1.0/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();
+ }
+ 
+--- misc/liborcus_0.1.0/src/liborcus/xml_map_tree.cpp	2012-09-07 06:00:35.000000000 +0200
++++ misc/build/liborcus_0.1.0/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
+     {
diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk
index 8d92109..fd04605 100644
--- a/liborcus/makefile.mk
+++ b/liborcus/makefile.mk
@@ -35,7 +35,8 @@ TARGET=orcus
 TARFILE_NAME=liborcus_0.1.0
 TARFILE_MD5=46d9f4cf8b145c21ce1056e116d2ce71
 
-PATCH_FILES=
+PATCH_FILES=liborcus_0.1.0-warnings.patch
+    # -Werror,-Wunused-variable -Werror,-Wunused-private-field
 
 .IF "$(GUI)$(COM)"=="WNTMSC"
 
commit f006e75f1876bf7e6249352092d0ed7e7a5be20f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 7 17:01:54 2012 +0200

    Make liborcus work --without-system-boost
    
    Change-Id: I4e199c167a67ca73c1967a7cf45bb8cc5b0017e7

diff --git a/liborcus/makefile.mk b/liborcus/makefile.mk
index b108fce..8d92109 100644
--- a/liborcus/makefile.mk
+++ b/liborcus/makefile.mk
@@ -47,6 +47,10 @@ BUILD_ACTION= \
 
 .ELSE
 
+.IF "$(SYSTEM_BOOST)" == "NO"
+MY_CXXFLAGS = CXXFLAGS=-I$(OUTDIR)/inc/external
+.END
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=./configure \
 	--with-pic \
@@ -54,7 +58,7 @@ CONFIGURE_ACTION=./configure \
 	--disable-shared \
 	--without-libzip \
 	--disable-debug \
-	--disable-spreadsheet-model
+	--disable-spreadsheet-model $(MY_CXXFLAGS)
 
 BUILD_ACTION=make
 BUILD_DIR=