[arch-commits] Commit in xz/trunk (PKGBUILD compile-fix.patch)

[Pierre Schmitz]

    Date: Friday, March 30, 2012 @ 12:40:43
  Author: pierre
Revision: 154764

upgpkg: xz 5.0.3-2

rebuild old package; cleanup; add compile-fix

Added:
  xz/trunk/compile-fix.patch
Modified:
  xz/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   12 ++++++------
 compile-fix.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-30 16:39:38 UTC (rev 154763)
+++ PKGBUILD	2012-03-30 16:40:43 UTC (rev 154764)
@@ -4,23 +4,23 @@
 
 pkgname=xz
 pkgver=5.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
 arch=('i686' 'x86_64')
 url='http://tukaani.org/xz/'
 license=('GPL' 'LGPL' 'custom')
 depends=('sh')
-provides=('lzma' 'lzma-utils' 'xz-utils')
-replaces=('lzma' 'lzma-utils' 'xz-utils')
-conflicts=('lzma' 'lzma-utils' 'xz-utils')
 options=('!libtool')
 source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
+        "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig"
+        'compile-fix.patch')
 md5sums=('fefe52f9ecd521de2a8ce38c21a27574'
-         'd0725667a6dae0853194dc691e900e26')
+         'd0725667a6dae0853194dc691e900e26'
+         'b74e4f7793848cc5765c848ea30f971f')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
+	patch -p1 -i ${srcdir}/compile-fix.patch
 
 	./configure --prefix=/usr \
 		--disable-rpath \

Added: compile-fix.patch
===================================================================
--- compile-fix.patch	                        (rev 0)
+++ compile-fix.patch	2012-03-30 16:40:43 UTC (rev 154764)
@@ -0,0 +1,28 @@
+From 7db6bdf4abcf524115be2cf5659ed540cef074c5 Mon Sep 17 00:00:00 2001
+From: Lasse Collin <lasse.collin at tukaani.org>
+Date: Tue, 10 Jan 2012 17:13:03 +0200
+Subject: [PATCH] Tests: Fix a compiler warning with _FORTIFY_SOURCE.
+
+Reported here:
+http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385
+---
+ tests/create_compress_files.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/tests/create_compress_files.c b/tests/create_compress_files.c
+index 44367d8..bd5b4ef 100644
+--- a/tests/create_compress_files.c
++++ b/tests/create_compress_files.c
+@@ -79,7 +79,8 @@ static void
+ write_abc(FILE *file)
+ {
+ 	for (size_t i = 0; i < 12345; ++i)
+-		fwrite("abc\n", 4, 1, file);
++		if (fwrite("abc\n", 4, 1, file) != 1)
++			exit(1);
+ }
+ 
+ 
+-- 
+1.7.6
+