public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mingw-qt6-qtmultimedia] rawhide: Drop already upstreamed patch
@ 2026-08-25 7:01 Jan Grulich
0 siblings, 0 replies; only message in thread
From: Jan Grulich @ 2026-08-25 7:01 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/mingw-qt6-qtmultimedia
Branch : rawhide
Commit : d651411fbfa24601851b147ab6b1006c5742b4bc
Author : Jan Grulich <jgrulich@redhat.com>
Date : 2026-08-25T09:01:47+02:00
Stats : +0/-60 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/mingw-qt6-qtmultimedia/c/d651411fbfa24601851b147ab6b1006c5742b4bc?branch=rawhide
Log:
Drop already upstreamed patch
---
diff --git a/0001-Fix-MinGW-build-add-stdcall-specialization-for-first.patch b/0001-Fix-MinGW-build-add-stdcall-specialization-for-first.patch
deleted file mode 100644
index 80ce83a..0000000
--- a/0001-Fix-MinGW-build-add-stdcall-specialization-for-first.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Wed, 16 Apr 2026 00:00:00 +0000
-Subject: [PATCH] Fix MinGW build: use std::is_invocable_v to detect
- PropVariantToGUID signature
-
-The first_arg_is_ptr template approach for detecting whether
-PropVariantToGUID's first argument is a pointer is broken on 32-bit
-MinGW/GCC:
-
- - GCC cannot deduce template arguments for the partial specialization
- 'Result(*)(Arg, Args...)' when the function pointer carries an
- explicit __stdcall attribute, so first_arg_is_ptr<decltype(
- &PropVariantToGUID)> resolves to the incomplete primary template
- and the build fails with "incomplete type used in nested name
- specifier".
-
- - Adding a __stdcall specialization does not help because on 32-bit
- MinGW __stdcall is the default calling convention, so the two
- specializations are identical and cause a "redefinition" error.
-
-Replace the template machinery with std::is_invocable_v, which checks
-whether the function can be called with a pointer as its first argument.
-This avoids calling-convention template-deduction entirely:
-
- - MinGW: PropVariantToGUID(const PROPVARIANT*, GUID*) -> invocable
- with a pointer -> wrapPropVariantArg returns &arg.
- - MSVC: PropVariantToGUID(REFPROPVARIANT, GUID*) where
- REFPROPVARIANT = const PROPVARIANT& -> not invocable with a raw
- pointer -> wrapPropVariantArg returns arg.
----
- src/multimedia/windows/qwindows_propertystore.cpp | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
-
---- a/src/multimedia/windows/qwindows_propertystore.cpp 2026-04-16 09:49:42.280680575 +0200
-+++ b/src/multimedia/windows/qwindows_propertystore.cpp 2026-04-16 10:07:23.892075708 +0200
-@@ -77,18 +77,12 @@
- // mingw workaround: PropVariantToGUID does not provide correct signature
- // https://github.com/mingw-w64/mingw-w64/issues/153
-
--template <typename T>
--struct first_arg_is_ptr;
--
--// Function type
--template <typename Result, typename Arg, typename... Args>
--struct first_arg_is_ptr<Result (*)(Arg, Args...)> : std::bool_constant<std::is_pointer_v<Arg>>
--{
--};
--
- auto wrapPropVariantArg(const PROPVARIANT &arg)
- {
-- if constexpr (first_arg_is_ptr<decltype(&PropVariantToGUID)>::value) {
-+ // Use is_invocable_v to check if PropVariantToGUID accepts a pointer as
-+ // its first argument (MinGW) vs. a reference/value (MSVC), avoiding
-+ // calling-convention template-deduction issues on 32-bit MinGW.
-+ if constexpr (std::is_invocable_v<decltype(&PropVariantToGUID), const PROPVARIANT*, GUID*>) {
- return &arg;
- } else {
- return arg;
diff --git a/mingw-qt6-qtmultimedia.spec b/mingw-qt6-qtmultimedia.spec
index 53ef392..b234c58 100644
--- a/mingw-qt6-qtmultimedia.spec
+++ b/mingw-qt6-qtmultimedia.spec
@@ -32,7 +32,6 @@ Source0: http://download.qt.io/%{?pre:development}%{?!pre:official}_relea
BuildArch: noarch
-Patch0: 0001-Fix-MinGW-build-add-stdcall-specialization-for-first.patch
BuildRequires: cmake
BuildRequires: ninja-build
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-25 7:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-25 7:01 [rpms/mingw-qt6-qtmultimedia] rawhide: Drop already upstreamed patch Jan Grulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox