Skip to content

Commit d876ff7

Browse files
committed
qemu: Update to 10.1.3
1 parent 4fafaf7 commit d876ff7

File tree

3 files changed

+44
-3
lines changed

3 files changed

+44
-3
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff -Naur a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp
2+
--- a/qga/vss-win32/install.cpp 2025-11-19 21:48:46.000000000 +0100
3+
+++ b/qga/vss-win32/install.cpp 2025-11-22 10:46:51.102980500 +0100
4+
@@ -549,6 +549,7 @@
5+
6+
7+
/* Support function to convert ASCII string into BSTR (used in _bstr_t) */
8+
+/*
9+
namespace _com_util
10+
{
11+
BSTR WINAPI ConvertStringToBSTR(const char *ascii) {
12+
@@ -566,6 +567,7 @@
13+
return bstr;
14+
}
15+
}
16+
+*/
17+
18+
/* Stop QGA VSS provider service using Winsvc API */
19+
STDAPI StopService(void)
20+

mingw-w64-qemu/PKGBUILD

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pkgname=(
66
"${MINGW_PACKAGE_PREFIX}-qemu-guest-agent"
77
"${MINGW_PACKAGE_PREFIX}-qemu-image-util"
88
)
9-
_base_ver="10.1.2"
9+
_base_ver="10.1.3"
1010
# QEMU Versioning of RC-SourcePackage and RC-Version differs
1111
# e.g. qemu-6.1.0-rc0.tar.xz contains 6.0.90, qemu-6.1.0-rc1.tar.xz contains 6.0.91
1212
# Unset _rc_no to create Release-Build
@@ -112,13 +112,17 @@ source=(
112112
msys2.readme.txt
113113
msys2.qemu-guest-agent.txt
114114
msys2.examples.tests.sh
115+
ConvertStringToBSTR.patch
116+
qemu_ftruncate64.patch
115117
)
116118
sha256sums=(
117-
'9d75f331c1a5cb9b6eb8fd9f64f563ec2eab346c822cb97f8b35cd82d3f11479'
119+
'fbaa7a0d7a9a1deb5695b125916746ec28fe0de6275d4454f3e3bbaf8b339b53'
118120
'SKIP'
119121
'51625fd83c0a63729942d3dfc6d48be3491a700fe0f7cb8e88935b46081c9016'
120122
'f2f9eeb31023d002f54637a9941ea0d8fae3c6f0a66c05c033857b305bd1470d'
121123
'a2db7f1d696a8609df54f48f20760ef100b04b39d2bce1ca0a7989375afab8a1'
124+
'bff14c00c77983cef1dbab04bc1b51ea228075106572e6b4e10a15bed3323a08'
125+
'69cbe6ac03719b90d82d7dbb9f993a5b27782399e15f28b140cbd7cf8af8e956'
122126
)
123127
validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') # Michael Roth <flukshun@gmail.com>
124128
# tar cannot create links, to keep build running, manual extraction is required
@@ -138,7 +142,8 @@ prepare() {
138142
tar -xf "${srcdir}"/${_tarname}.tar.xz -C "${srcdir}" || true
139143

140144
cd "${srcdir}"/${_tarname}
141-
# apply_patch_with_msg
145+
apply_patch_with_msg ConvertStringToBSTR.patch
146+
apply_patch_with_msg qemu_ftruncate64.patch
142147
}
143148

144149
build() {
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff --git a/include/system/os-win32.h b/include/system/os-win32.h
2+
index 22d72babdf..396d4d28ea 100644
3+
--- a/include/system/os-win32.h
4+
+++ b/include/system/os-win32.h
5+
@@ -140,10 +140,6 @@ static inline void os_setup_limits(void)
6+
7+
int qemu_ftruncate64(int, int64_t);
8+
9+
-#if !defined(ftruncate)
10+
-# define ftruncate qemu_ftruncate64
11+
-#endif
12+
-
13+
static inline char *realpath(const char *path, char *resolved_path)
14+
{
15+
_fullpath(resolved_path, path, _MAX_PATH);
16+

0 commit comments

Comments
 (0)