From 981d3059a94d5707fed0c0cb5a561aa6f7844dfc Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Wed, 4 Feb 2015 10:33:41 +0100 Subject: [PATCH] xz: Updated (5.0.5 -> 5.2.0) --- archiver/xz/0001-upstream-fixes.patch | 42 ------------------- .../xz/0002-opensde-use-automake-1.11.patch | 18 ++++---- archiver/xz/xz.desc | 6 +-- 3 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 archiver/xz/0001-upstream-fixes.patch diff --git a/archiver/xz/0001-upstream-fixes.patch b/archiver/xz/0001-upstream-fixes.patch deleted file mode 100644 index f4c08c9f7..000000000 --- a/archiver/xz/0001-upstream-fixes.patch +++ /dev/null @@ -1,42 +0,0 @@ -# --- 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 index 06751e398..be6016f5c 100644 --- a/archiver/xz/0002-opensde-use-automake-1.11.patch +++ b/archiver/xz/0002-opensde-use-automake-1.11.patch @@ -2,7 +2,7 @@ # 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 +# Copyright (C) 2013 - 2015 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -17,14 +17,14 @@ 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]) +--- ./configure.ac.orig 2014-12-21 19:49:36.000000000 +0100 ++++ ./configure.ac 2015-02-04 10:28:46.658258635 +0100 +@@ -486,7 +486,7 @@ + # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354 + # The -Wno-unsupported is used to silence warnings about missing + # "subdir-objects". +-AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests -Wno-unsupported]) ++AM_INIT_AUTOMAKE([1.11 foreign tar-v7 filename-length-max=99 -Wno-unsupported]) AC_PROG_LN_S AC_PROG_CC_C99 diff --git a/archiver/xz/xz.desc b/archiver/xz/xz.desc index bc73b460a..20008f966 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 - 2013 The OpenSDE Project +[COPY] Copyright (C) 2010 - 2015 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.5 +[V] 5.2.0 [P] X 01---5---9 106.000 -[D] 1505721127 xz-5.0.5.tar.bz2 http://tukaani.org/xz/ +[D] 1737019949 xz-5.2.0.tar.bz2 http://tukaani.org/xz/