diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
| commit | c3b94090a6330f678ade2f767e76ab7802d3463e (patch) | |
| tree | e3d2321dce46bfdbc070fcee19e2852566510fe8 /core/file | |
| parent | 652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff) | |
| parent | 33feb015eb09eee76827f359e685fce981d88111 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/flumotion/PKGBUILD
community/gnash/PKGBUILD
community/kadu/PKGBUILD
community/mythplugins/PKGBUILD
community/performous/PKGBUILD
community/sleuthkit/PKGBUILD
community/virtualbox/PKGBUILD
community/wbar/PKGBUILD
core/attr/PKGBUILD
core/binutils/PKGBUILD
core/heimdal/PKGBUILD
core/sqlite3/PKGBUILD
extra/acpid/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/boost/PKGBUILD
extra/bs/PKGBUILD
extra/bzr/PKGBUILD
extra/cvsps/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/fetchmail/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libftdi/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/libx86/PKGBUILD
extra/lsdvd/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/multitail/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/scim/PKGBUILD
extra/socat/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/transmission/PKGBUILD
extra/vbetool/PKGBUILD
extra/vlc/PKGBUILD
extra/xchat-gnome/xchat-gnome.install
libre/kernel26-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
multilib/nspluginwrapper/PKGBUILD
testing/libgweather/libgweather.install
testing/mesa/PKGBUILD
Diffstat (limited to 'core/file')
| -rw-r--r-- | core/file/PKGBUILD | 12 | ||||
| -rw-r--r-- | core/file/file-5.07-zip-detect.patch | 13 |
2 files changed, 20 insertions, 5 deletions
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 17608e0fc..2038dd5b4 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123428 2011-05-11 11:07:46Z allan $ +# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file pkgver=5.07 -pkgrel=1 +pkgrel=3 pkgdesc="File type identification utility" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -13,9 +13,11 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.05-zip64.patch) + file-5.05-zip64.patch + file-5.07-zip-detect.patch) md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' - '385f020467debd98bd2d8df6143f93d0') + '385f020467debd98bd2d8df6143f93d0' + 'bcbf2e152f38003a2736298bbd0f37f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,7 +25,7 @@ build() { # identify zip64 files patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - + patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch ./configure --prefix=/usr --datadir=/usr/share/file make } diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch new file mode 100644 index 000000000..3e8f128d8 --- /dev/null +++ b/core/file/file-5.07-zip-detect.patch @@ -0,0 +1,13 @@ +--- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200 ++++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200 +@@ -654,6 +654,10 @@ + >>>>78 string -template Template + !:mime application/vnd.oasis.opendocument.image-template + ++>26 byte x Zip archive data ++ ++ ++ + # StarView Metafile + # From Pierre Ducroquet <pinaraf@pinaraf.info> + 0 string VCLMTF StarView MetaFile |