[Libreoffice-commits] core.git: external/liborcus

[Markus Mohrhard]

 external/liborcus/liborcus-handle-invalid-xml.patch.1 |   12 ----------
 external/liborcus/liborcus_0.1.0-tac.patch            |   20 ------------------
 2 files changed, 32 deletions(-)

New commits:
commit 9c6f0a676048bdbdf0b4866d5e5afd5a436b146e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Mar 4 06:47:55 2014 +0100

    remove unnecessary patches
    
    They have been applied upstream and are part of the new release.
    
    Change-Id: I928b29e74abe2415bdf75de32cbaa7ac279a2889

diff --git a/external/liborcus/liborcus-handle-invalid-xml.patch.1 b/external/liborcus/liborcus-handle-invalid-xml.patch.1
deleted file mode 100644
index 4cb091d..0000000
--- a/external/liborcus/liborcus-handle-invalid-xml.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur liborcus.org/include/orcus/sax_parser.hpp liborcus/include/orcus/sax_parser.hpp
---- liborcus.org/include/orcus/sax_parser.hpp	2013-12-13 20:51:55.126503773 +0100
-+++ liborcus/include/orcus/sax_parser.hpp	2013-12-13 20:57:39.076174743 +0100
-@@ -278,6 +278,8 @@
-             special_tag();
-         break;
-         default:
-+            if (!is_alpha(c))
-+                throw malformed_xml_error("expect an alphabet.");
-             element_open(pos);
-     }
- }
diff --git a/external/liborcus/liborcus_0.1.0-tac.patch b/external/liborcus/liborcus_0.1.0-tac.patch
deleted file mode 100644
index 01c77a9..0000000
--- a/external/liborcus/liborcus_0.1.0-tac.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure
-+++ configure
-@@ -15668,7 +15668,7 @@
- 
- 			LDFLAGS_SAVE=$LDFLAGS
-             if test "x$ax_boost_user_system_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
-+                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tail -r` ; do
-                      ax_lib=${libextension}
- 				    as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-@@ -15716,7 +15716,7 @@
- 
- 				done
-                 if test "x$link_system" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
-+                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tail -r` ; do
-                      ax_lib=${libextension}
- 				    as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5