[rpms/jigdo] epel10.2: Add jigdo-0.7.3-gcc7.patch (Fix F26FTBFS).

[rpms/jigdo] epel10.2: Add jigdo-0.7.3-gcc7.patch (Fix F26FTBFS).

[@ 2026-08-21 18:59 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/jigdo
Branch : epel10.2
Commit : d3af5d2fd6962f8f6779c4187792dc2dc21d1afe
Author : Ralf Corsépius <corsepiu@fedoraproject.org>
Date   : 2017-02-17T15:01:48+01:00
Stats  : +48/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/jigdo/c/d3af5d2fd6962f8f6779c4187792dc2dc21d1afe?branch=epel10.2

Log:
Add jigdo-0.7.3-gcc7.patch (Fix F26FTBFS).

---
diff --git a/jigdo-0.7.3-gcc7.patch b/jigdo-0.7.3-gcc7.patch
new file mode 100644
index 0000000..d5f0c8a
--- /dev/null
+++ b/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/jigdo.spec b/jigdo.spec
index c162122..981b622 100644
--- a/jigdo.spec
+++ b/jigdo.spec
@@ -1,6 +1,6 @@
 Name:          jigdo
 Version:       0.7.3
-Release:       24%{?dist}
+Release:       25%{?dist}
 Summary:       Ease distribution of large files over the Internet
 
 Group:         Applications/Internet
@@ -11,6 +11,10 @@ Source0:       http://atterer.org/sites/atterer/files/2009-08/jigdo/%{name}-%{ve
 Source1:       jigdo.desktop
 Patch1:        jigdo-0.7.1-debug.patch
 Patch2:        jigdo-0.7.3-gcc43.patch
+# rename SIZE_WIDTH into size_width to avoid
+# preprocessor symbol clash with c++14/gcc7 (F26FTBFS)
+Patch3:        jigdo-0.7.3-gcc7.patch
+
 BuildRequires: libdb-devel, bzip2-devel, curl-devel, /bin/awk, gettext
 BuildRequires: desktop-file-utils, gtk2-devel >= 0:2.0.6
 Requires:      wget
@@ -39,6 +43,7 @@ GTK2 frontend to jigdo.
 %setup -q
 %patch1 -p1 -b .debug
 %patch2 -p1 -b .gcc43
+%patch3 -p1
 
 %build
 export LDFLAGS="$LDFLAGS -lpthread"
@@ -89,6 +94,9 @@ install -m 0755 scripts/jigdo-mirror $RPM_BUILD_ROOT%{_bindir}/jigdo-mirror
 
 
 %changelog
+* Fri Feb 17 2017 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.7.3-25
+- Add jigdo-0.7.3-gcc7.patch (Fix F26FTBFS).
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.3-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild