Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grfcodec for openSUSE:Factory checked in at 2021-02-22 14:40:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grfcodec (Old) and /work/SRC/openSUSE:Factory/.grfcodec.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grfcodec" Mon Feb 22 14:40:42 2021 rev:5 rq:874261 version:6.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/grfcodec/grfcodec.changes 2017-02-03 17:41:35.215701232 +0100 +++ /work/SRC/openSUSE:Factory/.grfcodec.new.2378/grfcodec.changes 2021-02-22 14:41:04.524665234 +0100 @@ -1,0 +2,7 @@ +Tue Feb 16 09:56:09 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org> + +- Add bb692b2c723c5e87cc8f89f445928e97594d5b8f.patch: Do not use + uint for command id. Fixes build with gcc 10. +- Switch source and url tags to github, where this code now lives. + +------------------------------------------------------------------- Old: ---- grfcodec-6.0.6-source.tar.xz New: ---- 6.0.6.tar.gz bb692b2c723c5e87cc8f89f445928e97594d5b8f.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grfcodec.spec ++++++ --- /var/tmp/diff_new_pack.ousR3k/_old 2021-02-22 14:41:05.236666024 +0100 +++ /var/tmp/diff_new_pack.ousR3k/_new 2021-02-22 14:41:05.240666029 +0100 @@ -1,7 +1,7 @@ # # spec file for package grfcodec # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 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,10 +20,11 @@ Version: 6.0.6 Release: 0 Summary: A suite of programs to modify Transport Tycoon Deluxe's GRF files -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Building -Url: http://dev.openttdcoop.org/projects/grfcodec/ -Source: http://binaries.openttd.org/extra/grfcodec/%{version}/grfcodec-%{version}-source.tar.xz +URL: https://github.com/OpenTTD/grfcodec +Source: https://github.com/OpenTTD/grfcodec/archive/%{version}.tar.gz +Patch0: https://github.com/OpenTTD/grfcodec/commit/bb692b2c723c5e87cc8f89f445928e97594d5b8f.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -45,7 +46,7 @@ or PNG files are encoded to form GRF files. %prep -%setup -q +%autosetup -p1 %build CXXFLAGS="%{optflags}" make %{?_smp_mflags} ++++++ bb692b2c723c5e87cc8f89f445928e97594d5b8f.patch ++++++ >From bb692b2c723c5e87cc8f89f445928e97594d5b8f Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman <matth...@stdin.nl> Date: Fri, 30 Oct 2020 18:03:28 +0100 Subject: [PATCH] Fix #5: Do not use uint for command id (#6) Since gcc 10, comparing this variable with -1 in a switch produces a narrowing conversion error, breaking the build. Since `find_command` returns an int, better to just store it as such as well. This also makes some other casts unneeded, so remove those as well. --- src/command.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/command.cpp b/src/command.cpp index 9aa0e14..1f32cf1 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -300,8 +300,9 @@ bool parse_comment(const string&line){ break; case BEAUTIFY:{ commandstream>>command_part; - uint val=find_command(command_part,beaut),togglebit; - if(val!=(uint)-1&&val!=OFF)_commandState.beautifier=true; + int val=find_command(command_part,beaut); + uint togglebit; + if(val!=-1&&val!=OFF)_commandState.beautifier=true; switch(val){ case -1: IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name); @@ -372,7 +373,7 @@ bool parse_comment(const string&line){ dotoggle: commandstream>>command_part; val=find_command(command_part,beaut); - if(!commandstream||val==(uint)-1){ + if(!commandstream||val==-1){ IssueMessage(0,COMMAND_INVALID_ARG,gen[BEAUTIFY].name); return true; }
