diff --git a/.gitignore b/.gitignore index e62f774..8189119 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ openmsx-0.7.2.tar.gz /openmsx-catapult-17.0.tar.gz /openmsx-18.0.tar.gz /openmsx-catapult-18.0.tar.gz +/openmsx-19.0.tar.gz +/openmsx-catapult-19.0.tar.gz diff --git a/openmsx-18.0-gcc13.patch b/openmsx-18.0-gcc13.patch deleted file mode 100644 index e16db0c..0000000 --- a/openmsx-18.0-gcc13.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -durN openmsx-18.0.orig/src/utils/hash_set.hh openmsx-18.0/src/utils/hash_set.hh ---- openmsx-18.0.orig/src/utils/hash_set.hh 2022-06-12 15:53:09.000000000 +0200 -+++ openmsx-18.0/src/utils/hash_set.hh 2023-02-04 13:36:45.464895318 +0100 -@@ -11,6 +11,7 @@ - #include "xrange.hh" - #include - #include -+#include - #include - #include - #include diff --git a/openmsx-18.0-wx32.patch b/openmsx-18.0-wx32.patch deleted file mode 100644 index 9a2e4c7..0000000 --- a/openmsx-18.0-wx32.patch +++ /dev/null @@ -1,487 +0,0 @@ -From 218825a31c7ccf68a641acb813e9dda5cea4eb44 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Piotr=20Jagie=C5=82=C5=82o?= - -Date: Wed, 31 Aug 2022 00:41:46 +0200 -Subject: [PATCH] fix XRC warnings in wxWidgets 3.2.0 (#44) - -Fix XRC warnings in wxWidgets 3.2.0 - -Whilst keeping things working with 3.0. Thanks! ---- - dialogs/about.wxg | 3 --- - dialogs/audiocontrols.wxg | 13 +++++-------- - dialogs/catapult.wxg | 26 +++++++++++++------------- - dialogs/checkconfigs.wxg | 2 +- - dialogs/config.wxg | 2 +- - dialogs/fullscreen.wxg | 6 +++--- - dialogs/ipsselect.wxg | 2 +- - dialogs/misccontrols.wxg | 2 +- - dialogs/romtype.wxg | 2 +- - dialogs/screenshot.wxg | 6 +++--- - dialogs/session.wxg | 2 +- - dialogs/videocontrols.wxg | 23 +++++++++++------------ - 12 files changed, 41 insertions(+), 48 deletions(-) - -diff --git a/dialogs/about.wxg b/dialogs/about.wxg -index 90a7688..a99a8d5 100644 ---- a/dialogs/about.wxg -+++ b/dialogs/about.wxg -@@ -30,7 +30,6 @@ - - wxHORIZONTAL - -- wxALIGN_CENTER_HORIZONTAL - 0 - - -@@ -55,7 +54,6 @@ - - wxHORIZONTAL - -- wxALIGN_CENTER_HORIZONTAL - 0 - - -@@ -80,7 +78,6 @@ - - wxHORIZONTAL - -- wxALIGN_CENTER_HORIZONTAL - 0 - - -diff --git a/dialogs/audiocontrols.wxg b/dialogs/audiocontrols.wxg -index 92386fd..929cf13 100644 ---- a/dialogs/audiocontrols.wxg -+++ b/dialogs/audiocontrols.wxg -@@ -14,7 +14,7 @@ - wxVERTICAL - - -- wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxEXPAND - 0 - - -@@ -22,7 +22,7 @@ - - wxHORIZONTAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_VERTICAL - 0 - - -@@ -58,7 +58,7 @@ - - wxVERTICAL - -- wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL -+ wxLEFT|wxRIGHT - 5 - - -@@ -68,7 +68,7 @@ - - - -- wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL -+ wxLEFT|wxRIGHT - 5 - - -@@ -78,7 +78,7 @@ - - - -- wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL -+ wxLEFT|wxRIGHT - 5 - - -@@ -151,7 +151,6 @@ - - wxVERTICAL - -- wxALIGN_CENTER_VERTICAL - 0 - - -@@ -161,7 +160,6 @@ - - - -- wxALIGN_CENTER_VERTICAL - 0 - - -@@ -171,7 +169,6 @@ - - - -- wxALIGN_CENTER_VERTICAL - 0 - - -diff --git a/dialogs/catapult.wxg b/dialogs/catapult.wxg -index a2fe2cd..f8885b0 100644 ---- a/dialogs/catapult.wxg -+++ b/dialogs/catapult.wxg -@@ -8,7 +8,7 @@ - - wxVERTICAL - -- wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxEXPAND - 0 - - -@@ -49,7 +49,7 @@ - - wxVERTICAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_HORIZONTAL - 0 - - -@@ -58,7 +58,7 @@ - - - -- wxTOP|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxALIGN_CENTER_HORIZONTAL - 2 - - -@@ -75,7 +75,7 @@ - - wxVERTICAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_HORIZONTAL - 0 - - -@@ -84,7 +84,7 @@ - - - -- wxTOP|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxALIGN_CENTER_HORIZONTAL - 2 - - -@@ -102,7 +102,7 @@ - - wxVERTICAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_HORIZONTAL - 0 - - -@@ -111,7 +111,7 @@ - - - -- wxTOP|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxALIGN_CENTER_HORIZONTAL - 2 - - -@@ -128,7 +128,7 @@ - - wxVERTICAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_HORIZONTAL - 0 - - -@@ -137,7 +137,7 @@ - - - -- wxTOP|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxALIGN_CENTER_HORIZONTAL - 2 - - -@@ -154,7 +154,7 @@ - - wxVERTICAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_HORIZONTAL - 0 - - -@@ -163,7 +163,7 @@ - - - -- wxTOP|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxALIGN_CENTER_HORIZONTAL - 2 - - -@@ -180,7 +180,7 @@ - - wxVERTICAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_HORIZONTAL - 0 - - -@@ -189,7 +189,7 @@ - - - -- wxTOP|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxALIGN_CENTER_HORIZONTAL - 2 - - -diff --git a/dialogs/checkconfigs.wxg b/dialogs/checkconfigs.wxg -index c3c2672..ed0251b 100644 ---- a/dialogs/checkconfigs.wxg -+++ b/dialogs/checkconfigs.wxg -@@ -191,7 +191,7 @@ - - - -- wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALL|wxALIGN_CENTER_HORIZONTAL - 10 - - -diff --git a/dialogs/config.wxg b/dialogs/config.wxg -index 94e3a27..f388b17 100644 ---- a/dialogs/config.wxg -+++ b/dialogs/config.wxg -@@ -87,7 +87,7 @@ - - - -- wxEXPAND|wxALIGN_RIGHT -+ wxEXPAND - 0 - - -diff --git a/dialogs/fullscreen.wxg b/dialogs/fullscreen.wxg -index ad57ab9..f2d55f0 100644 ---- a/dialogs/fullscreen.wxg -+++ b/dialogs/fullscreen.wxg -@@ -9,13 +9,13 @@ - - wxVERTICAL - -- wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALL|wxALIGN_CENTER_HORIZONTAL - 10 - - - wxHORIZONTAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_VERTICAL - 0 - - -@@ -34,7 +34,7 @@ - - - -- wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALL|wxALIGN_CENTER_HORIZONTAL - 10 - - -diff --git a/dialogs/ipsselect.wxg b/dialogs/ipsselect.wxg -index c15692f..9c4f387 100644 ---- a/dialogs/ipsselect.wxg -+++ b/dialogs/ipsselect.wxg -@@ -69,7 +69,7 @@ - - - -- wxRIGHT|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxRIGHT|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL - 5 - - -diff --git a/dialogs/misccontrols.wxg b/dialogs/misccontrols.wxg -index d08a3f8..b6f3132 100644 ---- a/dialogs/misccontrols.wxg -+++ b/dialogs/misccontrols.wxg -@@ -309,7 +309,7 @@ - - - -- wxALL|wxEXPAND|wxALIGN_RIGHT|wxALIGN_CENTER_HORIZONTAL -+ wxALL|wxEXPAND - 5 - - -diff --git a/dialogs/romtype.wxg b/dialogs/romtype.wxg -index 4ce4e18..9e65ed9 100644 ---- a/dialogs/romtype.wxg -+++ b/dialogs/romtype.wxg -@@ -28,7 +28,7 @@ - - - -- wxRIGHT|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxRIGHT|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL - 5 - - -diff --git a/dialogs/screenshot.wxg b/dialogs/screenshot.wxg -index b9e8c61..bbae564 100644 ---- a/dialogs/screenshot.wxg -+++ b/dialogs/screenshot.wxg -@@ -9,13 +9,13 @@ - - wxVERTICAL - -- wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALL|wxALIGN_CENTER_HORIZONTAL - 10 - - - wxHORIZONTAL - -- wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_VERTICAL - 0 - - -@@ -34,7 +34,7 @@ - - - -- wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALL|wxALIGN_CENTER_HORIZONTAL - 10 - - -diff --git a/dialogs/session.wxg b/dialogs/session.wxg -index f3e9c48..d30074e 100644 ---- a/dialogs/session.wxg -+++ b/dialogs/session.wxg -@@ -371,7 +371,7 @@ - - - -- wxLEFT|wxRIGHT|wxALIGN_CENTER_HORIZONTAL -+ wxLEFT|wxRIGHT - 3 - - -diff --git a/dialogs/videocontrols.wxg b/dialogs/videocontrols.wxg -index 4b9a57a..01b998b 100644 ---- a/dialogs/videocontrols.wxg -+++ b/dialogs/videocontrols.wxg -@@ -20,7 +20,7 @@ - - wxHORIZONTAL - -- wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxEXPAND - 0 - - -@@ -71,7 +71,7 @@ - - - -- wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL - 5 - - -@@ -84,7 +84,7 @@ - - - -- wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxEXPAND - 0 - - -@@ -105,13 +105,13 @@ - - - -- wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxEXPAND - 5 - - - wxHORIZONTAL - -- wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxEXPAND - 0 - - -@@ -173,7 +173,7 @@ - - - -- wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL - 5 - - -@@ -186,7 +186,7 @@ - - - -- wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxEXPAND - 0 - - -@@ -233,7 +233,7 @@ - - - -- wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL - 5 - - -@@ -246,19 +246,18 @@ - - - -- wxALIGN_CENTER_HORIZONTAL - 0 - - - wxVERTICAL - -- wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALIGN_CENTER_HORIZONTAL - 0 - - - wxHORIZONTAL - -- wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxALL|wxALIGN_CENTER_VERTICAL - 5 - - -@@ -297,7 +296,7 @@ - - - -- wxTOP|wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL -+ wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL - 5 - - diff --git a/openmsx.spec b/openmsx.spec index 5ae8671..3acc38b 100644 --- a/openmsx.spec +++ b/openmsx.spec @@ -1,19 +1,13 @@ %define pkgverdir %(echo %version|sed s/\\\\\./_/) Name: openmsx -Version: 18.0 -Release: 4%{?dist} +Version: 19.0 +Release: 1%{?dist} Summary: An emulator for the MSX home computer system License: GPLv2 URL: https://openmsx.org/ Source0: https://github.com/openMSX/openMSX/releases/download/RELEASE_%{pkgverdir}/%{name}-%{version}.tar.gz Source1: https://github.com/openMSX/openMSX/releases/download/RELEASE_%{pkgverdir}/%{name}-catapult-%{version}.tar.gz -# Fix compiling with GCC 13 -# https://github.com/openMSX/openMSX/issues/1487 -Patch0: %{name}-18.0-gcc13.patch -# Fix XRC warnings in wxWidgets 3.2.0. Whilst keeping things working with 3.0. -# https://github.com/openMSX/wxcatapult/pull/44 -Patch10: %{name}-18.0-wx32.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils libappstream-glib BuildRequires: docbook-utils @@ -231,6 +225,9 @@ appstream-util validate-relax --nonet \ %changelog +* Thu Jul 27 2023 Andrea Musuruane - 19.0-1 +- New upstream version 19.0 + * Thu Jul 20 2023 Fedora Release Engineering - 18.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index f5c6a3c..d034d2c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (openmsx-18.0.tar.gz) = f395fae8eac3bcb9334251c1c266a8c4d2951d6510a7c4885ddbc95aaed39f4ef8ae12a177d4a9ff44745ca368055f55f9983029b47441f4fd9731696f79809f -SHA512 (openmsx-catapult-18.0.tar.gz) = b814741ff885d12ea224fefb519a04646b8ee2e267f41ee69e85a506a23eef0381e4bf6d9fec00867711e6b1e515c18b39439d5c184f056b419003422499e2d4 +SHA512 (openmsx-19.0.tar.gz) = 9bf39c35355c2a04f50c6b072f4d41f21e2d9c8dc434977bc5be5129e732eaec4bbdfa72c6eb5ec5db6015348d00639a0d168228b0b918161993f658e3a29cff +SHA512 (openmsx-catapult-19.0.tar.gz) = 6ea5ce2d4e05ac5d9a3704115b772d8cf56f8e7b8da656f86126c9041367346b2a4c82861a4a05078430c7546723c15bb8a826a0ee4f2f2c5b37599f0b694295