Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dosbox for openSUSE:Factory checked in at 2026-11-17 17:17:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dosbox (Old) and /work/SRC/openSUSE:Factory/.dosbox.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dosbox" Tue Nov 17 17:17:32 2026 rev:52 rq:1397901 version:0.83.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dosbox/dosbox.changes 2025-06-18 16:03:11.181638757 +0200 +++ /work/SRC/openSUSE:Factory/.dosbox.new.1251/dosbox.changes 2026-11-17 17:19:27.185218235 +0100 @@ -1,0 +2,7 @@ +Mon Nov 16 12:11:55 UTC 2026 - Илья Индиго <[email protected]> + +- Updated to 0.83.1 + * Changed files dosbox-staging-config.patch and dosbox-staging-name.patch. + * https://www.dosbox-staging.org/releases/release-notes/0.83.1 + +------------------------------------------------------------------- Old: ---- dosbox-staging-0.82.2.tar.gz New: ---- dosbox-staging-0.83.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosbox.spec ++++++ --- /var/tmp/diff_new_pack.X1MU1X/_old 2026-11-17 17:19:28.241262811 +0100 +++ /var/tmp/diff_new_pack.X1MU1X/_new 2026-11-17 17:19:28.242262853 +0100 @@ -1,7 +1,7 @@ # # spec file for package dosbox # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,9 @@ # +%define __builder ninja Name: dosbox -Version: 0.82.2 +Version: 0.83.1 Release: 0 Summary: DOS/x86 emulator to run old DOS games License: GPL-2.0-or-later @@ -25,28 +26,30 @@ Source0: https://github.com/%{name}-staging/%{name}-staging/archive/v%{version}.tar.gz#/%{name}-staging-%{version}.tar.gz Patch0: %{name}-staging-config.patch Patch1: %{name}-staging-name.patch +BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: meson +BuildRequires: ninja BuildRequires: pkgconfig -BuildRequires: python3 >= 3.7 -BuildRequires: pkgconfig(SDL2_net) +BuildRequires: python3 +BuildRequires: cmake(FluidSynth) >= 2.6.2 +BuildRequires: cmake(GTest) +BuildRequires: cmake(MT32Emu) +BuildRequires: cmake(SDL2) +BuildRequires: cmake(iir) +BuildRequires: pkgconfig(SDL2_image) BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(fluidsynth) +BuildRequires: pkgconfig(asio) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(gmock) -BuildRequires: pkgconfig(gtest) -BuildRequires: pkgconfig(iir) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(mt32emu) BuildRequires: pkgconfig(opusfile) -BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(slirp) BuildRequires: pkgconfig(speexdsp) -BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(zlib-ng) Recommends: fluid-soundfont-gm +Recommends: libslirp0 +ExclusiveArch: x86_64 aarch64 %description %{name}-staging is DOS/x86 emulator focusing on ease of use. @@ -62,20 +65,22 @@ %autosetup -p1 -n %{name}-staging-%{version} %build -%meson -%meson_build +export CMAKE_GENERATOR="Ninja" +%cmake -LA \ + -DCMAKE_SKIP_INSTALL_RPATH=ON \ + -DUSE_SYSTEM_LIBS=ON +%cmake_build %install -%meson_install +%cmake_install %fdupes %{buildroot} -rm -r %{buildroot}%{_datadir}/licenses %check -%meson_test +%ctest %files %license LICENSE -%doc AUTHORS README README.md docs/README.video THANKS +%doc README.md %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{?ext_man} %{_datadir}/applications/%{name}.desktop ++++++ dosbox-staging-0.82.2.tar.gz -> dosbox-staging-0.83.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/dosbox/dosbox-staging-0.82.2.tar.gz /work/SRC/openSUSE:Factory/.dosbox.new.1251/dosbox-staging-0.83.1.tar.gz differ: char 13, line 1 ++++++ dosbox-staging-config.patch ++++++ --- /var/tmp/diff_new_pack.X1MU1X/_old 2026-11-17 17:19:28.285264668 +0100 +++ /var/tmp/diff_new_pack.X1MU1X/_new 2026-11-17 17:19:28.289264837 +0100 @@ -1,78 +1,91 @@ -diff -Pdpru dosbox-staging-0.82.0.orig/src/gui/render.cpp dosbox-staging-0.82.0/src/gui/render.cpp ---- dosbox-staging-0.82.0.orig/src/gui/render.cpp 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/src/gui/render.cpp 2024-12-10 05:45:37.585036932 +0300 -@@ -1011,10 +1011,10 @@ static void init_render_settings(Section - int_prop->Set_help( - "Consider capping frame rates using the 'host_rate' setting."); +diff -Pdpru dosbox-staging-0.83.1.orig/src/dos/dos.cpp dosbox-staging-0.83.1/src/dos/dos.cpp +--- dosbox-staging-0.83.1.orig/src/dos/dos.cpp 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/src/dos/dos.cpp 2026-11-15 08:54:33.956624841 +0300 +@@ -1970,9 +1970,9 @@ static void init_dos_settings(SectionPro + + // DOS locale settings + +- pstring = section.AddString("locale_period", WhenIdle, "historic"); ++ pstring = section.AddString("locale_period", WhenIdle, "modern"); + pstring->SetHelp( +- "Set which era of locale data to use ('historic' by default). Possible values:\n" ++ "Set which era of locale data to use ('modern' by default). Possible values:\n" + "\n" + " historic: If data is available for the given country, mimic old DOS behavior\n" + " when displaying time, dates, or numbers.\n" +diff -Pdpru dosbox-staging-0.83.1.orig/src/gui/render/render.cpp dosbox-staging-0.83.1/src/gui/render/render.cpp +--- dosbox-staging-0.83.1.orig/src/gui/render/render.cpp 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/src/gui/render/render.cpp 2026-11-15 04:17:56.837067971 +0300 +@@ -1589,9 +1589,9 @@ static void init_render_settings(Section + "The [color=light-green]'glshader'[reset] setting is deprecated but still accepted;\n" + "please use [color=light-green]'shader'[reset] instead."); -- auto* string_prop = secprop.Add_string("glshader", always, "crt-auto"); -+ auto* string_prop = secprop.Add_string("glshader", always, "sharp"); +- string_prop = section.AddString("shader", Always, "crt-auto"); ++ string_prop = section.AddString("shader", Always, "sharp"); string_prop->SetOptionHelp( - "Set an adaptive CRT monitor emulation shader or a regular GLSL shader in OpenGL\n" -- "output modes ('crt-auto' by default). Adaptive CRT shader options:\n" -+ "output modes ('sharp' by default). Adaptive CRT shader options:\n" - " crt-auto: A CRT shader that prioritises developer intent and\n" - " how people experienced the game at the time of\n" - " release (default). The appropriate shader variant is\n" -diff -Pdpru dosbox-staging-0.82.0.orig/src/gui/sdlmain.cpp dosbox-staging-0.82.0/src/gui/sdlmain.cpp ---- dosbox-staging-0.82.0.orig/src/gui/sdlmain.cpp 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/src/gui/sdlmain.cpp 2024-12-10 05:53:13.278263053 +0300 -@@ -4392,9 +4392,9 @@ static void config_add_sdl() +- "Set an adaptive CRT monitor emulation shader or a regular shader ('crt-auto' by\n" ++ "Set an adaptive CRT monitor emulation shader or a regular shader ('sharp' by\n" + "default). Shaders are only supported in the OpenGL output mode (see 'output').\n" + "Adaptive CRT shader options:\n" + "\n" +diff -Pdpru dosbox-staging-0.83.1.orig/src/gui/sdl_gui.cpp dosbox-staging-0.83.1/src/gui/sdl_gui.cpp +--- dosbox-staging-0.83.1.orig/src/gui/sdl_gui.cpp 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/src/gui/sdl_gui.cpp 2026-11-15 04:20:11.561813916 +0300 +@@ -2716,8 +2716,8 @@ static void init_sdl_config_settings(Sec "Number of display to use; values depend on OS and user " "settings (0 by default)."); -- auto pbool = sdl_sec->Add_bool("fullscreen", always, false); -+ auto pbool = sdl_sec->Add_bool("fullscreen", always, true); - pbool->Set_help( -- "Start directly in fullscreen (disabled by default).\n" -+ "Start directly in fullscreen (enabled by default).\n" - "Run INTRO and see Special Keys for window control hotkeys."); - - pstring = sdl_sec->Add_string("fullresolution", always, "desktop"); -diff -Pdpru dosbox-staging-0.82.0.orig/src/hardware/gus.cpp dosbox-staging-0.82.0/src/hardware/gus.cpp ---- dosbox-staging-0.82.0.orig/src/hardware/gus.cpp 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/src/hardware/gus.cpp 2024-12-10 05:54:32.568244400 +0300 -@@ -1532,10 +1532,10 @@ void init_gus_dosbox_settings(Section_pr +- auto pbool = section.AddBool("fullscreen", Always, false); +- pbool->SetHelp("Start in fullscreen mode ('off' by default)."); ++ auto pbool = section.AddBool("fullscreen", Always, true); ++ pbool->SetHelp("Start in fullscreen mode ('on' by default)."); + + pstring = section.AddString("fullresolution", Deprecated, ""); + pstring->SetHelp( +diff -Pdpru dosbox-staging-0.83.1.orig/src/hardware/audio/gus.cpp dosbox-staging-0.83.1/src/hardware/audio/gus.cpp +--- dosbox-staging-0.83.1.orig/src/hardware/audio/gus.cpp 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/src/hardware/audio/gus.cpp 2026-11-15 04:22:51.324328740 +0300 +@@ -1531,10 +1531,10 @@ static void init_gus_config_settings(Sec { constexpr auto when_idle = Property::Changeable::WhenIdle; -- auto* bool_prop = secprop.Add_bool("gus", when_idle, false); -+ auto* bool_prop = secprop.Add_bool("gus", when_idle, true); +- auto* bool_prop = secprop.AddBool("gus", when_idle, false); ++ auto* bool_prop = secprop.AddBool("gus", when_idle, true); assert(bool_prop); - bool_prop->Set_help( -- "Enable Gravis UltraSound emulation (disabled by default).\n" -+ "Enable Gravis UltraSound emulation (enabled by default).\n" - "The default settings of base address 240, IRQ 5, and DMA 3 have been chosen so\n" - "the GUS can coexist with a Sound Blaster card. This works fine for the majority\n" - "of programs, but some games and demos expect the GUS factory defaults of base\n" -diff -Pdpru dosbox-staging-0.82.0.orig/src/midi/midi.cpp dosbox-staging-0.82.0/src/midi/midi.cpp ---- dosbox-staging-0.82.0.orig/src/midi/midi.cpp 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/src/midi/midi.cpp 2024-12-10 05:56:35.091548900 +0300 -@@ -779,9 +779,9 @@ void init_midi_dosbox_settings(Section_p - "none" - }); - -- str_prop = secprop.Add_string("midiconfig", when_idle, ""); -+ str_prop = secprop.Add_string("midiconfig", when_idle, "128:0"); - str_prop->Set_help( -- "Configuration options for the selected MIDI interface (unset by default).\n" -+ "Configuration options for the selected MIDI interface ('128:0' by default).\n" - "This is usually the ID or name of the MIDI synthesizer you want\n" - "to use (find the ID/name with the DOS command 'MIXER /LISTMIDI').\n" - "Notes:"); -diff -Pdpru dosbox-staging-0.82.0.orig/src/midi/midi_fluidsynth.cpp dosbox-staging-0.82.0/src/midi/midi_fluidsynth.cpp ---- dosbox-staging-0.82.0.orig/src/midi/midi_fluidsynth.cpp 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/src/midi/midi_fluidsynth.cpp 2024-12-10 05:49:00.304989236 +0300 -@@ -52,9 +52,9 @@ static void init_fluid_dosbox_settings(S + bool_prop->SetHelp( +- "Enable Gravis UltraSound emulation ('off' by default). Many games and all demos\n" ++ "Enable Gravis UltraSound emulation ('on' by default). Many games and all demos\n" + "upload their own sounds, but some rely on the instrument patch files included\n" + "with the GUS for MIDI playback (see 'ultradir' for details). Some games also\n" + "require ULTRAMID.EXE to be loaded prior to starting the game.\n" +diff -Pdpru dosbox-staging-0.83.1.orig/src/midi/fluidsynth.cpp dosbox-staging-0.83.1/src/midi/fluidsynth.cpp +--- dosbox-staging-0.83.1.orig/src/midi/fluidsynth.cpp 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/src/midi/fluidsynth.cpp 2026-11-15 04:28:26.498306621 +0300 +@@ -1058,9 +1058,9 @@ static void init_fluidsynth_config_setti // Name 'default.sf2' picks the default SoundFont if it's installed - // in the OS. Usually it's Fluid_R3. -- auto* str_prop = secprop.Add_string("soundfont", when_idle, "default.sf2"); -+ auto* str_prop = secprop.Add_string("soundfont", when_idle, "FluidR3_GM.sf2 20"); - str_prop->Set_help( -- "Path to a SoundFont file in .sf2 format ('default.sf2' by default).\n" -+ "Path to a SoundFont file in .sf2 format ('FluidR3_GM.sf2 20' by default).\n" - "You can use an absolute or relative path, or the name of an .sf2 inside the\n" - "'soundfonts' directory within your DOSBox configuration directory.\n" - "An optional percentage value after the name will scale the SoundFont's volume.\n" + // in the OS (usually "Fluid_R3"). +- auto str_prop = secprop.AddString("soundfont", WhenIdle, "default.sf2"); ++ auto str_prop = secprop.AddString("soundfont", WhenIdle, "FluidR3_GM.sf2 20"); + str_prop->SetHelp( +- "Name or path of SoundFont file to use ('default.sf2' by default). The SoundFont\n" ++ "Name or path of SoundFont file to use ('FluidR3_GM.sf2 20' by default). The SoundFont\n" + "will be looked up in the following locations in order:\n" + "\n" + " - The user-defined SoundFont directory (see 'soundfont_dir').\n" +diff -Pdpru dosbox-staging-0.83.1.orig/src/midi/midi.cpp dosbox-staging-0.83.1/src/midi/midi.cpp +--- dosbox-staging-0.83.1.orig/src/midi/midi.cpp 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/src/midi/midi.cpp 2026-11-15 04:26:29.661215787 +0300 +@@ -854,9 +854,9 @@ static void init_midiconfig_settings(Sec + { + constexpr auto WhenIdle = Property::Changeable::WhenIdle; + +- auto str_prop = secprop.AddString("midiconfig", WhenIdle, ""); ++ auto str_prop = secprop.AddString("midiconfig", WhenIdle, "128:0"); + str_prop->SetHelp( +- "Configuration options for the selected MIDI device (unset by default).\n" ++ "Configuration options for the selected MIDI device ('128:0' by default).\n" + "Notes:\n"); + + str_prop->SetOptionHelp( ++++++ dosbox-staging-name.patch ++++++ --- /var/tmp/diff_new_pack.X1MU1X/_old 2026-11-17 17:19:28.303265428 +0100 +++ /var/tmp/diff_new_pack.X1MU1X/_new 2026-11-17 17:19:28.308265639 +0100 @@ -1,81 +1,135 @@ -diff -Pdpru dosbox-staging-0.82.0.orig/contrib/icons/meson.build dosbox-staging-0.82.0/contrib/icons/meson.build ---- dosbox-staging-0.82.0.orig/contrib/icons/meson.build 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/contrib/icons/meson.build 2024-12-10 06:59:59.112412395 +0300 -@@ -2,15 +2,9 @@ icons_hicolor = data_dir / 'icons' / 'hi - - png_files = { - 'icon_16.png': '16x16', -- 'icon_22.png': '22x22', -- 'icon_24.png': '24x24', - 'icon_32.png': '32x32', - 'icon_48.png': '48x48', -- 'icon_96.png': '96x96', - 'icon_128.png': '128x128', -- 'icon_256.png': '256x256', -- 'icon_512.png': '512x512', -- 'icon_1024.png': '1024x1024', - } - - # small bitmap icons -@@ -19,7 +13,7 @@ png_files = { - foreach name, size : png_files - install_data( - 'png' / name, -- rename: 'org.dosbox-staging.dosbox-staging.png', -+ rename: 'dosbox.png', - install_dir: icons_hicolor / size / 'apps', - ) - endforeach -@@ -28,6 +22,6 @@ endforeach - # - install_data( - 'svg' / 'dosbox-staging.svg', -- rename: 'org.dosbox-staging.dosbox-staging.svg', -+ rename: 'dosbox.svg', - install_dir: icons_hicolor / 'scalable' / 'apps', +diff -Pdpru dosbox-staging-0.83.1.orig/cmake/add_install_rules.cmake dosbox-staging-0.83.1/cmake/add_install_rules.cmake +--- dosbox-staging-0.83.1.orig/cmake/add_install_rules.cmake 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/cmake/add_install_rules.cmake 2026-11-15 08:31:25.143514116 +0300 +@@ -11,7 +11,7 @@ function(add_install_rules) + set(INSTALL_DIR_ICONS "${CMAKE_INSTALL_DATADIR}/icons/hicolor") + set(INSTALL_DIR_METAINFO "${CMAKE_INSTALL_DATADIR}/metainfo") + +- set(INSTALL_ICON_NAME "org.dosbox_staging.dosbox_staging") ++ set(INSTALL_ICON_NAME "dosbox") + + # Install the application binary + install(TARGETS dosbox RUNTIME) +@@ -21,12 +21,14 @@ function(add_install_rules) + DESTINATION "${INSTALL_DIR_MAN}/man1") + + # Application menu entry +- install(FILES "extras/linux/${INSTALL_ICON_NAME}.desktop" +- DESTINATION "${INSTALL_DIR_DESKTOP}") ++ install(FILES "extras/linux/org.dosbox_staging.dosbox_staging.desktop" ++ DESTINATION "${INSTALL_DIR_DESKTOP}" ++ RENAME "${INSTALL_ICON_NAME}.desktop") + + # Software component information +- install(FILES "extras/linux/${INSTALL_ICON_NAME}.metainfo.xml" +- DESTINATION "${INSTALL_DIR_METAINFO}") ++ install(FILES "extras/linux/org.dosbox_staging.dosbox_staging.metainfo.xml" ++ DESTINATION "${INSTALL_DIR_METAINFO}" ++ RENAME "${INSTALL_ICON_NAME}.metainfo.xml") + + # Scalable icon + install(FILES "extras/icons/svg/dosbox-staging.svg" +@@ -34,22 +36,16 @@ function(add_install_rules) + RENAME "${INSTALL_ICON_NAME}.svg") + + # Bitmap icons +- foreach(PX IN ITEMS 16 22 24 32 48 96 128 256 512 1024) ++ foreach(PX IN ITEMS 16 32 48 128) + install(FILES "extras/icons/png/icon_${PX}.png" + DESTINATION "${INSTALL_DIR_ICONS}/${PX}x${PX}/apps" + RENAME "${INSTALL_ICON_NAME}.png") + endforeach() + + # Bundle the resources +- install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_COPY_PATH}" ++ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${RESOURCE_COPY_PATH}/" + DESTINATION "${INSTALL_DIR_RESOURCES}") + +- # Bundle required licenses +- install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/licenses" +- DESTINATION "${INSTALL_DIR_DOC}") +- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/doc/LICENSE" +- DESTINATION "${INSTALL_DIR_DOC}") +- + endif() + + endfunction() +diff -Pdpru dosbox-staging-0.83.1.orig/CMakeLists.txt dosbox-staging-0.83.1/CMakeLists.txt +--- dosbox-staging-0.83.1.orig/CMakeLists.txt 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/CMakeLists.txt 2026-11-15 04:41:41.776819255 +0300 +@@ -20,7 +20,7 @@ set(VCPKG_USE_HOST_TOOLS ON) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL + "Generate compile_commands.json for use with LSPs") + +-project(dosbox-staging ++project(dosbox + LANGUAGES C CXX + VERSION 0.83.1 ) -diff -Pdpru dosbox-staging-0.82.0.orig/contrib/linux/meson.build dosbox-staging-0.82.0/contrib/linux/meson.build ---- dosbox-staging-0.82.0.orig/contrib/linux/meson.build 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/contrib/linux/meson.build 2024-12-10 06:59:59.112412395 +0300 -@@ -1,3 +1,3 @@ --install_data('org.dosbox-staging.dosbox-staging.desktop', install_dir: data_dir / 'applications') -+install_data('org.dosbox-staging.dosbox-staging.desktop', rename: 'dosbox.desktop', install_dir: data_dir / 'applications') - --install_data('org.dosbox-staging.dosbox-staging.metainfo.xml', install_dir: data_dir / 'metainfo') -+install_data('org.dosbox-staging.dosbox-staging.metainfo.xml', rename: 'dosbox.metainfo.xml', install_dir: data_dir / 'metainfo') -diff -Pdpru dosbox-staging-0.82.0.orig/contrib/linux/org.dosbox-staging.dosbox-staging.desktop dosbox-staging-0.82.0/contrib/linux/org.dosbox-staging.dosbox-staging.desktop ---- dosbox-staging-0.82.0.orig/contrib/linux/org.dosbox-staging.dosbox-staging.desktop 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/contrib/linux/org.dosbox-staging.dosbox-staging.desktop 2024-12-10 06:59:59.112412395 +0300 -@@ -58,5 +58,5 @@ +diff -Pdpru dosbox-staging-0.83.1.orig/docs/dosbox.1 dosbox-staging-0.83.1/docs/dosbox.1 +--- dosbox-staging-0.83.1.orig/docs/dosbox.1 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/docs/dosbox.1 2026-11-15 07:55:24.986538909 +0300 +@@ -198,9 +198,9 @@ systems inside dosbox. + + Configuration and language files use a format similar to Windows .ini files. + If no configfile is specified at the commandline, a file named +-.BR dosbox-staging.conf " (if present in the current directory) will be" ++.BR dosbox.conf " (if present in the current directory) will be" + .RB " loaded automatically. We also will read and load " dosbox.conf " locally +-.RB "too, if " dosbox-staging.conf " isn't present. ++.RB "too, if " dosbox.conf " isn't present. + .LP + If a configfile is specified at the commandline + that one will be used instead. If no configfile is specified or found +diff -Pdpru dosbox-staging-0.83.1.orig/extras/linux/org.dosbox_staging.dosbox_staging.desktop dosbox-staging-0.83.1/extras/linux/org.dosbox_staging.dosbox_staging.desktop +--- dosbox-staging-0.83.1.orig/extras/linux/org.dosbox_staging.dosbox_staging.desktop 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/extras/linux/org.dosbox_staging.dosbox_staging.desktop 2026-11-15 05:04:01.688091177 +0300 +@@ -56,7 +56,7 @@ GenericName[zh_CN]=DOS 模拟器 + GenericName[zh_TW]=DOS 模擬器 + Comment=DOS/x86 emulator focusing on ease of use Exec=dosbox --Icon=org.dosbox-staging.dosbox-staging +-Icon=org.dosbox_staging.dosbox_staging +Icon=dosbox Type=Application Terminal=false Keywords=dos;gaming;game;games;emulator; -diff -Pdpru dosbox-staging-0.82.0.orig/contrib/linux/org.dosbox-staging.dosbox-staging.metainfo.xml dosbox-staging-0.82.0/contrib/linux/org.dosbox-staging.dosbox-staging.metainfo.xml ---- dosbox-staging-0.82.0.orig/contrib/linux/org.dosbox-staging.dosbox-staging.metainfo.xml 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/contrib/linux/org.dosbox-staging.dosbox-staging.metainfo.xml 2024-12-10 06:59:59.112412395 +0300 -@@ -3,5 +3,5 @@ +diff -Pdpru dosbox-staging-0.83.1.orig/extras/linux/org.dosbox_staging.dosbox_staging.metainfo.xml dosbox-staging-0.83.1/extras/linux/org.dosbox_staging.dosbox_staging.metainfo.xml +--- dosbox-staging-0.83.1.orig/extras/linux/org.dosbox_staging.dosbox_staging.metainfo.xml 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/extras/linux/org.dosbox_staging.dosbox_staging.metainfo.xml 2026-11-15 05:06:14.172536471 +0300 +@@ -1,7 +1,7 @@ + <?xml version="1.0" encoding="UTF-8"?> + <!-- Copyright (C) 2020-2026 The DOSBox Staging Team --> <component type="desktop"> -- <id>org.dosbox-staging.dosbox-staging</id> +- <id>org.dosbox_staging.dosbox_staging</id> + <id>dosbox</id> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0-or-later</project_license> <name>DOSBox Staging</name> -@@ -67,7 +67,7 @@ +@@ -66,7 +66,7 @@ <control>console</control> <control>gamepad</control> </recommends> -- <launchable type="desktop-id">org.dosbox-staging.dosbox-staging.desktop</launchable> +- <launchable type="desktop-id">org.dosbox_staging.dosbox_staging.desktop</launchable> + <launchable type="desktop-id">dosbox.desktop</launchable> <developer_name>The DOSBox Staging Team</developer_name> <update_contact>[email protected]</update_contact> <url type="homepage">https://www.dosbox-staging.org/</url> -diff -Pdpru dosbox-staging-0.82.0.orig/include/dosbox.h dosbox-staging-0.82.0/include/dosbox.h ---- dosbox-staging-0.82.0.orig/include/dosbox.h 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/include/dosbox.h 2024-12-10 07:12:05.893618302 +0300 -@@ -26,7 +26,7 @@ +diff -Pdpru dosbox-staging-0.83.1.orig/src/dos/programs.cpp dosbox-staging-0.83.1/src/dos/programs.cpp +--- dosbox-staging-0.83.1.orig/src/dos/programs.cpp 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/src/dos/programs.cpp 2026-11-15 08:00:58.057086161 +0300 +@@ -982,7 +982,7 @@ void PROGRAMS_AddMessages() + " specified absolute or relative path\n" + "\n" + " -wcd write the current configuration to the primary (default)\n" +- " `dosbox-staging.conf` config file in the configuration\n" ++ " `dosbox.conf` config file in the configuration\n" + " directory\n" + "\n" + " -writelang [color=white]FILENAME[reset]\n" +diff -Pdpru dosbox-staging-0.83.1.orig/src/dosbox.h dosbox-staging-0.83.1/src/dosbox.h +--- dosbox-staging-0.83.1.orig/src/dosbox.h 2026-11-14 06:55:29.000000000 +0300 ++++ dosbox-staging-0.83.1/src/dosbox.h 2026-11-15 05:10:37.851570897 +0300 +@@ -14,7 +14,7 @@ #include <memory> // Project name, lower-case and without spaces @@ -84,32 +138,13 @@ // Name of the emulator #define DOSBOX_NAME "DOSBox Staging" -@@ -40,7 +40,7 @@ +@@ -35,7 +35,7 @@ // Fully qualified application ID for the emulator; see // https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names // for more details --#define DOSBOX_APP_ID "org.dosbox-staging.dosbox-staging" +-#define DOSBOX_APP_ID "org.dosbox_staging.dosbox_staging" +#define DOSBOX_APP_ID "dosbox" - int sdl_main(int argc, char *argv[]); -diff -Pdpru dosbox-staging-0.82.0.orig/meson.build dosbox-staging-0.82.0/meson.build ---- dosbox-staging-0.82.0.orig/meson.build 2024-10-23 10:37:53.000000000 +0300 -+++ dosbox-staging-0.82.0/meson.build 2024-12-10 06:59:59.115745745 +0300 -@@ -1,5 +1,5 @@ - project( -- 'dosbox-staging', 'c', 'cpp', -+ 'dosbox', 'c', 'cpp', - - version: run_command( - meson.project_source_root() + '/scripts/get-version.sh', -@@ -45,7 +45,7 @@ project( - # - data_dir = get_option('datadir') - licenses_dir = data_dir / 'licenses' / meson.project_name() --doc_dir = data_dir / 'doc' / meson.project_name() -+doc_dir = data_dir / 'doc' / 'packages' / meson.project_name() - - install_man('docs/dosbox.1') - # Bundle licenses, but skip the ones that are not relevant for + // Must be called to break out of the emulator loop and exit gracefully from
