From 21426f56755fb832ef95399eaa17754ce1c64616 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Mon, 15 Jan 2018 19:43:21 +0100
Subject: [PATCH] jigdo: fix build

Closes: #10850 [via git-merge-pr]
---
 srcpkgs/jigdo/patches/sizewidth.patch | 40 +++++++++++++++++++++++++++
 srcpkgs/jigdo/template                |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/jigdo/patches/sizewidth.patch

diff --git a/srcpkgs/jigdo/patches/sizewidth.patch b/srcpkgs/jigdo/patches/sizewidth.patch
new file mode 100644
index 00000000000..12309709c02
--- /dev/null
+++ b/srcpkgs/jigdo/patches/sizewidth.patch
@@ -0,0 +1,40 @@
+SIZE_WIDTH is already defined stdint.h
+
+--- src/mkimage.cc.orig	2005-07-09 21:14:46.000000000 +0200
++++ src/mkimage.cc	2018-01-15 19:36:50.781708093 +0100
+@@ -285,27 +285,27 @@
+ //______________________________________________________________________
+ 
+ namespace {
+-  const int SIZE_WIDTH = 12;
++  const int SIZE__WIDTH = 12;
+ }
+ 
+ ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
+-  s << "image-info  " << setw(SIZE_WIDTH) << size() << "              "
++  s << "image-info  " << setw(SIZE__WIDTH) << size() << "              "
+     << md5() << ' ' << blockLength() << '\n';
+   return s;
+ }
+ ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
+-  s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
+-    << setw(SIZE_WIDTH) << size() << '\n';
++  s << "in-template " << setw(SIZE__WIDTH) << offset() << ' '
++    << setw(SIZE__WIDTH) << size() << '\n';
+   return s;
+ }
+ ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
+-  s << "need-file   " << setw(SIZE_WIDTH) << offset() << ' '
+-    << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++  s << "need-file   " << setw(SIZE__WIDTH) << offset() << ' '
++    << setw(SIZE__WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+   return s;
+ }
+ ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
+-  s << "have-file   " << setw(SIZE_WIDTH) << offset() << ' '
+-    << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++  s << "have-file   " << setw(SIZE__WIDTH) << offset() << ' '
++    << setw(SIZE__WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+   return s;
+ }
+ 
diff --git a/srcpkgs/jigdo/template b/srcpkgs/jigdo/template
index 28f220077c1..16edbc817c8 100644
--- a/srcpkgs/jigdo/template
+++ b/srcpkgs/jigdo/template
@@ -1,7 +1,7 @@
 # Template file for 'jigdo'
 pkgname=jigdo
 version=0.7.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--without-libdb"
 makedepends="bzip2-devel zlib-devel"