[arch-commits] Commit in xdelta3/trunk (PKGBUILD regtest_size_t.patch)

[Alexander Rødseth]

    Date: Wednesday, May 13, 2015 @ 13:44:47
  Author: arodseth
Revision: 133365

upgpkg: xdelta3 3.0.9-1

Modified:
  xdelta3/trunk/PKGBUILD
Deleted:
  xdelta3/trunk/regtest_size_t.patch

----------------------+
 PKGBUILD             |   30 +++++++++++++-----------------
 regtest_size_t.patch |   11 -----------
 2 files changed, 13 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-13 11:00:42 UTC (rev 133364)
+++ PKGBUILD	2015-05-13 11:44:47 UTC (rev 133365)
@@ -5,7 +5,7 @@
 # Contributor: Henning Garus <henning.garus at gmail.com>
 
 pkgname=xdelta3
-pkgver=3.0.8
+pkgver=3.0.9
 pkgrel=1
 pkgdesc='Diff utility which works with binary files'
 arch=('x86_64' 'i686')
@@ -12,24 +12,19 @@
 url='http://xdelta.org/'
 license=('GPL')
 depends=('xz')
-source=("http://${pkgname/3}.googlecode.com/files/$pkgname-$pkgver.tar.xz"
-        'regtest_size_t.patch')
-# SHA1 sum from https://code.google.com/p/xdelta/downloads/detail?name=xdelta3-3.0.8.tar.xz&can=2&q=        
-sha1sums=('62c7a029e96c0904bb47a5e2f3de08473a185539'
-          'c2816b5d4bfb405d3adb771fa09b367a88971240')
+source=("https://github.com/jmacd/xdelta-devel/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz")
+sha1sums=('a3c28412052f3f49ba1ea60ca9c97fcb377cc70f')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-  
-  patch -Np1 -i ../regtest_size_t.patch
-}
+# Check fails, but upstream says the failure is harmless:
+# https://github.com/jmacd/xdelta/issues/194
+# Disabling the check, for now.
+#
+#check() {
+#  cd "$pkgname-$pkgver"
+#
+#  ./$pkgname test
+#}
 
-check() {
-  cd "$pkgname-$pkgver"
-
-  ./$pkgname test
-}
-
 build() {
   cd "$pkgname-$pkgver"
   
@@ -41,4 +36,5 @@
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
 
+# getver: github.com/jmacd/xdelta-devel/releases
 # vim:set ts=2 sw=2 et:

Deleted: regtest_size_t.patch
===================================================================
--- regtest_size_t.patch	2015-05-13 11:00:42 UTC (rev 133364)
+++ regtest_size_t.patch	2015-05-13 11:44:47 UTC (rev 133365)
@@ -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;
-   };