diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-18 12:49:30 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-18 12:49:30 +0000 |
| commit | 6791f4d7f6270e8f88871df65e170e2d7f3824fa (patch) | |
| tree | d467db4f1af64111a89e0eb9466b77e6ff141b8c /main/xdelta3 | |
| parent | a7848b2061794c4c5169a7602fbfbd0eff4a9bbc (diff) | |
| download | aports-6791f4d7f6270e8f88871df65e170e2d7f3824fa.tar.bz2 aports-6791f4d7f6270e8f88871df65e170e2d7f3824fa.tar.xz | |
main/xdelta3: upgrade to 3.0.9
Diffstat (limited to 'main/xdelta3')
| -rw-r--r-- | main/xdelta3/APKBUILD | 16 | ||||
| -rw-r--r-- | main/xdelta3/regtest_size_t.patch | 11 | ||||
| -rw-r--r-- | main/xdelta3/xdelta3-makefile.patch | 33 |
3 files changed, 6 insertions, 54 deletions
diff --git a/main/xdelta3/APKBUILD b/main/xdelta3/APKBUILD index 3ea2ba9619..ece1ee883b 100644 --- a/main/xdelta3/APKBUILD +++ b/main/xdelta3/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xdelta3 -pkgver=3.0.8 +pkgver=3.0.9 pkgrel=0 pkgdesc="A diff utility which works with binary files" url="http://xdelta.org/" @@ -8,12 +8,11 @@ arch="all" license="GPL" depends= makedepends= -source="http://xdelta.googlecode.com/files/$pkgname-$pkgver.tar.xz - regtest_size_t.patch" +source="https://github.com/jmacd/xdelta-devel/releases/download/v$pkgver/xdelta3-$pkgver.tar.xz + " prepare() { cd $srcdir/$pkgname-$pkgver - patch -p1 -i $srcdir/regtest_size_t.patch || return 1 } build() { @@ -31,9 +30,6 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums="c3ae3286ce4193de8e03d5bcaccf3bc3 xdelta3-3.0.8.tar.xz -450492f0065160c2287b7e89223726e0 regtest_size_t.patch" -sha256sums="3a86f29c95664fb44b8a40ff22d9bcc3e87aa8c01f0ff75931a7fa78ed3d2e55 xdelta3-3.0.8.tar.xz -cd68457982aad262db74613b17887a04eabf8bf764f7d40c494a1b24e07c32ea regtest_size_t.patch" -sha512sums="c0ac97769bd1d80d74909cb271e0396d78dccfa555de834e3bedce59cb6616f7bc6e6f18699932a6677e05d243102648979331db1d2c18b429b76ad29a7b32a3 xdelta3-3.0.8.tar.xz -6f38f0bd81025637d57b0e9ccb298fe6f851806320657e07f03d50283207221ad8c45b81ad2614a6a621c35c7232f8f81b973b5805c8696306a88c0284042777 regtest_size_t.patch" +md5sums="f06e15f8765294d7f1807d96db9425d8 xdelta3-3.0.9.tar.xz" +sha256sums="554e28c4d1e27cec1f9f0659bc3020dca2e538b249d3e1bbe0a0cc4d8bb91763 xdelta3-3.0.9.tar.xz" +sha512sums="dd9e80617208a5efc2e33eaf2a61b23f3486ecb34bcc972209570e93833092ec277cf2addd813c563c1a61cac3d7a6f1830ef15d295798174ba2771760e9fb4f xdelta3-3.0.9.tar.xz" diff --git a/main/xdelta3/regtest_size_t.patch b/main/xdelta3/regtest_size_t.patch deleted file mode 100644 index e048135bdc..0000000000 --- a/main/xdelta3/regtest_size_t.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/testing/regtest.cc -+++ b/testing/regtest.cc -@@ -12,7 +12,7 @@ public: - Options() : encode_srcwin_maxsz(1<<20), - block_size(Constants::BLOCK_SIZE), - size_known(false) { } -- size_t encode_srcwin_maxsz; -+ uint64_t encode_srcwin_maxsz; - size_t block_size; - bool size_known; - }; diff --git a/main/xdelta3/xdelta3-makefile.patch b/main/xdelta3/xdelta3-makefile.patch deleted file mode 100644 index f7fc6a657d..0000000000 --- a/main/xdelta3/xdelta3-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur xdelta3.0v-old/Makefile xdelta3.0v/Makefile ---- xdelta3.0v-old/Makefile 2009-03-12 01:44:51.000000000 +0000 -+++ xdelta3.0v/Makefile 2009-03-14 17:02:33.000000000 +0000 -@@ -4,7 +4,7 @@ - UNAME = $(shell uname) - CYGWIN = $(findstring CYGWIN, $(UNAME)) - DARWIN = $(findstring Darwin, $(UNAME)) --PYVER = 2.5 -+PYVER = 2.6 - - ifeq ("$(CYGWIN)", "") - SWIGTGT = xdelta3module.so -@@ -200,6 +200,9 @@ - xdelta3.o: $(SOURCES) - $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o - -+xdelta3_PIC.o: $(SOURCES) -+ $(CC) -O3 $(CFLAGS) -fPIC -c xdelta3.c $(SWIG_FLAGS) -o xdelta3_PIC.o -+ - xdelta3_wrap.o: xdelta3_wrap.c - $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \ - -DHAVE_CONFIG_H \ -@@ -218,8 +221,8 @@ - cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages - - ifeq ("$(DARWIN)", "") --xdelta3module.so: xdelta3_wrap.o xdelta3.o -- ld -shared xdelta3.o xdelta3_wrap.o \ -+xdelta3module.so: xdelta3_wrap.o xdelta3_PIC.o -+ cc -shared xdelta3_PIC.o xdelta3_wrap.o \ - -o xdelta3module.so \ - /usr/lib/libpython$(PYVER).so \ - -lc |