[arch-commits] Commit in xdelta3/repos (3 files)

[Allan McRae]

    Date: Saturday, July 4, 2009 @ 10:36:52
  Author: allan
Revision: 44853

Merged revisions 44851 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/xdelta3/trunk

........
  r44851 | allan | 2009-07-05 00:34:05 +1000 (Sun, 05 Jul 2009) | 2 lines
  
  upgpkg: xdelta3 3.0v-2
      add support for xz archives
........

Added:
  xdelta3/repos/extra-x86_64/xdelta3-xz.patch
    (from rev 44851, xdelta3/trunk/xdelta3-xz.patch)
Modified:
  xdelta3/repos/extra-x86_64/	(properties)
  xdelta3/repos/extra-x86_64/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++---
 xdelta3-xz.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)


Property changes on: xdelta3/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xdelta3/trunk:1-29955
   + /xdelta3/trunk:1-44852

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-04 14:35:11 UTC (rev 44852)
+++ extra-x86_64/PKGBUILD	2009-07-04 14:36:52 UTC (rev 44853)
@@ -5,7 +5,7 @@
 
 pkgname=xdelta3
 pkgver=3.0v
-pkgrel=1
+pkgrel=2
 pkgdesc="A diff utility which works with binary files"
 arch=('i686' 'x86_64')
 url="http://xdelta.org/"
@@ -13,13 +13,16 @@
 makedepends=('python')
 optdepends=('python: for python modules')
 source=(http://xdelta.googlecode.com/files/xdelta$pkgver.tar.gz
-        xdelta3-makefile.patch)
+        xdelta3-makefile.patch
+        xdelta3-xz.patch)
 md5sums=('6b5faeb88028a1211cb047e49b687a3a'
-         '35aa0d20a27791addeb929591a78bd3f')
+         '35aa0d20a27791addeb929591a78bd3f'
+         'fb1e685d810a15f04b7bdbc9a3f3e635')
 
 build() {
   cd $srcdir/xdelta$pkgver
   patch -Np1 -i $srcdir/xdelta3-makefile.patch
+  patch -Np1 -i $srcdir/xdelta3-xz.patch
   
   # xdelta3 binary
   make xdelta3 || return 1

Copied: xdelta3/repos/extra-x86_64/xdelta3-xz.patch (from rev 44851, xdelta3/trunk/xdelta3-xz.patch)
===================================================================
--- extra-x86_64/xdelta3-xz.patch	                        (rev 0)
+++ extra-x86_64/xdelta3-xz.patch	2009-07-04 14:36:52 UTC (rev 44853)
@@ -0,0 +1,12 @@
+diff -ruNa a/xdelta3-main.h b/xdelta3-main.h
+--- a/xdelta3-main.h    2009-01-30 05:59:02.000000000 +0100
++++ b/xdelta3-main.h    2009-05-13 12:43:00.000000000 +0200
+@@ -355,6 +355,7 @@
+     RD_NONEXTERNAL },
+   { "bzip2",    "-cf",   "bzip2",      "-dcf",   "B", "BZh",          3, 0 },
+   { "gzip",     "-cf",   "gzip",       "-dcf",   "G", "\037\213",     2, 0 },
++  { "xz",       "-cf",   "xz",         "-dcf",   "Y", "\xfd\x37\x7a\x58\x5a\x00",     2, 0 },
+   { "compress", "-cf",   "uncompress", "-cf",    "Z", "\037\235",     2, 0 },
+ 
+   /* TODO: add commandline support for magic-less formats */
+