diff options
| author |   Matteo Bernardini | 2019-09-14 07:57:43 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2019-09-14 07:57:43 +0200 |
| commit | de40343a1db85e9c173db1c195923e0157d93cfe (patch) | |
| tree | 72c35cdc13e9823bcfb4d26866f4b97b1440420b /network/jigdo | |
| parent | 50b7e832ae3d4c1f51d3d0e93ab9face1a8d036d (diff) | |
| download | slackbuilds-current-20190914.1.tar.gz | |
20190914.1 global branch merge.current-20190914.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'network/jigdo')
| -rw-r--r-- | network/jigdo/jigdo-0.7.3-gcc7.patch | 39 | ||||
| -rw-r--r-- | network/jigdo/jigdo.SlackBuild | 3 |
2 files changed, 42 insertions, 0 deletions
diff --git a/network/jigdo/jigdo-0.7.3-gcc7.patch b/network/jigdo/jigdo-0.7.3-gcc7.patch new file mode 100644 index 0000000000..d5f0c8a4d0 --- /dev/null +++ b/network/jigdo/jigdo-0.7.3-gcc7.patch @@ -0,0 +1,39 @@ +diff -Naur jigdo-0.7.3.orig/src/mkimage.cc jigdo-0.7.3/src/mkimage.cc +--- jigdo-0.7.3.orig/src/mkimage.cc 2005-07-09 21:14:46.000000000 +0200 ++++ jigdo-0.7.3/src/mkimage.cc 2017-02-17 14:47:12.884488507 +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/network/jigdo/jigdo.SlackBuild b/network/jigdo/jigdo.SlackBuild index 67e467dde2..ef17522f77 100644 --- a/network/jigdo/jigdo.SlackBuild +++ b/network/jigdo/jigdo.SlackBuild @@ -73,6 +73,9 @@ find -L . \ # apply some patches from debian zcat $CWD/jigdo_0.7.3-3.diff.gz | patch -p1 +# Fic for gcc-7.x, thanks fedora! +patch -p1 < $CWD/jigdo-0.7.3-gcc7.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |