summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boost/boost_1_39_0.patch196
-rw-r--r--boost/makefile.mk2
-rw-r--r--boost/prj/d.lst10
-rwxr-xr-xlibxml2/libxml2-2.6.31-mingw.patch24
-rw-r--r--libxml2/libxml2-2.6.31.patch412
-rw-r--r--libxml2/libxml2-configure.patch118
-rw-r--r--libxml2/libxml2-gnome599717.patch20
-rw-r--r--libxml2/libxml2-gnome602728.patch12
-rw-r--r--libxml2/libxml2-mingw.patch24
-rw-r--r--libxml2/makefile.mk14
-rw-r--r--libxslt/libxslt-configure.patch (renamed from libxslt/libxslt-1.1.24.patch)24
-rw-r--r--libxslt/libxslt-gnome602728.patch11
-rw-r--r--libxslt/libxslt-win_manifest.patch (renamed from libxslt/libxslt-1.1.24_win_manifest.patch)6
-rw-r--r--libxslt/libxsltversion.mk2
-rw-r--r--libxslt/makefile.mk6
15 files changed, 364 insertions, 517 deletions
diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch
index 9ab3099fc444..d837246a83bf 100644
--- a/boost/boost_1_39_0.patch
+++ b/boost/boost_1_39_0.patch
@@ -1,6 +1,35 @@
---- misc/boost_1_39_0/boost/function/function_template.hpp 2008-10-16 15:21:50.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/function/function_template.hpp 2009-07-09 12:58:51.141224220 +0200
-@@ -950,10 +950,10 @@
+diff --git boost_1_39_0/boost/config/compiler/visualc.hpp boost_1_39_0/boost/config/compiler/visualc.hpp
+index 552e5bb..d9f90b2 100644
+--- misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp
++++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp
+@@ -138,6 +138,9 @@
+ # define BOOST_NO_RTTI
+ #endif
+
++// disable WORKAROUND macro - gives warning for undefined macros
++#define BOOST_STRICT_CONFIG 1
++
+ //
+ // all versions support __declspec:
+ //
+diff --git boost_1_39_0/boost/function/function_base.hpp boost_1_39_0/boost/function/function_base.hpp
+index 6612fb8..35afa16 100644
+--- misc/build/boost_1_39_0/boost/function/function_base.hpp
++++ misc/build/boost_1_39_0/boost/function/function_base.hpp
+@@ -42,7 +42,7 @@
+ #endif
+
+ // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
+-#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
++#ifdef BOOST_NO_STD_TYPEINFO
+ // Embedded VC++ does not have type_info in namespace std
+ # define BOOST_FUNCTION_STD_NS
+ #else
+diff --git boost_1_39_0/boost/function/function_template.hpp boost_1_39_0/boost/function/function_template.hpp
+index 584abe9..36b619b 100644
+--- misc/build/boost_1_39_0/boost/function/function_template.hpp
++++ misc/build/boost_1_39_0/boost/function/function_template.hpp
+@@ -950,10 +950,10 @@ namespace boost {
f.vtable->manager(f.functor, this->functor,
boost::detail::function::move_functor_tag);
f.vtable = 0;
@@ -12,32 +41,11 @@
} catch (...) {
vtable = 0;
throw;
---- misc/boost_1_39_0/boost/function/function_base.hpp 2008-10-16 15:21:50.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/function/function_base.hpp 2009-07-12 21:42:22.779873909 +0200
-@@ -42,7 +42,7 @@
- #endif
-
- // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
--#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
-+#ifdef BOOST_NO_STD_TYPEINFO
- // Embedded VC++ does not have type_info in namespace std
- # define BOOST_FUNCTION_STD_NS
- #else
---- misc/boost_1_39_0/boost/config/compiler/visualc.hpp 2009-03-26 20:00:00.000000000 +0100
-+++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp 2009-06-10 21:53:42.484375000 +0200
-@@ -138,6 +138,9 @@
- # define BOOST_NO_RTTI
- #endif
-
-+// disable WORKAROUND macro - gives warning for undefined macros
-+#define BOOST_STRICT_CONFIG 1
-+
- //
- // all versions support __declspec:
- //
---- misc/boost_1_39_0/boost/mpl/apply_wrap.hpp 2008-10-11 08:50:46.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp 2009-06-10 21:53:42.500000000 +0200
-@@ -173,8 +173,8 @@
+diff --git boost_1_39_0/boost/mpl/apply_wrap.hpp boost_1_39_0/boost/mpl/apply_wrap.hpp
+index b3cb12b..0bf8e73 100644
+--- misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp
++++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp
+@@ -173,8 +173,8 @@ struct BOOST_PP_CAT(apply_wrap,i_)<AUX778076_APPLY_WRAP_SPEC_PARAMS(i_, int)>
# undef i_
///// iteration, depth == 2
@@ -48,15 +56,17 @@
# define j_ BOOST_PP_FRAME_ITERATION(2)
-@@ -230,4 +231,5 @@
+@@ -231,4 +231,5 @@ struct BOOST_PP_CAT(apply_wrap_impl,i_)<
# undef j_
#endif // BOOST_PP_ITERATION_DEPTH()
+#endif
#endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_39_0/boost/mpl/bind.hpp 2008-10-11 08:19:02.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/mpl/bind.hpp 2009-06-10 21:53:42.515625000 +0200
-@@ -531,7 +531,8 @@
+diff --git boost_1_39_0/boost/mpl/bind.hpp boost_1_39_0/boost/mpl/bind.hpp
+index 5d851ef..780e260 100644
+--- misc/build/boost_1_39_0/boost/mpl/bind.hpp
++++ misc/build/boost_1_39_0/boost/mpl/bind.hpp
+@@ -531,7 +531,8 @@ struct bind_chooser<i_>
///// iteration, depth == 2
@@ -66,15 +76,81 @@
# define j_ BOOST_PP_FRAME_ITERATION(2)
# if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
-@@ -548,4 +549,5 @@
+@@ -548,4 +549,5 @@ struct bind_chooser<i_>
# undef j_
#endif // BOOST_PP_ITERATION_DEPTH()
+#endif
#endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp 2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp 2009-06-10 21:53:42.531250000 +0200
-@@ -19,12 +19,12 @@
+diff --git boost_1_39_0/boost/ptr_container/detail/move.hpp boost_1_39_0/boost/ptr_container/detail/move.hpp
+index bf07d5f..6b082a7 100644
+--- misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/detail/move.hpp
+@@ -20,7 +20,7 @@ namespace move_ptrs {
+ template<typename Ptr>
+ class move_source {
+ public:
+- move_source(Ptr& ptr) : ptr_(ptr) {}
++ move_source(Ptr& _ptr) : ptr_(_ptr) {}
+ Ptr& ptr() const { return ptr_; }
+ private:
+ Ptr& ptr_;
+diff --git boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
+index 47c3903..3ad2c5c 100644
+--- misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/detail/reversible_ptr_container.hpp
+@@ -278,9 +278,9 @@ namespace ptr_container_detail
+
+ private:
+ template< class ForwardIterator >
+- ForwardIterator advance( ForwardIterator begin, size_type n )
++ ForwardIterator advance( ForwardIterator _begin, size_type n )
+ {
+- ForwardIterator iter = begin;
++ ForwardIterator iter = _begin;
+ std::advance( iter, n );
+ return iter;
+ }
+diff --git boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
+index ba2b9af..9e0d682 100644
+--- misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/detail/static_move_ptr.hpp
+@@ -151,7 +151,7 @@ public:
+ deleter_const_reference get_deleter() const { return impl_.second(); }
+ private:
+ template<typename TT, typename DD>
+- void check(const static_move_ptr<TT, DD>& ptr)
++ void check(const static_move_ptr<TT, DD>& _ptr)
+ {
+ typedef move_ptrs::is_smart_ptr_convertible<TT, T> convertible;
+ BOOST_STATIC_ASSERT(convertible::value);
+diff --git boost_1_39_0/boost/ptr_container/exception.hpp boost_1_39_0/boost/ptr_container/exception.hpp
+index d9a5ffe..7837fbb 100644
+--- misc/build/boost_1_39_0/boost/ptr_container/exception.hpp
++++ misc/build/boost_1_39_0/boost/ptr_container/exception.hpp
+@@ -24,7 +24,7 @@ namespace boost
+ {
+ const char* what_;
+ public:
+- bad_ptr_container_operation( const char* what ) : what_( what )
++ bad_ptr_container_operation( const char* text ) : what_( text )
+ { }
+
+ virtual const char* what() const throw()
+@@ -38,7 +38,7 @@ namespace boost
+ class bad_index : public bad_ptr_container_operation
+ {
+ public:
+- bad_index( const char* what ) : bad_ptr_container_operation( what )
++ bad_index( const char* text ) : bad_ptr_container_operation( text )
+ { }
+ };
+
+diff --git boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
+index 492bf4b..565fdec 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp
+@@ -19,12 +19,12 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
: len(-1), val() {}
template <typename T>
@@ -91,7 +167,7 @@
template <typename T>
inline bool
-@@ -66,11 +66,11 @@
+@@ -66,11 +66,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
inline match<nil_t>::match()
: len(-1) {}
@@ -107,9 +183,11 @@
inline bool
match<nil_t>::operator!() const
---- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp 2009-06-10 21:53:42.546875000 +0200
-@@ -226,7 +226,7 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
+index ca51bd2..b2282fa 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp
+@@ -226,7 +226,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
template <typename ParserT, typename ScannerT, typename AttrT>
struct concrete_parser : abstract_parser<ScannerT, AttrT>
{
@@ -118,9 +196,11 @@
virtual ~concrete_parser() {}
virtual typename match_result<ScannerT, AttrT>::type
---- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp 2009-06-10 21:53:42.562500000 +0200
-@@ -106,7 +106,7 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
+index 2f4b986..b3809da 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp
+@@ -106,7 +106,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
: parser_id(reinterpret_cast<std::size_t>(this));
}
@@ -129,9 +209,11 @@
private:
---- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp 2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp 2009-07-08 22:23:45.899895415 +0200
-@@ -159,11 +159,11 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
+index 73389b4..18d26cc 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp
+@@ -159,11 +159,11 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
return ptr.get();
}
@@ -147,9 +229,11 @@
scoped_ptr<abstract_parser_t> ptr;
};
---- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp 2009-06-10 21:53:42.593750000 +0200
-@@ -210,7 +210,7 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
+index 5d6761f..b93118a 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp
+@@ -210,7 +210,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
subrule_list<
subrule_parser<ID2, DefT2, ContextT2>,
nil_t> >
@@ -158,7 +242,7 @@
{
return subrule_list<
self_t,
-@@ -220,7 +220,7 @@
+@@ -220,7 +220,7 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
*this,
subrule_list<
subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
@@ -167,7 +251,7 @@
}
typename DefT::embed_t rhs;
-@@ -258,10 +258,10 @@
+@@ -258,10 +258,10 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
parse_main(ScannerT const& scan) const
{
typedef typename parser_result<self_t, ScannerT>::type result_t;
@@ -181,9 +265,11 @@
}
template <typename ScannerT>
---- misc/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2008-06-22 17:05:38.000000000 +0200
-+++ misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2009-10-11 22:34:54.867381817 +0200
-@@ -395,13 +395,13 @@
+diff --git boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
+index 5d75be2..730cf0c 100644
+--- misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/debug/impl/parser_names.ipp
+@@ -395,13 +395,13 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
}
bool register_node(void const *r, char const *name_to_register,
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 8c1df4e21dbc..fdc1dfd2a44c 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -91,6 +91,8 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/preprocessor $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/ptr_container $(INCCOM)$/$(PRJNAME)
+ @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/range $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME)
@$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME)
diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index 07d5a72a4384..6b9ebcaf6d66 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -81,6 +81,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
+mkdir: %_DEST%\inc%_EXT%\boost\ptr_container
+mkdir: %_DEST%\inc%_EXT%\boost\ptr_container\detail
+mkdir: %_DEST%\inc%_EXT%\boost\range
+mkdir: %_DEST%\inc%_EXT%\boost\range\detail
mkdir: %_DEST%\inc%_EXT%\boost\spirit
mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor
mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute
@@ -147,6 +151,7 @@ mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail
mkdir: %_DEST%\inc%_EXT%\boost\type_traits
mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail
mkdir: %_DEST%\inc%_EXT%\boost\utility
+mkdir: %_DEST%\inc%_EXT%\boost\utility\detail
mkdir: %_DEST%\inc%_EXT%\boost\variant
mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
@@ -232,6 +237,10 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot
..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple
+..\%__SRC%\inc\boost\ptr_container\* %_DEST%\inc%_EXT%\boost\ptr_container
+..\%__SRC%\inc\boost\ptr_container\detail\* %_DEST%\inc%_EXT%\boost\ptr_container\detail
+..\%__SRC%\inc\boost\range\* %_DEST%\inc%_EXT%\boost\range
+..\%__SRC%\inc\boost\range\detail\* %_DEST%\inc%_EXT%\boost\range\detail
..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit
..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor
..\%__SRC%\inc\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute
@@ -298,5 +307,6 @@ mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits
..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail
..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility
+..\%__SRC%\inc\boost\utility\detail\* %_DEST%\inc%_EXT%\boost\utility\detail
..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
diff --git a/libxml2/libxml2-2.6.31-mingw.patch b/libxml2/libxml2-2.6.31-mingw.patch
deleted file mode 100755
index 412db5bc244a..000000000000
--- a/libxml2/libxml2-2.6.31-mingw.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- misc/libxml2-2.6.31/configure 2008-01-11 17:01:56.000000000 +0900
-+++ misc/build/libxml2-2.6.31/configure 2009-09-07 20:48:47.656250000 +0900
-@@ -27331,6 +27331,8 @@
-
- if test "$with_modules" != "no" ; then
- case "$host" in
-+ *-*-mingw*)
-+ ;;
- *-*-cygwin*)
- MODULE_EXTENSION=".dll"
- { echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
---- misc/libxml2-2.6.31/libxml.h 2007-11-23 19:47:23.000000000 +0900
-+++ misc/build/libxml2-2.6.31/libxml.h 2009-07-10 14:37:34.988250000 +0900
-@@ -30,6 +30,10 @@
- #include <libxml/xmlversion.h>
- #else
- #include "config.h"
-+#ifdef __MINGW32__
-+#undef HAVE_LIBPTHREAD
-+#undef HAVE_PTHREAD_H
-+#endif
- #include <libxml/xmlversion.h>
- #endif
-
diff --git a/libxml2/libxml2-2.6.31.patch b/libxml2/libxml2-2.6.31.patch
deleted file mode 100644
index 31fcf72e8479..000000000000
--- a/libxml2/libxml2-2.6.31.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-*** misc/libxml2-2.6.31/configure Fri Jan 11 09:01:56 2008
---- misc/build/libxml2-2.6.31/configure Thu Mar 27 14:09:56 2008
-***************
-*** 3463,3477 ****
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-! CFLAGS="-g -O2"
- else
-! CFLAGS="-g"
- fi
- else
- if test "$GCC" = yes; then
-! CFLAGS="-O2"
- else
-! CFLAGS=
- fi
- fi
- { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
---- 3463,3477 ----
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
- if test "$GCC" = yes; then
-! CFLAGS="$ADDCFLAGS -g -O2"
- else
-! CFLAGS="$ADDCFLAGS -g"
- fi
- else
- if test "$GCC" = yes; then
-! CFLAGS="$ADDCFLAGS -O2"
- else
-! CFLAGS="$ADDCFLAGS"
- fi
- fi
- { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-***************
-*** 26207,26215 ****
-
- { echo "$as_me:$LINENO: checking for library containing setsockopt" >&5
- echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; }
-! if test "${ac_cv_search_setsockopt+set}" = set; then
-! echo $ECHO_N "(cached) $ECHO_C" >&6
-! else
- ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
---- 26207,26215 ----
-
- { echo "$as_me:$LINENO: checking for library containing setsockopt" >&5
- echo $ECHO_N "checking for library containing setsockopt... $ECHO_C" >&6; }
-! #if test "${ac_cv_search_setsockopt+set}" = set; then
-! # echo $ECHO_N "(cached) $ECHO_C" >&6
-! #else
- ac_func_search_save_LIBS=$LIBS
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-***************
-*** 26279,26285 ****
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
-! fi
- { echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5
- echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; }
- ac_res=$ac_cv_search_setsockopt
---- 26279,26285 ----
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
-! #fi
- { echo "$as_me:$LINENO: result: $ac_cv_search_setsockopt" >&5
- echo "${ECHO_T}$ac_cv_search_setsockopt" >&6; }
- ac_res=$ac_cv_search_setsockopt
-*** misc/libxml2-2.6.31/ltmain.sh Wed Aug 29 14:28:46 2007
---- misc/build/libxml2-2.6.31/ltmain.sh Thu Mar 27 13:54:03 2008
-***************
-*** 3311,3318 ****
- ;;
-
- freebsd-elf)
-! major=".$current"
-! versuffix=".$current";
- ;;
-
- irix | nonstopux)
---- 3311,3318 ----
- ;;
-
- freebsd-elf)
-! major=.`expr $current - $age`
-! versuffix=".$major.$age.$revision";
- ;;
-
- irix | nonstopux)
-*** misc/libxml2-2.6.31/xml2-config.in Fri Jan 11 08:22:32 2008
---- misc/build/libxml2-2.6.31/xml2-config.in Wed Apr 2 11:56:17 2008
-***************
-*** 1,10 ****
- #! /bin/sh
-
-! prefix=@prefix@
-! exec_prefix=@exec_prefix@
-! includedir=@includedir@
-! libdir=@libdir@
-
- usage()
- {
- cat <<EOF
---- 1,15 ----
- #! /bin/sh
-
-! #prefix=@prefix@
-! #exec_prefix=@exec_prefix@
-! #includedir=@includedir@
-! #libdir=@libdir@
-
-+ prefix=${SOLARVERSION}/${INPATH}
-+ exec_prefix=${SOLARVERSION}/${INPATH}
-+ includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
-+ libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
-+
- usage()
- {
- cat <<EOF
-***************
-*** 67,73 ****
- ;;
-
- --cflags)
-! echo @XML_INCLUDEDIR@ @XML_CFLAGS@
- ;;
-
- --libtool-libs)
---- 72,79 ----
- ;;
-
- --cflags)
-! echo -I${includedir}
-! # echo @XML_INCLUDEDIR@ @XML_CFLAGS@
- ;;
-
- --libtool-libs)
-***************
-*** 82,100 ****
- ;;
-
- --libs)
-! if [ "`uname`" = "Linux" ]
-! then
-! if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
-! then
-! echo @XML_LIBS@
-! else
-! echo @XML_LIBDIR@ @XML_LIBS@
-! fi
-! else
-! echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
-! fi
- ;;
-
- *)
- usage
- exit 1
---- 88,111 ----
- ;;
-
- --libs)
-! echo -L${libdir} ${LIBXML2LIB} -lm
-! # if [ "`uname`" = "Linux" ]
-! # then
-! # if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
-! # then
-! # echo @XML_LIBS@
-! # else
-! # echo @XML_LIBDIR@ @XML_LIBS@
-! # fi
-! # else
-! # echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
-! # fi
- ;;
-
-+ print) # ugly configure hack
-+ exit 0
-+ ;;
-+
- *)
- usage
- exit 1
-*** misc/libxml2-2.6.31/include/win32config.h Wed Apr 18 09:51:54 2007
---- misc/build/libxml2-2.6.31/include/win32config.h Mon Mar 31 19:09:09 2008
-***************
-*** 92,98 ****
---- 92,100 ----
- #if defined(_MSC_VER)
- #define mkdir(p,m) _mkdir(p)
- #define snprintf _snprintf
-+ #if _MSC_VER < 1500
- #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
-+ #endif
- #elif defined(__MINGW32__)
- #define mkdir(p,m) _mkdir(p)
- #endif
-*** misc/libxml2-2.6.31/include/wsockcompat.h Wed Jan 3 14:07:30 2007
---- misc/build/libxml2-2.6.31/include/wsockcompat.h Thu Apr 3 10:15:50 2008
-***************
-*** 21,26 ****
---- 21,27 ----
-
- /* Check if ws2tcpip.h is a recent version which provides getaddrinfo() */
- #if defined(GetAddrInfo)
-+ #include <wspiapi.h>
- #define HAVE_GETADDRINFO
- #endif
- #endif
-*** misc/libxml2-2.6.31/include/libxml/xmlversion.h Fri Jan 11 10:11:19 2008
---- misc/build/libxml2-2.6.31/include/libxml/xmlversion.h Thu Mar 27 13:54:03 2008
-***************
-*** 264,270 ****
- *
- * Whether iconv support is available
- */
-! #if 1
- #define LIBXML_ICONV_ENABLED
- #endif
-
---- 264,270 ----
- *
- * Whether iconv support is available
- */
-! #if 0
- #define LIBXML_ICONV_ENABLED
- #endif
-
-***************
-*** 282,288 ****
- *
- * Whether Debugging module is configured in
- */
-! #if 1
- #define LIBXML_DEBUG_ENABLED
- #endif
-
---- 282,288 ----
- *
- * Whether Debugging module is configured in
- */
-! #if 0
- #define LIBXML_DEBUG_ENABLED
- #endif
-
-***************
-*** 291,297 ****
- *
- * Whether the memory debugging is configured in
- */
-! #if 1
- #define DEBUG_MEMORY_LOCATION
- #endif
-
---- 291,297 ----
- *
- * Whether the memory debugging is configured in
- */
-! #if 0
- #define DEBUG_MEMORY_LOCATION
- #endif
-
-***************
-*** 300,306 ****
- *
- * Whether the runtime debugging is configured in
- */
-! #if 1
- #define LIBXML_DEBUG_RUNTIME
- #endif
-
---- 300,306 ----
- *
- * Whether the runtime debugging is configured in
- */
-! #if 0
- #define LIBXML_DEBUG_RUNTIME
- #endif
-
-diff -r -cN misc/libxml2-2.6.31/changelog misc/build/libxml2-2.6.31/changelog
-*** misc/libxml2-2.6.31/changelog
---- misc/build/libxml2-2.6.31/changelog
-***************
-*** 0 ****
---- 1,10 ----
-+ libxml2 (2.6.32.dfsg-5+lenny1) stable-security; urgency=high
-+
-+ * Non-maintainer upload by the Security Team.
-+ * Fix multiple use-after-free flaws when parsing notation and
-+ enumeration attribute types (CVE-2009-2416).
-+ * Fix stack overflow when parsing root XML document element DTD
-+ definition (CVE-2009-2414).
-+
-+ -- Nico Golde <nion@debian.org> Thu, 06 Aug 2009 13:04:00 +0000
-+
-diff -r -cN misc/libxml2-2.6.31/parser.c misc/build/libxml2-2.6.31/parser.c
-*** misc/libxml2-2.6.31/parser.c
---- misc/build/libxml2-2.6.31/parser.c
-***************
-*** 4752,4761 ****
- if (name == NULL) {
- xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
- "Name expected in NOTATION declaration\n");
-! return(ret);
- }
- cur = xmlCreateEnumeration(name);
-! if (cur == NULL) return(ret);
- if (last == NULL) ret = last = cur;
- else {
- last->next = cur;
---- 4752,4766 ----
- if (name == NULL) {
- xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
- "Name expected in NOTATION declaration\n");
-! xmlFreeEnumeration(ret);
-! return(NULL);
- }
- cur = xmlCreateEnumeration(name);
-! if (cur == NULL) {
-! xmlFreeEnumeration(ret);
-! return(NULL);
-! }
-!
- if (last == NULL) ret = last = cur;
- else {
- last->next = cur;
-***************
-*** 4765,4773 ****
- } while (RAW == '|');
- if (RAW != ')') {
- xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-! if ((last != NULL) && (last != ret))
-! xmlFreeEnumeration(last);
-! return(ret);
- }
- NEXT;
- return(ret);
---- 4770,4777 ----
- } while (RAW == '|');
- if (RAW != ')') {
- xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-! xmlFreeEnumeration(ret);
-! return(NULL);
- }
- NEXT;
- return(ret);
-***************
-*** 4808,4814 ****
- }
- cur = xmlCreateEnumeration(name);
- xmlFree(name);
-! if (cur == NULL) return(ret);
- if (last == NULL) ret = last = cur;
- else {
- last->next = cur;
---- 4812,4822 ----
- }
- cur = xmlCreateEnumeration(name);
- xmlFree(name);
-! if (cur == NULL) {
-! xmlFreeEnumeration(ret);
-! return(NULL);
-! }
-!
- if (last == NULL) ret = last = cur;
- else {
- last->next = cur;
-***************
-*** 5206,5211 ****
---- 5214,5226 ----
- const xmlChar *elem;
- xmlChar type = 0;
-
-+ if (ctxt->depth > 128) {
-+ xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
-+ "xmlParseElementChildrenContentDecl : depth %d too deep\n",
-+ ctxt->depth);
-+ return(NULL);
-+ }
-+
- SKIP_BLANKS;
- GROW;
- if (RAW == '(') {
-***************
-*** 5214,5220 ****
---- 5229,5237 ----
- /* Recurse on first child */
- NEXT;
- SKIP_BLANKS;
-+ ctxt->depth++;
- cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+ ctxt->depth--;
- SKIP_BLANKS;
- GROW;
- } else {
-***************
-*** 5344,5350 ****
---- 5361,5369 ----
- /* Recurse on second child */
- NEXT;
- SKIP_BLANKS;
-+ ctxt->depth++;
- last = xmlParseElementChildrenContentDecl(ctxt, inputid);
-+ ctxt->depth--;
- SKIP_BLANKS;
- } else {
- elem = xmlParseName(ctxt);
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
new file mode 100644
index 000000000000..4158c38ef47f
--- /dev/null
+++ b/libxml2/libxml2-configure.patch
@@ -0,0 +1,118 @@
+--- misc/libxml2-2.7.6/ltmain.sh 2009-10-06 17:39:54.000000000 +0100
++++ misc/build/libxml2-2.7.6/ltmain.sh 2009-12-17 11:43:56.000000000 +0000
+@@ -6271,8 +6271,8 @@
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current"
++ major=.`expr $current - $age`
++ versuffix=".$major.$age.$revision";
+ ;;
+
+ irix | nonstopux)
+--- misc/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:19.000000000 +0000
++++ misc/build/libxml2-2.7.6/include/libxml/xmlversion.h 2009-12-17 11:45:36.000000000 +0000
+@@ -264,7 +264,7 @@
+ *
+ * Whether iconv support is available
+ */
+-#if 1
++#if 0
+ #define LIBXML_ICONV_ENABLED
+ #endif
+
+@@ -282,7 +282,7 @@
+ *
+ * Whether Debugging module is configured in
+ */
+-#if 1
++#if 0
+ #define LIBXML_DEBUG_ENABLED
+ #endif
+
+@@ -291,7 +291,7 @@
+ *
+ * Whether the memory debugging is configured in
+ */
+-#if 1
++#if 0
+ #define DEBUG_MEMORY_LOCATION
+ #endif
+
+@@ -300,7 +300,7 @@
+ *
+ * Whether the runtime debugging is configured in
+ */
+-#if 1
++#if 0
+ #define LIBXML_DEBUG_RUNTIME
+ #endif
+
+--- misc/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:20.000000000 +0000
++++ misc/build/libxml2-2.7.6/xml2-config.in 2009-12-17 11:45:36.000000000 +0000
+@@ -1,9 +1,14 @@
+ #! /bin/sh
+
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-includedir=@includedir@
+-libdir=@libdir@
++#prefix=@prefix@
++#exec_prefix=@exec_prefix@
++#includedir=@includedir@
++#libdir=@libdir@
++
++prefix=${SOLARVERSION}/${INPATH}
++exec_prefix=${SOLARVERSION}/${INPATH}
++includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
++libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
+
+ usage()
+ {
+@@ -67,7 +72,8 @@
+ ;;
+
+ --cflags)
+- echo @XML_INCLUDEDIR@ @XML_CFLAGS@
++ echo -I${includedir}
++# echo @XML_INCLUDEDIR@ @XML_CFLAGS@
+ ;;
+
+ --libtool-libs)
+@@ -82,19 +88,24 @@
+ ;;
+
+ --libs)
+- if [ "`uname`" = "Linux" ]
+- then
+- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
+- then
+- echo @XML_LIBS@
+- else
+- echo @XML_LIBDIR@ @XML_LIBS@
+- fi
+- else
+- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
+- fi
++ echo -L${libdir} ${LIBXML2LIB} -lm
++# if [ "`uname`" = "Linux" ]
++# then
++# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
++# then
++# echo @XML_LIBS@
++# else
++# echo @XML_LIBDIR@ @XML_LIBS@
++# fi
++# else
++# echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
++# fi
+ ;;
+
++ print) # ugly configure hack
++ exit 0
++ ;;
++
+ *)
+ usage
+ exit 1
diff --git a/libxml2/libxml2-gnome599717.patch b/libxml2/libxml2-gnome599717.patch
new file mode 100644
index 000000000000..cc6617d0e699
--- /dev/null
+++ b/libxml2/libxml2-gnome599717.patch
@@ -0,0 +1,20 @@
+--- misc/libxml2-2.7.6/relaxng.c 2009-12-17 11:53:12.000000000 +0000
++++ misc/build/libxml2-2.7.6/relaxng.c 2009-12-17 16:30:43.000000000 +0000
+@@ -5369,7 +5369,7 @@
+ } else {
+ xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
+ "expecting name, anyName, nsName or choice : got %s\n",
+- (node == NULL ? "nothing" : node->name), NULL);
++ (node == NULL ? BAD_CAST "nothing" : node->name), NULL);
+ return (NULL);
+ }
+ if (ret != def) {
+@@ -9459,7 +9459,7 @@
+ ctxt->states = NULL;
+ if (found == 0) {
+ if (cur == NULL) {
+- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname");
+ } else {
+ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);
+ }
diff --git a/libxml2/libxml2-gnome602728.patch b/libxml2/libxml2-gnome602728.patch
new file mode 100644
index 000000000000..b284d457a751
--- /dev/null
+++ b/libxml2/libxml2-gnome602728.patch
@@ -0,0 +1,12 @@
+--- misc/libxml2-2.7.6/configure 2009-12-18 12:12:08.000000000 +0000
++++ misc/build/libxml2-2.7.6/configure 2009-12-18 12:20:40.000000000 +0000
+@@ -12150,7 +12150,7 @@
+ $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
+ VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+ test "`uname`" == "SunOS" && \
+- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
++ VERSION_SCRIPT_FLAGS=""
+
+ if test -n "$VERSION_SCRIPT_FLAGS"; then
+ USE_VERSION_SCRIPT_TRUE=
+
diff --git a/libxml2/libxml2-mingw.patch b/libxml2/libxml2-mingw.patch
new file mode 100644
index 000000000000..d160dcb70138
--- /dev/null
+++ b/libxml2/libxml2-mingw.patch
@@ -0,0 +1,24 @@
+--- misc/libxml2-2.7.6/configure 2008-01-11 17:01:56.000000000 +0900
++++ misc/build/libxml2-2.7.6/configure 2009-09-07 20:48:47.656250000 +0900
+@@ -19914,6 +19914,8 @@
+
+ if test "$with_modules" != "no" ; then
+ case "$host" in
++ *-*-mingw*)
++ ;;
+ *-*-cygwin*)
+ MODULE_EXTENSION=".dll"
+ { $as_echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
+--- misc/libxml2-2.7.6/libxml.h 2007-11-23 19:47:23.000000000 +0900
++++ misc/build/libxml2-2.7.6/libxml.h 2009-07-10 14:37:34.988250000 +0900
+@@ -30,6 +30,10 @@
+ #include <libxml/xmlversion.h>
+ #else
+ #include "config.h"
++#ifdef __MINGW32__
++#undef HAVE_LIBPTHREAD
++#undef HAVE_PTHREAD_H
++#endif
+ #include <libxml/xmlversion.h>
+ #endif
+
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index c315b871ac6d..4502c9055706 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -42,21 +42,19 @@ all:
# --- Files --------------------------------------------------------
-LIBXML2VERSION=2.6.31
+LIBXML2VERSION=2.7.6
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
-TARFILE_MD5=71ef7bcd3493a94395abccecbcf62dd7
-#.IF "$(OS)$(COM)"=="WNTGCC"
-#PATCH_FILES=$(TARFILE_NAME)-mingw.patch
-#.ELSE
-PATCH_FILES=$(TARFILE_NAME).patch
-#.ENDIF
+TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2
+PATCH_FILES=libxml2-configure.patch \
+ libxml2-mingw.patch \
+ libxml2-gnome599717.patch \
+ libxml2-gnome602728.patch
# This is only for UNX environment now
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
-PATCH_FILES+=$(TARFILE_NAME)-mingw.patch
xml2_CC=$(CC) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
xml2_CC+=-shared-libgcc
diff --git a/libxslt/libxslt-1.1.24.patch b/libxslt/libxslt-configure.patch
index f30773fe7cef..bfa0b512824e 100644
--- a/libxslt/libxslt-1.1.24.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,6 +1,6 @@
---- misc/libxslt-1.1.24/ltmain.sh Wed Aug 29 14:28:46 2007
-+++ misc/build/libxslt-1.1.24/ltmain.sh Wed Jun 25 13:06:05 2008
-@@ -3234,9 +3234,9 @@
+--- misc/libxslt-1.1.26/ltmain.sh Wed Aug 29 14:28:46 2007
++++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008
+@@ -6195,9 +6195,9 @@
revision="$number_revision"
;;
freebsd-aout|freebsd-elf|sunos)
@@ -12,20 +12,20 @@
+ revision="$number_revision"
;;
irix|nonstopux)
- current=`expr $number_major + $number_minor`
-@@ -3311,8 +3311,8 @@
+ func_arith $number_major + $number_minor
+@@ -6271,8 +6271,8 @@
;;
freebsd-elf)
- major=".$current"
-- versuffix=".$current";
+- versuffix=".$current"
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
;;
irix | nonstopux)
---- misc/libxslt-1.1.24/xslt-config.in Wed Jan 17 14:18:26 2007
-+++ misc/build/libxslt-1.1.24/xslt-config.in Wed Jun 25 13:06:05 2008
+--- misc/libxslt-1.1.26/xslt-config.in Wed Jan 17 14:18:26 2007
++++ misc/build/libxslt-1.1.26/xslt-config.in Wed Jun 25 13:06:05 2008
@@ -1,10 +1,16 @@
#! /bin/sh
@@ -57,9 +57,9 @@
if test "$includedir" != "/usr/include"; then
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
else
---- misc/libxslt-1.1.24/configure 2008-05-14 00:40:54.000000000 +0900
-+++ misc/build/libxslt-1.1.24/configure 2008-07-17 22:12:38.097000000 +0900
-@@ -5730,7 +5730,7 @@
+--- misc/libxslt-1.1.26/configure 2008-05-14 00:40:54.000000000 +0900
++++ misc/build/libxslt-1.1.26/configure 2008-07-17 22:12:38.097000000 +0900
+@@ -7437,7 +7437,7 @@
cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh
@@ -68,7 +68,7 @@
lt_cv_file_magic_cmd='func_win32_libid'
;;
-@@ -5739,7 +5739,7 @@
+@@ -7446,7 +7446,7 @@
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
if ( file / ) >/dev/null 2>&1; then
diff --git a/libxslt/libxslt-gnome602728.patch b/libxslt/libxslt-gnome602728.patch
new file mode 100644
index 000000000000..182855bf9486
--- /dev/null
+++ b/libxslt/libxslt-gnome602728.patch
@@ -0,0 +1,11 @@
+--- misc/libxslt-1.1.26.orig/configure 2009-12-21 10:07:14.000000000 +0000
++++ misc/build/libxslt-1.1.26/configure 2009-12-21 10:07:42.000000000 +0000
+@@ -13402,7 +13402,7 @@
+ $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
+ VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+ test "`uname`" == "SunOS" && \
+- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
++ VERSION_SCRIPT_FLAGS=""
+
+ if test -n "$VERSION_SCRIPT_FLAGS"; then
+ USE_VERSION_SCRIPT_TRUE=
diff --git a/libxslt/libxslt-1.1.24_win_manifest.patch b/libxslt/libxslt-win_manifest.patch
index 40f07324ccff..43c14eb70b8b 100644
--- a/libxslt/libxslt-1.1.24_win_manifest.patch
+++ b/libxslt/libxslt-win_manifest.patch
@@ -1,6 +1,6 @@
---- misc/libxslt-1.1.24/win32/configure.js 2007-08-03 15:41:02.000000000 +0200
-+++ misc/build/libxslt-1.1.24/win32/configure.js 2009-05-07 13:09:42.294993200 +0200
-@@ -51,7 +51,7 @@
+--- misc/libxslt-1.1.26/win32/configure.js 2007-08-03 15:41:02.000000000 +0200
++++ misc/build/libxslt-1.1.26/win32/configure.js 2009-05-07 13:09:42.294993200 +0200
+@@ -52,7 +52,7 @@
var dirSep = "\\";
var compiler = "msvc";
var cruntime = "/MD";
diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk
index 94c8220336fe..c80c0e9535b0 100644
--- a/libxslt/libxsltversion.mk
+++ b/libxslt/libxsltversion.mk
@@ -29,5 +29,5 @@ LIBXSLT_MAJOR=1
# minor
LIBXSLT_MINOR=1
# micro
-LIBXSLT_MICRO=24
+LIBXSLT_MICRO=26
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 29f05b8c297a..7df2fc8cde2f 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -49,8 +49,10 @@ all:
LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-TARFILE_MD5=e83ec5d27fc4c10c6f612879bea9a153
-PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch
+TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
+PATCH_FILES=libxslt-configure.patch \
+ libxslt-win_manifest.patch \
+ libxslt-gnome602728.patch
# This is only for UNX environment now
.IF "$(OS)"=="WNT"
generated by cgit (git 2.34.1) at 2025-02-25 05:40:32 +0000