view src/dbus-1-fixes.patch @ 6113:24e29dcb2e64

Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 4c5a70572b2b
children
line wrap: on
line source

This file is part of MXE. See LICENSE.md for licensing information.

Contains ad hoc patches for cross building.

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: darealshinji <djcj@gmx.de>
Date: Mon, 3 Jul 2017 01:55:45 +0200
Subject: [PATCH 1/1] Avoid multiple definitions of DllMain in static builds


diff --git a/dbus/dbus-sysdeps-thread-win.c b/dbus/dbus-sysdeps-thread-win.c
index 1111111..2222222 100644
--- a/dbus/dbus-sysdeps-thread-win.c
+++ b/dbus/dbus-sysdeps-thread-win.c
@@ -69,6 +69,8 @@ _dbus_win_get_dll_hmodule (void)
 #define hinst_t HINSTANCE
 #endif
 
+#ifndef DBUS_STATIC_BUILD
+
 BOOL WINAPI DllMain (hinst_t, DWORD, LPVOID);
 
 /* We need this to free the TLS events on thread exit */
@@ -107,6 +109,8 @@ DllMain (hinst_t hinstDLL,
   return TRUE;
 }
 
+#endif /* !DBUS_STATIC_BUILD */
+
 DBusCMutex *
 _dbus_platform_cmutex_new (void)
 {