diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/libxml2/Makefile | 4 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-configure | 8 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-ltmain_sh | 11 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-threads_c | 53 | ||||
| -rw-r--r-- | package/libxslt/Makefile | 6 | ||||
| -rw-r--r-- | package/libxslt/patches/patch-configure | 241 | ||||
| -rw-r--r-- | package/libxslt/patches/patch-libexslt_Makefile_in | 11 | ||||
| -rw-r--r-- | package/libxslt/patches/patch-ltmain_sh | 11 | ||||
| -rw-r--r-- | package/libxslt/patches/patch-xsltproc_Makefile_in | 11 |
9 files changed, 62 insertions, 294 deletions
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index d6cbb4ffb..d8b994ab1 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libxml2 -PKG_VERSION:= 2.7.8 +PKG_VERSION:= 2.9.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 8127a65e8c3b08856093099b52599c86 +PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380 PKG_DESCR:= XML C parser and toolkit PKG_SECTION:= libs PKG_DEPENDS:= zlib diff --git a/package/libxml2/patches/patch-configure b/package/libxml2/patches/patch-configure index f5a2ba355..13406bc62 100644 --- a/package/libxml2/patches/patch-configure +++ b/package/libxml2/patches/patch-configure @@ -1,6 +1,6 @@ ---- libxml2-2.7.8.orig/configure 2010-11-04 18:28:14.000000000 +0100 -+++ libxml2-2.7.8/configure 2011-10-15 15:07:16.000000000 +0200 -@@ -13423,17 +13423,17 @@ case ${host} in +--- libxml2-2.9.1.orig/configure 2013-04-19 09:36:11.000000000 +0200 ++++ libxml2-2.9.1/configure 2013-09-04 15:16:48.000000000 +0200 +@@ -14010,17 +14010,17 @@ case ${host} in esac @@ -22,7 +22,7 @@ else if test -x "$with_python/python.exe" then -@@ -13558,7 +13558,7 @@ else +@@ -14148,7 +14148,7 @@ else PYTHON_SUBDIR= fi diff --git a/package/libxml2/patches/patch-ltmain_sh b/package/libxml2/patches/patch-ltmain_sh deleted file mode 100644 index e5746506c..000000000 --- a/package/libxml2/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libxml2-2.7.8.orig/ltmain.sh 2010-11-04 18:28:10.000000000 +0100 -+++ libxml2-2.7.8/ltmain.sh 2011-04-25 06:55:46.857662605 +0200 -@@ -5091,7 +5091,7 @@ func_mode_link () - # @file GCC response files - # -tp=* Portland pgcc target processor selection - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/libxml2/patches/patch-threads_c b/package/libxml2/patches/patch-threads_c new file mode 100644 index 000000000..11b29ac6a --- /dev/null +++ b/package/libxml2/patches/patch-threads_c @@ -0,0 +1,53 @@ +--- libxml2-2.9.1.orig/threads.c 2013-04-05 17:08:04.000000000 +0200 ++++ libxml2-2.9.1/threads.c 2013-09-04 15:17:52.000000000 +0200 +@@ -47,49 +47,7 @@ + #ifdef HAVE_PTHREAD_H + + static int libxml_is_threaded = -1; +-#ifdef __GNUC__ +-#ifdef linux +-#if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3) +-extern int pthread_once (pthread_once_t *__once_control, +- void (*__init_routine) (void)) +- __attribute((weak)); +-extern void *pthread_getspecific (pthread_key_t __key) +- __attribute((weak)); +-extern int pthread_setspecific (pthread_key_t __key, +- __const void *__pointer) +- __attribute((weak)); +-extern int pthread_key_create (pthread_key_t *__key, +- void (*__destr_function) (void *)) +- __attribute((weak)); +-extern int pthread_key_delete (pthread_key_t __key) +- __attribute((weak)); +-extern int pthread_mutex_init () +- __attribute((weak)); +-extern int pthread_mutex_destroy () +- __attribute((weak)); +-extern int pthread_mutex_lock () +- __attribute((weak)); +-extern int pthread_mutex_unlock () +- __attribute((weak)); +-extern int pthread_cond_init () +- __attribute((weak)); +-extern int pthread_cond_destroy () +- __attribute((weak)); +-extern int pthread_cond_wait () +- __attribute((weak)); +-extern int pthread_equal () +- __attribute((weak)); +-extern pthread_t pthread_self () +- __attribute((weak)); +-extern int pthread_key_create () +- __attribute((weak)); +-extern int pthread_key_delete () +- __attribute((weak)); +-extern int pthread_cond_signal () +- __attribute((weak)); +-#endif +-#endif /* linux */ +-#endif /* __GNUC__ */ ++ + #endif /* HAVE_PTHREAD_H */ + + /* diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index b4306c66d..91424ca9c 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libxslt -PKG_VERSION:= 1.1.24 -PKG_RELEASE:= 2 -PKG_MD5SUM:= e83ec5d27fc4c10c6f612879bea9a153 +PKG_VERSION:= 1.1.28 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 9667bf6f9310b957254fdcf6596600b7 PKG_DESCR:= XSLT Library PKG_SECTION:= libs PKG_DEPENDS:= libxml2 diff --git a/package/libxslt/patches/patch-configure b/package/libxslt/patches/patch-configure deleted file mode 100644 index ea6b0cf6d..000000000 --- a/package/libxslt/patches/patch-configure +++ /dev/null @@ -1,241 +0,0 @@ ---- libxslt-1.1.24.orig/configure 2008-05-13 17:40:54.000000000 +0200 -+++ libxslt-1.1.24/configure 2011-02-15 18:11:46.000000000 +0100 -@@ -6799,238 +6799,6 @@ fi - - - --if test -n "$CXX" && ( test "X$CXX" != "Xno" && -- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -- (test "X$CXX" != "Xg++"))) ; then -- ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 --echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } --if test -z "$CXXCPP"; then -- if test "${ac_cv_prog_CXXCPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # Double quotes because CXXCPP needs to be expanded -- for CXXCPP in "$CXX -E" "/lib/cpp" -- do -- ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi -- --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi -- --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- break --fi -- -- done -- ac_cv_prog_CXXCPP=$CXXCPP -- --fi -- CXXCPP=$ac_cv_prog_CXXCPP --else -- ac_cv_prog_CXXCPP=$CXXCPP --fi --{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 --echo "${ECHO_T}$CXXCPP" >&6; } --ac_preproc_ok=false --for ac_cxx_preproc_warn_flag in '' yes --do -- # Use a header file that comes with gcc, so configuring glibc -- # with a fresh cross-compiler works. -- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- # <limits.h> exists even on freestanding compilers. -- # On the NeXT, cc -E runs the code through the compiler's parser, -- # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- Syntax error --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Broken: fails on valid input. --continue --fi -- --rm -f conftest.err conftest.$ac_ext -- -- # OK, works on sane cases. Now check whether nonexistent headers -- # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <ac_nonexistent.h> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -- test ! -s conftest.err -- }; then -- # Broken: success on invalid input. --continue --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- # Passes both tests. --ac_preproc_ok=: --break --fi -- --rm -f conftest.err conftest.$ac_ext -- --done --# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : --else -- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- --ac_ext=cpp --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -- --fi -- -- - ac_ext=f - ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' - ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' diff --git a/package/libxslt/patches/patch-libexslt_Makefile_in b/package/libxslt/patches/patch-libexslt_Makefile_in deleted file mode 100644 index 53165a669..000000000 --- a/package/libxslt/patches/patch-libexslt_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libxslt-1.1.24.orig/libexslt/Makefile.in 2008-05-13 17:52:13.000000000 +0200 -+++ libxslt-1.1.24/libexslt/Makefile.in 2011-01-11 17:04:29.000000000 +0100 -@@ -247,7 +247,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ - -I$(top_builddir) -I$(top_builddir)/libxslt \ -- -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS) -+ -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) - - AM_CFLAGS = $(LIBGCRYPT_CFLAGS) - lib_LTLIBRARIES = libexslt.la diff --git a/package/libxslt/patches/patch-ltmain_sh b/package/libxslt/patches/patch-ltmain_sh deleted file mode 100644 index 0c416e0cb..000000000 --- a/package/libxslt/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libxslt-1.1.24.orig/ltmain.sh 2007-08-29 14:28:46.000000000 +0200 -+++ libxslt-1.1.24/ltmain.sh 2011-01-15 21:29:56.000000000 +0100 -@@ -1663,7 +1663,7 @@ EOF - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/libxslt/patches/patch-xsltproc_Makefile_in b/package/libxslt/patches/patch-xsltproc_Makefile_in deleted file mode 100644 index 3802ce0fa..000000000 --- a/package/libxslt/patches/patch-xsltproc_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libxslt-1.1.24.orig/xsltproc/Makefile.in 2008-05-13 17:52:15.000000000 +0200 -+++ libxslt-1.1.24/xsltproc/Makefile.in 2011-01-11 17:06:56.000000000 +0100 -@@ -234,7 +234,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \ - -I$(top_builddir) -I$(top_builddir)/libxslt \ -- -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS) -+ -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) - - AM_CFLAGS = $(LIBGCRYPT_CFLAGS) - xsltproc_SOURCES = xsltproc.c |