diff --git a/archiver/xz/0001-upstream-fixes.patch b/archiver/xz/0001-upstream-fixes.patch new file mode 100644 index 000000000..f4c08c9f7 --- /dev/null +++ b/archiver/xz/0001-upstream-fixes.patch @@ -0,0 +1,42 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../xz/0001-upstream-fixes.patch +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From 3dffda33f47dc220bb1738564fe02effa9da4c8e Mon Sep 17 00:00:00 2001 +From: Lasse Collin +Date: Mon, 15 Jul 2013 14:08:02 +0300 +Subject: [PATCH] Build: Fix the detection of missing CRC32. + +Thanks to Vincent Torri. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 305c858..cf566f5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -260,7 +260,7 @@ else + done + AC_MSG_RESULT([$enable_checks]) + fi +-if test "x$enable_checks_crc32" = xno ; then ++if test "x$enable_check_crc32" = xno ; then + AC_MSG_ERROR([For now, the CRC32 check must always be enabled.]) + fi + +-- +1.8.0 + diff --git a/archiver/xz/0002-opensde-use-automake-1.11.patch b/archiver/xz/0002-opensde-use-automake-1.11.patch new file mode 100644 index 000000000..06751e398 --- /dev/null +++ b/archiver/xz/0002-opensde-use-automake-1.11.patch @@ -0,0 +1,30 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../xz/0002-opensde-use-automake-1.11.patch +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +OpenSDE specific workaround because we are using automake 1.11.x on master +at this moment, which doesn't support the 'serial-tests' option. + +--- ./configure.ac.orig 2013-09-07 17:34:33.046072459 +0200 ++++ ./configure.ac 2013-09-07 17:35:24.983254426 +0200 +@@ -418,7 +418,7 @@ + + # Automake 1.10 should still be enough but you need to omit serial-tests. + dnl AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99]) +-AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests]) ++AM_INIT_AUTOMAKE([1.11 foreign tar-v7 filename-length-max=99]) + AC_PROG_LN_S + + AC_PROG_CC_C99 diff --git a/archiver/xz/xz.conf b/archiver/xz/xz.conf index d3435721f..f90472854 100644 --- a/archiver/xz/xz.conf +++ b/archiver/xz/xz.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../xz/xz.conf -# Copyright (C) 2010 The OpenSDE Project +# Copyright (C) 2010 - 2013 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -12,5 +12,8 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- +# we patch autotools file like configure.ac +autogen=1 + var_append GCC_WRAPPER_APPEND ' ' '-std=gnu99' var_append SYSGCC_WRAPPER_APPEND ' ' '-std=gnu99' diff --git a/archiver/xz/xz.desc b/archiver/xz/xz.desc index 95658c1da..bc73b460a 100644 --- a/archiver/xz/xz.desc +++ b/archiver/xz/xz.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../xz/xz.desc -[COPY] Copyright (C) 2010 - 2012 The OpenSDE Project +[COPY] Copyright (C) 2010 - 2013 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -30,7 +30,7 @@ [L] PublicDomain [S] Stable -[V] 5.0.4 +[V] 5.0.5 [P] X 01---5---9 106.000 -[D] 1168981953 xz-5.0.4.tar.bz2 http://tukaani.org/xz/ +[D] 1505721127 xz-5.0.5.tar.bz2 http://tukaani.org/xz/