diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
| commit | 93db7f2fb23cba78cde4343b506a676e376ca4a8 (patch) | |
| tree | 3fec56215a344b1e01e49a27198f919ac981320b /community/pigz | |
| parent | c162e34d12c6cf76532a7f6b3d538d493a8bf17a (diff) | |
| parent | 39e9111d76d232d65ca0c43285dea5bd5d58d28e (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avant-window-navigator/PKGBUILD
community/awn-extras-applets/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/gnome-menus2/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpsim/PKGBUILD
community/kgraphviewer/PKGBUILD
community/kpovmodeler/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/python-basemap/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
community/qgo/PKGBUILD
community/ude/PKGBUILD
community/virtkey/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/aterm/PKGBUILD
extra/cups-pdf/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/libffado/PKGBUILD
extra/libtar/PKGBUILD
extra/maxima/PKGBUILD
extra/php-xcache/PKGBUILD
extra/postgresql/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xauth/PKGBUILD
Diffstat (limited to 'community/pigz')
| -rw-r--r-- | community/pigz/PKGBUILD | 15 | ||||
| -rw-r--r-- | community/pigz/pigz-2.3-make.patch | 25 |
2 files changed, 7 insertions, 33 deletions
diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD index 2dfd3c71b..261ffbea5 100644 --- a/community/pigz/PKGBUILD +++ b/community/pigz/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 86235 2013-03-13 19:48:34Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 98523 2013-10-12 20:12:05Z jsteel $ +# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org> +# Contributor: Bartłomiej Piotrowski # Contributor: Laszlo Papp <djszapi2@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=pigz -pkgver=2.3 +pkgver=2.3.1 pkgrel=1 pkgdesc='Parallel implementation of the gzip file compressor' arch=('i686' 'x86_64' 'mips64el') url='http://www.zlib.net/pigz/' license=('custom') depends=('zlib') -source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz - pigz-2.3-make.patch) -md5sums=('042e3322534f2c3d761736350cac303f' - 'f6291ee36e36e098d7fbf0655a89b183') +source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('e803f8bc0770c7a5e96dccb1d2dd2aab') build() { cd "$srcdir"/$pkgname-$pkgver - patch -Np1 -i "$srcdir"/pigz-2.3-make.patch + make } diff --git a/community/pigz/pigz-2.3-make.patch b/community/pigz/pigz-2.3-make.patch deleted file mode 100644 index f014c7b02..000000000 --- a/community/pigz/pigz-2.3-make.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 545a9350f8026f6c9826dd4fa7ab6000d8826d78 Mon Sep 17 00:00:00 2001 -From: Tim Harder <radhermit@gmail.com> -Date: Wed, 6 Mar 2013 15:51:27 -0800 -Subject: [PATCH] Respect LDFLAGS and explicitly link to math library - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3cc231d..48d1f26 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra - - - pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o -- $(CC) -o pigz $^ -lpthread -lz -+ $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lz -lm - ln -f pigz unpigz - - pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h --- -1.8.1.5 - |