jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

jigdo: fix build

Browse source 
Closes: #10850 [via git-merge-pr]
This commit is contained in:
newbluemoon 2018-01-15 19:43:21 +01:00 committed by Jürgen Buchmüller
parent 304608af9c
commit 21426f5675
2 changed files with 41 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
srcpkgs/jigdo/patches/sizewidth.patch Normal file
View file

@ -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;
}

2
srcpkgs/jigdo/template
View file

@ -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"