mirror of https://git.wownero.com/dsc/mxe.git
update package qtsystems
This commit is contained in:
Mark Brand
parent
43611e46a1
commit
c8b5c409f2
|
|
@ -1,121 +1,7 @@
|
|||
From fd5d073ac9bb14d5c4e1c81d7943893f93b6ed14 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri, 23 May 2014 11:56:29 +0200
|
||||
Subject: [PATCH 1/4] fix private include
|
||||
|
||||
Change-Id: I99639f5941e8695718e67e7b6871dd796585868f
|
||||
|
||||
diff --git a/src/serviceframework/ipc/instancemanager_p.h b/src/serviceframework/ipc/instancemanager_p.h
|
||||
index 50f6858..49b55ab 100644
|
||||
--- a/src/serviceframework/ipc/instancemanager_p.h
|
||||
+++ b/src/serviceframework/ipc/instancemanager_p.h
|
||||
@@ -45,7 +45,7 @@
|
||||
#include <qserviceframeworkglobal.h>
|
||||
#include "qremoteserviceregister.h"
|
||||
#include "qremoteserviceregisterentry_p.h"
|
||||
-#include <private/qserviceclientcredentials_p.h>
|
||||
+#include "qserviceclientcredentials_p.h"
|
||||
#include <QHash>
|
||||
#include <QMutexLocker>
|
||||
#include <QMetaObject>
|
||||
--
|
||||
1.8.5.2 (Apple Git-48)
|
||||
|
||||
|
||||
From 94f1c7d40d0b16697ee5d14725c387187c970d55 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Fri, 23 May 2014 12:04:12 +0200
|
||||
Subject: [PATCH 2/4] fix filename case
|
||||
|
||||
Make it possible to cross compile on case sensitive system.
|
||||
|
||||
Change-Id: Ie6f255eeb4d71b40926d1d27aad52af4246f5602
|
||||
|
||||
diff --git a/src/systeminfo/windows/qbatteryinfo_win.cpp b/src/systeminfo/windows/qbatteryinfo_win.cpp
|
||||
index 19ddfc3..8e41ac6 100644
|
||||
--- a/src/systeminfo/windows/qbatteryinfo_win.cpp
|
||||
+++ b/src/systeminfo/windows/qbatteryinfo_win.cpp
|
||||
@@ -48,7 +48,7 @@
|
||||
#include <setupapi.h>
|
||||
|
||||
#if !defined (Q_CC_MINGW) || defined(__MINGW64_VERSION_MAJOR)
|
||||
-# include <BatClass.h>
|
||||
+# include <batclass.h>
|
||||
#endif
|
||||
|
||||
#include <QtCore/qmetaobject.h>
|
||||
diff --git a/src/systeminfo/windows/qdeviceinfo_win.cpp b/src/systeminfo/windows/qdeviceinfo_win.cpp
|
||||
index 257a4f4..408881c 100644
|
||||
--- a/src/systeminfo/windows/qdeviceinfo_win.cpp
|
||||
+++ b/src/systeminfo/windows/qdeviceinfo_win.cpp
|
||||
@@ -50,8 +50,8 @@
|
||||
#include <vfw.h>
|
||||
#if !defined(Q_CC_MINGW) || defined(__MINGW64_VERSION_MAJOR)
|
||||
# include <ws2bth.h>
|
||||
-# include <Bthsdpdef.h>
|
||||
-# include <BluetoothAPIs.h>
|
||||
+# include <bthsdpdef.h>
|
||||
+# include <bluetoothapis.h>
|
||||
#endif
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
diff --git a/src/systeminfo/windows/qwmihelper_win.cpp b/src/systeminfo/windows/qwmihelper_win.cpp
|
||||
index ce1e83a..4b0f9bd 100644
|
||||
--- a/src/systeminfo/windows/qwmihelper_win.cpp
|
||||
+++ b/src/systeminfo/windows/qwmihelper_win.cpp
|
||||
@@ -46,9 +46,9 @@
|
||||
#include "qwmihelper_win_p.h"
|
||||
|
||||
#include <QDebug>
|
||||
-#include <ObjBase.h>
|
||||
-#include <Wbemidl.h>
|
||||
-#include <Oleauto.h>
|
||||
+#include <objbase.h>
|
||||
+#include <wbemidl.h>
|
||||
+#include <oleauto.h>
|
||||
#include <QStringList>
|
||||
#include <QUuid>
|
||||
#include <comutil.h>
|
||||
--
|
||||
1.8.5.2 (Apple Git-48)
|
||||
|
||||
|
||||
From 13ea9cd4743555d8d05e8dae2448ea3499bd418f Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Tue, 10 Jun 2014 19:49:08 +1000
|
||||
Subject: [PATCH 3/4] fix lib casing
|
||||
|
||||
|
||||
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
|
||||
index eaf46e8..1165c3d 100644
|
||||
--- a/src/systeminfo/systeminfo.pro
|
||||
+++ b/src/systeminfo/systeminfo.pro
|
||||
@@ -44,13 +44,10 @@ win32: !simulator: {
|
||||
windows/qwmihelper_win.cpp
|
||||
|
||||
LIBS += \
|
||||
- -lOle32 \
|
||||
- -lUser32 \
|
||||
- -lGdi32 \
|
||||
- -lIphlpapi \
|
||||
- -lOleaut32 \
|
||||
- -lPowrProf \
|
||||
- -lSetupapi
|
||||
+ -lole32 \
|
||||
+ -liphlpapi \
|
||||
+ -loleaut32 \
|
||||
+ -lsetupapi
|
||||
|
||||
win32-g++: {
|
||||
LIBS += -luser32 -lgdi32
|
||||
--
|
||||
1.8.5.2 (Apple Git-48)
|
||||
|
||||
|
||||
From 0ba7b6b5c7a0e1afae1b3dbbebbb16048b310fe5 Mon Sep 17 00:00:00 2001
|
||||
From e8377c10a5ce9c0f2924abd54a890f6628f9c064 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Tue, 10 Jun 2014 20:11:42 +1000
|
||||
Subject: [PATCH 4/4] fix gcc 4.9 compatibility
|
||||
Subject: [PATCH] fix gcc 4.9 compatibility
|
||||
|
||||
taken from:
|
||||
http://pkgs.fedoraproject.org/cgit/mingw-qt5-qtsystems.git/tree/qt5-qtsystems-fix-gcc49-compatibility.patch
|
||||
|
|
@ -166,5 +52,5 @@ index 15371a3..474f29a 100644
|
|||
QObject *proxyObject() const
|
||||
{
|
||||
--
|
||||
1.8.5.2 (Apple Git-48)
|
||||
1.8.4.5
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# See index.html for further information.
|
||||
PKG := qtsystems
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 3b3b759c6ccd65eb6251fca68e5618c5ed8b6dd5
|
||||
$(PKG)_CHECKSUM := 1b606f7f4c884afaa6b33c46b4fc19d94b07cd90
|
||||
$(PKG)_VERSION := 2bbccf8ca1a4ba7e39413982986bc02d55e936be
|
||||
$(PKG)_CHECKSUM := d351adbd503008f1981e48f7f3cd7651778ebd48
|
||||
$(PKG)_SUBDIR := qt-$(PKG)
|
||||
$(PKG)_FILE := $($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := https://qt.gitorious.org/qt/qtsystems/archive/$($(PKG)_FILE)
|
||||
|
|
@ -15,7 +15,7 @@ define $(PKG)_UPDATE
|
|||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/syncqt.pl' -version $(qtbase_VERSION)
|
||||
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/syncqt.pl' -version 5.4.0
|
||||
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)'
|
||||
$(MAKE) -C '$(1)' -j 1 install
|
||||
|
|
|
|||
Loading…
Reference in New Issue