Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openrct2 for openSUSE:Factory checked in at 2023-04-05 21:28:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openrct2 (Old) and /work/SRC/openSUSE:Factory/.openrct2.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openrct2" Wed Apr 5 21:28:47 2023 rev:14 rq:1077564 version:0.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/openrct2/openrct2.changes 2022-12-19 14:08:13.938654435 +0100 +++ /work/SRC/openSUSE:Factory/.openrct2.new.19717/openrct2.changes 2023-04-05 21:36:09.922743224 +0200 @@ -1,0 +2,12 @@ +Sun Mar 19 16:32:53 UTC 2023 - Björn Bidar <bjorn.bi...@thaodan.de> + +- Fix loading of title sequences, adjust path. + https://github.com/OpenRCT2/OpenRCT2/issues/8110 +- Make titlesequences package noarch, it doesn't contain architecture specific + files. +- Add 0001-GCC-13-fixes-19519.patch to fix building with GCC 13: + https://github.com/OpenRCT2/OpenRCT2/pull/19519 +- Update dependencies + * objects 1.3.7 (sync with upstream CMakeLists.txt of 0.4.3) + +------------------------------------------------------------------- @@ -268,2 +279,0 @@ - - Old: ---- objects-1.3.5.tar.gz New: ---- 0001-GCC-13-fixes-19519.patch objects-1.3.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openrct2.spec ++++++ --- /var/tmp/diff_new_pack.AzW8vy/_old 2023-04-05 21:36:11.286751009 +0200 +++ /var/tmp/diff_new_pack.AzW8vy/_new 2023-04-05 21:36:11.294751054 +0200 @@ -1,7 +1,7 @@ # # spec file for package openrct2 # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif %define title_version 0.4.0 %define title_version_url %{title_version} -%define objects_version 1.3.5 +%define objects_version 1.3.7 Name: openrct2 Version: 0.4.3 Release: 0 @@ -33,6 +33,8 @@ Source0: https://github.com/OpenRCT2/OpenRCT2/archive/v%{version}/OpenRCT2-%{version}.tar.gz Source1: https://github.com/OpenRCT2/title-sequences/archive/v%{title_version_url}/title-sequences-%{title_version_url}.tar.gz Source2: https://github.com/OpenRCT2/objects/archive/v%{objects_version}.tar.gz#/objects-%{objects_version}.tar.gz +#PATCH-FIX-UPSTREAM Included in next release: https://github.com/OpenRCT2/OpenRCT2/pull/19519 +Patch1: 0001-GCC-13-fixes-19519.patch BuildRequires: cmake >= 3.9 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -70,6 +72,7 @@ Summary: Titlesequences for openRCT2 Group: Amusements/Games/Strategy/Other Requires: %{name} = %{version} +BuildArch: noarch %description titlesequences This package contains tilesequences like the original ones @@ -77,7 +80,10 @@ When using RCT1 sequences, the original RCT1 files have to be installed. %prep +# Autosetup doesn't work here: +# https://github.com/rpm-software-management/rpm/issues/1204 %setup -q -n OpenRCT2-%{version} -a 1 -a 2 +%autopatch -p1 # Remove build time references so build-compare can do its work sed -i "s/__DATE__/\"openSUSE\"/" src/openrct2/Version.h @@ -107,8 +113,8 @@ %install %cmake_install -mkdir -p '%{buildroot}%{_datadir}/%{name}/title' -cp -v title-sequences-%{title_version_url}/title/*.parkseq "%{buildroot}%{_datadir}/%{name}/title" +mkdir -p '%{buildroot}%{_datadir}/%{name}/sequence' +cp -v title-sequences-%{title_version_url}/title/*.parkseq "%{buildroot}%{_datadir}/%{name}/sequence" mkdir -p '%{buildroot}%{_datadir}/%{name}/object' cp -vR objects-%{objects_version}/objects/* '%{buildroot}%{_datadir}/%{name}/object' @@ -129,7 +135,7 @@ %{_mandir}/man6/openrct2.6%{?ext_man} %{_mandir}/man6/openrct2-cli.6%{?ext_man} %{_datadir}/openrct2/ -%exclude %{_datadir}/openrct2/title/rct* +%exclude %{_datadir}/openrct2/sequence/rct* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/applications/*.desktop %dir %{_datadir}/metainfo/ @@ -138,6 +144,6 @@ %files titlesequences %license licence.txt -%{_datadir}/openrct2/title/rct* +%{_datadir}/openrct2/sequence/rct* %changelog ++++++ 0001-GCC-13-fixes-19519.patch ++++++ >From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisoz...@users.noreply.github.com> Date: Tue, 28 Feb 2023 20:04:52 +0100 Subject: [PATCH] GCC 13 fixes (#19519) Upstream: merged, https://github.com/OpenRCT2/OpenRCT2/pull/19519 This addresses issues when compiling with GCC 13 --- src/openrct2/park/ParkFile.cpp | 2 +- src/openrct2/park/ParkFile.h | 1 + src/openrct2/ride/coaster/JuniorRollerCoaster.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index 5be5e18ff8a16d2a99ea9ba87cd4d9c15d4ad766..376fe5ca9cdbefe4847099f2a8ea44e25a5b617d 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -795,7 +795,7 @@ namespace OpenRCT2 // Awards if (version <= 6) { - Award awards[RCT2::Limits::MaxAwards]; + Award awards[RCT2::Limits::MaxAwards]{}; cs.ReadWriteArray(awards, [&cs](Award& award) { if (award.Time != 0) { diff --git a/src/openrct2/park/ParkFile.h b/src/openrct2/park/ParkFile.h index 7df5ab09595799ac4d52c2f1974c908a21c0b473..3e7c6c06977f9c6a9e20c0797466516cab6f3724 100644 --- a/src/openrct2/park/ParkFile.h +++ b/src/openrct2/park/ParkFile.h @@ -1,5 +1,6 @@ #pragma once +#include <cstdint> #include <string_view> #include <vector> diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 8a53f3d90a78b4e7353f205e18bc07462c236b29..a029b298d978935108ce9b3a6936a70c3d63ba63 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -5170,7 +5170,7 @@ void junior_rc_paint_track_60_deg_up( if (track_paint_util_should_paint_supports(session.MapPosition)) { MetalASupportsPaintSetup( - session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction], height, + session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction & 3], height, session.TrackColours[SCHEME_SUPPORTS]); } @@ -5262,7 +5262,7 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up( if (track_paint_util_should_paint_supports(session.MapPosition)) { MetalASupportsPaintSetup( - session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction], height, + session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction & 3], height, session.TrackColours[SCHEME_SUPPORTS]); } ++++++ objects-1.3.5.tar.gz -> objects-1.3.7.tar.gz ++++++ ++++ 8060 lines of diff (skipped)
