Merge branch '86Box:master' into cs4232

CMakeLists.txt

@@ -36,7 +36,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 5.2
+    VERSION 6.0
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)

bumpversion.sh

@@ -43,23 +43,33 @@ pretty_date() {
 
 # Patch files.
 patch_file() {
-	# Stop if the file doesn't exist.
-	[ ! -e "$1" ] && return
+	# Parse arguments.
+	desc="$1"
+	shift
+	pattern="$1"
+	shift
 
-	# Patch file.
-	if sed -i -r -e "$3" "$1"
-	then
-		echo "[-] Patched $2 on $1"
-	else
-		echo "[!] Patching $2 on $1 failed"
-	fi
+	# Patch the specified files.
+	for file in "$@"
+	do
+		# Skip file if it doesn't exist.
+		[ ! -e "$file" ] && continue
+
+		# Patch file.
+		if sed -i -r -e "$pattern" "$file"
+		then
+			echo "[-] Patched $desc in $file"
+		else
+			echo "[!] Patching $desc in $file failed"
+		fi
+	done
 }
-patch_file CMakeLists.txt VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/'
-patch_file vcpkg.json version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/'
-patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/'
-patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]{8}/\1'"$romversion"'/'
-patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/'
-patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/'
-patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/'
-patch_file debian/changelog 'changelog date' 's/>  .+/>  '"$(date -R)"'/'
-patch_file debian/changelog 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/'
+patch_file VERSION 's/^(\s*VERSION ).+/\1'"$newversion"'/' CMakeLists.txt
+patch_file version-string 's/(^\s*"version-string"\s*:\s*")[^"]+/\1'"$newversion"'/' vcpkg.json
+patch_file Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/' src/unix/assets/*.spec
+patch_file '%global romver' 's/(^%global\ romver\s+)[^\s]+/\1'"$romversion"'/' src/unix/assets/*.spec
+patch_file 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/' src/unix/assets/*.spec
+patch_file 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/' src/unix/assets/*.spec
+patch_file release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/' src/unix/assets/*.metainfo.xml
+patch_file 'changelog date' 's/>  .+/>  '"$(date -R)"'/' debian/changelog
+patch_file 'changelog version' 's/86box \(.+\)/86box \('"$newversion"'\)/' debian/changelog

debian/changelog

@@ -1,5 +1,5 @@
-86box (5.2) UNRELEASED; urgency=medium
+86box (6.0) UNRELEASED; urgency=medium
 
   * Bump release.
 
- -- Jasmine Iwanek <jriwanek@gmail.com>  Thu, 18 Sep 2025 04:25:57 +0200
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Sun, 26 Oct 2025 17:41:47 +0100

src/unix/assets/86Box.spec

@@ -12,10 +12,10 @@
 # After a successful build, you can install the RPMs as follows:
 #  sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms*
 
-%global romver 4.1
+%global romver 5.2
 
 Name:		86Box
-Version:	5.2
+Version:	6.0
 Release:	1%{?dist}
 Summary:	Classic PC emulator
 License:	GPLv2+
@@ -121,5 +121,5 @@ popd
 %{_datadir}/%{name}/roms
 
 %changelog
-* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 5.2-1
+* Sat Aug 31 Jasmine Iwanek <jriwanek[AT]gmail.com> 6.0-1
 - Bump release

src/unix/assets/net.86box.86Box.metainfo.xml

@@ -11,7 +11,7 @@
     </categories>
     <launchable type="desktop-id">net.86box.86Box.desktop</launchable>
     <releases>
-      <release version="5.2" date="2025-09-18"/>
+      <release version="6.0" date="2025-10-26"/>
     </releases>
     <content_rating type="oars-1.1" />
     <description>

vcpkg.json

@@ -1,6 +1,6 @@
 {
     "name": "86box",
-    "version-string": "5.2",
+    "version-string": "6.0",
     "homepage": "https://86box.net/",
     "documentation": "https://86box.readthedocs.io/",
     "license": "GPL-2.0-or-later",