Hello community, here is the log from the commit of package cuishark for openSUSE:Factory checked in at 2019-08-23 11:06:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cuishark (Old) and /work/SRC/openSUSE:Factory/.cuishark.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cuishark" Fri Aug 23 11:06:12 2019 rev:2 rq:725289 version:0.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cuishark/cuishark.changes 2019-06-19 21:02:56.798217260 +0200 +++ /work/SRC/openSUSE:Factory/.cuishark.new.7948/cuishark.changes 2019-08-23 11:06:26.390485701 +0200 @@ -1,0 +2,5 @@ +Sat Aug 17 19:56:43 UTC 2019 - Antoine Belvire <[email protected]> + +- Fix build on i586: Add cuishark-0.1.2-fix-32bit-build.patch. + +------------------------------------------------------------------- New: ---- cuishark-0.1.2-fix-32bit-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cuishark.spec ++++++ --- /var/tmp/diff_new_pack.tjvb3B/_old 2019-08-23 11:06:29.050485269 +0200 +++ /var/tmp/diff_new_pack.tjvb3B/_new 2019-08-23 11:06:29.054485268 +0200 @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: cuishark Version: 0.1.2 Release: 0 @@ -23,6 +24,8 @@ Group: Productivity/Networking/Diagnostic URL: https://github.com/slankdev/cuishark Source: https://github.com/slankdev/cuishark/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM -- Fix build on 32bit platform +Patch0: cuishark-0.1.2-fix-32bit-build.patch BuildRequires: gcc-c++ BuildRequires: libpcap-devel BuildRequires: ncurses-devel @@ -33,6 +36,7 @@ %prep %setup -q +%patch0 -p1 %build make %{?_smp_mflags} @@ -40,7 +44,6 @@ %install install -D -m 0755 cuishark %{buildroot}/%{_bindir}/cuishark - %files %doc README.md %license LICENSE ++++++ cuishark-0.1.2-fix-32bit-build.patch ++++++ "long unsigned int" (format: "lu") and "uint64_t" don't match on i586. Size of "long unsigned int" is only 32-bit on i586. Use the appropriate format for uint64_t: PRIu64. -- diff -up cuishark-0.1.2/PacketListPane.cc.orig cuishark-0.1.2/PacketListPane.cc --- cuishark-0.1.2/PacketListPane.cc.orig 2019-08-17 21:44:46.672894062 +0200 +++ cuishark-0.1.2/PacketListPane.cc 2019-08-17 22:05:40.600946047 +0200 @@ -1,4 +1,4 @@ - +#include <inttypes.h> #include "PacketListPane.h" #include "protocol.h" #include "TextPane.h" @@ -153,11 +153,7 @@ std::string Packet::to_str() const { using namespace slankdev; char sstr[1000]; -#if __APPLE__ - sprintf(sstr, "%5zd %-13llu %-20s %-20s %-6s %5zd %-10s" , number, time, -#else - sprintf(sstr, "%5zd %-13lu %-20s %-20s %-6s %5zd %-10s" , number, time, -#endif + sprintf(sstr, "%5zd %-13" PRIu64 "%-20s %-20s %-6s %5zd %-10s" , number, time, src.c_str(), dst.c_str(), protocol.c_str(), len,
