Hello community, here is the log from the commit of package ht for openSUSE:Factory checked in at 2020-06-07 21:38:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ht (Old) and /work/SRC/openSUSE:Factory/.ht.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ht" Sun Jun 7 21:38:05 2020 rev:18 rq:812126 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ht/ht.changes 2017-06-12 15:31:59.272116840 +0200 +++ /work/SRC/openSUSE:Factory/.ht.new.3606/ht.changes 2020-06-07 21:38:29.157481981 +0200 @@ -1,0 +2,5 @@ +Sat Jun 6 23:33:36 UTC 2020 - Jan Engelhardt <[email protected]> + +- Rename ht-gcc7.diff to ht-gcc10.diff and adjust for gcc10. + +------------------------------------------------------------------- Old: ---- ht-gcc7.diff New: ---- ht-gcc10.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ht.spec ++++++ --- /var/tmp/diff_new_pack.3Mcx2j/_old 2020-06-07 21:38:30.009484682 +0200 +++ /var/tmp/diff_new_pack.3Mcx2j/_new 2020-06-07 21:38:30.009484682 +0200 @@ -1,7 +1,7 @@ # # spec file for package ht # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ # @@ -20,15 +20,14 @@ Version: 2.1.0 Release: 0 Summary: Disassembler, object dumper and hex editor -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Tools/Debuggers -Url: http://hte.sf.net/ +URL: http://hte.sf.net/ #Git-Clone: https://github.com/sebastianbiallas/ht Source: http://downloads.sf.net/hte/%name-%version.tar.bz2 Patch1: ht-no-date.diff -Patch2: ht-gcc7.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch2: ht-gcc10.diff BuildRequires: bison BuildRequires: flex BuildRequires: gcc-c++ @@ -54,27 +53,23 @@ and (especially) executable files. %prep -%setup -q -%patch -P 1 -P 2 -p1 +%autosetup -p1 %build -%configure --enable-release +%configure --enable-release CFLAGS="%optflags -Wno-narrowing" make %{?_smp_mflags} %install -b="%buildroot" -make install DESTDIR="$b" -pushd "$b/%_bindir/" +%make_install +pushd "%buildroot/%_bindir/" mv ht hte ln -s hte ht popd %files -%defattr(-,root,root) %_bindir/ht %files -n hte -%defattr(-,root,root) %_bindir/hte %doc AUTHORS ChangeLog KNOWNBUGS NEWS README TODO ++++++ ht-gcc7.diff -> ht-gcc10.diff ++++++ --- /work/SRC/openSUSE:Factory/ht/ht-gcc7.diff 2017-06-12 15:31:58.904168735 +0200 +++ /work/SRC/openSUSE:Factory/.ht.new.3606/ht-gcc10.diff 2020-06-07 21:38:28.049478468 +0200 @@ -10,9 +10,26 @@ [...] --- - htapp.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + cmds.h | 2 +- + htapp.cc | 2 +- + htmacho.cc | 2 +- + htmachohd.cc | 2 +- + io/types.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) +Index: ht-2.1.0/cmds.h +=================================================================== +--- ht-2.1.0.orig/cmds.h ++++ ht-2.1.0/cmds.h +@@ -25,7 +25,7 @@ + + #define CMD uint32 + +-#define msg_command 0x80000000 ++#define msg_command 0x80000000U + #define HT_COMMAND(c) (msg_command+(c)) + + #define cmd_quit HT_COMMAND(100) Index: ht-2.1.0/htapp.cc =================================================================== --- ht-2.1.0.orig/htapp.cc @@ -26,3 +43,42 @@ a = (a+b)/2; b = u/a; } +Index: ht-2.1.0/htmacho.cc +=================================================================== +--- ht-2.1.0.orig/htmacho.cc ++++ ht-2.1.0/htmacho.cc +@@ -146,7 +146,7 @@ void ht_macho::init(Bounds *b, File *f, + break; + case MACHO_CPU_TYPE_I386: + switch (c->flavor) { +- case -1: ++ case static_cast<unsigned int>(-1): + createHostStruct(&c->state, MACHO_I386_THREAD_STATE_struct, image_endianess); + break; + } +Index: ht-2.1.0/htmachohd.cc +=================================================================== +--- ht-2.1.0.orig/htmachohd.cc ++++ ht-2.1.0/htmachohd.cc +@@ -313,7 +313,7 @@ static ht_view *htmachoheader_init(Bound + switch (macho_shared->header.cputype) { + case MACHO_CPU_TYPE_I386: + switch (c->flavor) { +- case -1: ++ case static_cast<unsigned int>(-1): + m->add_staticmask_ptable(macho_i386_thread_state, ofs+4*4/*4 32bit words in thread_header*/, isbigendian); + break; + } +Index: ht-2.1.0/io/types.h +=================================================================== +--- ht-2.1.0.orig/io/types.h ++++ ht-2.1.0/io/types.h +@@ -87,7 +87,7 @@ union htmsg_param { + }; + + struct htmsg { +- int msg; ++ unsigned int msg; + int type; + htmsg_param data1; + htmsg_param data2;
