[xdelta/f19] xdelta: allow the build for 32 bit architectures

Pavel Raiskup praiskup at fedoraproject.org
Tue Jun 18 13:17:08 UTC 2013


commit b4a90f9499d7d91c21c470f7b91eb56e4ba947d8
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Tue Jun 18 15:14:35 2013 +0200

    xdelta: allow the build for 32 bit architectures
    
    Related: #962800
    Version: 3.0.7-1

 xdelta.spec                    |    7 +++++++
 xdelta3-3.0.7-i686-build.patch |   13 +++++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/xdelta.spec b/xdelta.spec
index df3314a..4149633 100644
--- a/xdelta.spec
+++ b/xdelta.spec
@@ -11,6 +11,11 @@ BuildRequires: autoconf automake
 # for testsuite
 BuildRequires: ncompress
 
+# Allow the build also in 32 bit arches
+# ~> still downstream
+# ~> reported as the issue @161 upstream
+Patch1: xdelta3-3.0.7-i686-build.patch
+
 # Man page day fixes
 # ~> proposal: http://code.google.com/p/xdelta/issues/detail?id=158
 # ~> private #958492
@@ -24,6 +29,7 @@ algorithm to replace the standard diff program used by RCS
 
 %prep
 %setup -q -n %{name}3-%{version}
+%patch1 -p1 -b .build-i686
 %patch2 -p2 -b .man-page-day
 
 %build
@@ -58,6 +64,7 @@ popd
 %changelog
 * Tue Jun 18 2013 Pavel Raiskup <praiskup at redhat.com> - 3.0.7-1
 - rebase to 3.0.7, remove unneeded patch (#962800)
+- allow the build for 32 bit arches
 
 * Mon May 13 2013 Pavel Raiskup <praiskup at redhat.com> - 3.0.6-1
 - rebase to 3.0.6 (#958492)
diff --git a/xdelta3-3.0.7-i686-build.patch b/xdelta3-3.0.7-i686-build.patch
new file mode 100644
index 0000000..ca88a5f
--- /dev/null
+++ b/xdelta3-3.0.7-i686-build.patch
@@ -0,0 +1,13 @@
+diff --git a/testing/regtest.cc b/testing/regtest.cc
+index 12b712e..8219cc0 100644
+--- 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;
+   };


More information about the scm-commits mailing list