dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade qt5 packages

Browse Source
pull/287/head
Mark Brand 11 years ago
parent 43a92a6a07
commit adb9178258
25 changed files with 1112 additions and 323 deletions
Show Stats Download Patch File Download Diff File

10
index.html
Unescape View File

@ -2050,6 +2050,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="package">qtbase</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td class="package">qtconnectivity</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td class="package">qtdeclarative</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
@ -2063,7 +2067,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td class="package">qtjsbackend</td>
<td class="package">qtlocation</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
@ -2110,6 +2114,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
<td class="package">qtxmlpatterns</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td class="package">qtwinextras</td>
<td class="website"><a href="http://qt-project.org/">Qt</a></td>
</tr>
<tr>
<td class="package">qwt</td>
<td class="website"><a href="http://qwt.sourceforge.net/">Qwt</a></td>

4
src/qtactiveqt-1.patch
Unescape View File

@ -1,7 +1,7 @@
This file is part of MXE.
See index.html for further information.
From 8bf1da19f45922259b93d689240e73c147fe2426 Mon Sep 17 00:00:00 2001
From 4e320610c64732d1ef616d823eba9ce5d714fc4c Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 18 May 2013 15:28:33 +0200
Subject: [PATCH] Revert "idc is a host tool"
@ -19,5 +19,5 @@ index b9d8dee..05a592a 100644
SOURCES = main.cpp
--
1.8.1.4
1.8.4

2
src/qtactiveqt.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtactiveqt
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 105c9966e9fa289c157e04c18204b48df0ed120d
$(PKG)_CHECKSUM := 56d1017d0afc02dfafbdc8ade3def4f845f7e481
$(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL))

1276
src/qtbase-1.patch
View File

File diff suppressed because it is too large Load Diff

6
src/qtbase.mk
Unescape View File

@ -3,11 +3,11 @@
PKG := qtbase
$(PKG)_IGNORE :=
$(PKG)_VERSION := 5.1.1
$(PKG)_CHECKSUM := 40590b503c033df9c88096ebc92072f282401092
$(PKG)_VERSION := 5.2.0-rc1
$(PKG)_CHECKSUM := 2577676eb37cec78d6d0864c094c7c8bb90a581e
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://download.qt-project.org/official_releases/qt/5.1/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_URL := http://download.qt-project.org/development_releases/qt/5.2/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c
define $(PKG)_UPDATE

21
src/qtconnectivity.mk
Unescape View File

@ -0,0 +1,21 @@
# This file is part of MXE.
# See index.html for further information.
PKG := qtconnectivity
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 7c6258fd0c087357788c67744a69d84dd571a982
$(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL))
$(PKG)_DEPS := gcc qtbase qtdeclarative
define $(PKG)_UPDATE
echo $(qtbase_VERSION)
endef
define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef

4
src/qtdeclarative.mk
Unescape View File

@ -4,11 +4,11 @@
PKG := qtdeclarative
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 52108058b7fb61c20ef3fa7aab81c19381e714a0
$(PKG)_CHECKSUM := 465187e014512761d13a314afc463817823456fd
$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL))
$(PKG)_DEPS := gcc qtbase qtjsbackend qtsvg qtxmlpatterns
$(PKG)_DEPS := gcc qtbase qtsvg qtxmlpatterns
define $(PKG)_UPDATE
echo $(qtbase_VERSION)

2
src/qtgraphicaleffects.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtgraphicaleffects
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 031c50a6e2ab62fce74b57ae230855cbbc9e9056
$(PKG)_CHECKSUM := b1443dd0c4d6bd681413d1366cd3a0ba840bcbe4
$(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL))

12
src/qtimageformats-1.patch
Unescape View File

@ -1,7 +1,7 @@
This file is part of MXE.
See index.html for further information.
From f6906f5cb744554a985f6ecbb55a49dd2883d531 Mon Sep 17 00:00:00 2001
From fd1717af4dd33e3ea270ec97d7f7e5e3a61021da Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 3 Nov 2011 14:11:02 +0100
Subject: [PATCH 1/3] add pkg-config support for libtiff-4
@ -37,10 +37,10 @@ index 353e3f3..fa22141 100644
} else {
include($$PWD/../../../3rdparty/libtiff.pri)
--
1.8.1.4
1.8.4
From 3c300d849fbe41368aedbf8d9c8052a170dfd108 Mon Sep 17 00:00:00 2001
From a1846586160249a2debcbf113b679c9ea452b909 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 19 Dec 2012 23:29:52 +0100
Subject: [PATCH 2/3] add pkg-config support for libmng (mxe-specific)
@ -76,10 +76,10 @@ index cdf17c5..00cd0b3 100644
} else {
include($$PWD/../../../3rdparty/libmng.pri)
--
1.8.1.4
1.8.4
From a6398a7029a455f6c4878d18210e4bf7a782ddfd Mon Sep 17 00:00:00 2001
From 5c209558b3c4d82e59c8d5ef3cc263a8fd3bff01 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 17 Aug 2013 18:08:22 +0200
Subject: [PATCH 3/3] libmng 2 config.test compatibility
@ -103,5 +103,5 @@ index 9def33e..266dd71 100644
return 0;
}
--
1.8.1.4
1.8.4

2
src/qtimageformats.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtimageformats
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := a524ff862f1d5490191a56aa88f3bc911716d866
$(PKG)_CHECKSUM := f773b5592d464c8c6682576418f00a7f25631af9
$(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL))

12
src/qtjsbackend.mk → src/qtlocation.mk
Unescape View File

@ -1,14 +1,14 @@
# This file is part of MXE.
# See index.html for further information.
PKG := qtjsbackend
PKG := qtlocation
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := e13a5ef112bdbe2fb1691d21c52b287a21da614a
$(PKG)_SUBDIR = $(subst qtbase,qtjsbackend,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtjsbackend,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtjsbackend,$(qtbase_URL))
$(PKG)_DEPS := gcc qtbase
$(PKG)_CHECKSUM := d1951d132820e21c0eacfbf29d1149aa78f4e27a
$(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL))
$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia
define $(PKG)_UPDATE
echo $(qtbase_VERSION)

6
src/qtmultimedia-1.patch
Unescape View File

@ -1,14 +1,14 @@
This file is part of MXE.
See index.html for further information.
From af295c0f78cfc8e54601048d5da66f6e81f6661e Mon Sep 17 00:00:00 2001
From 24d6489d5e485663afc15adc3e969d0da42fd571 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 13 Dec 2012 20:23:48 +0100
Subject: [PATCH] remove duplicate defs (mxe-specific)
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 3c66d05..10e8037 100644
index e9503d4..b92aa98 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -67,19 +67,19 @@ typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT;
@ -41,5 +41,5 @@ index 3c66d05..10e8037 100644
#endif // __ICreateDevEnum_INTERFACE_DEFINED__
--
1.7.10.4
1.8.4

2
src/qtmultimedia.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtmultimedia
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := bae589a9749d388b2503ad3174c7ac9b3baa0b2b
$(PKG)_CHECKSUM := 28b9c29b80f178784de7198ae76c011acacf3153
$(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL))

2
src/qtquick1.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtquick1
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 75e07675a9edf5bb096953e1f7646ff1af405dad
$(PKG)_CHECKSUM := a3e6784bf7b62deb770d4b8185ea4af972feb65b
$(PKG)_SUBDIR = $(subst qtbase,qtquick1,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtquick1,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtquick1,$(qtbase_URL))

2
src/qtquickcontrols.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtquickcontrols
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := e92d5a505dcb1ba699bc53358246bdd52873e164
$(PKG)_CHECKSUM := 7688217ba95c0c7590ab2e01fb0e97340ea2db99
$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL))

2
src/qtscript.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtscript
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 972e16e91bb470e732716ca7dc18890ff5db6fd5
$(PKG)_CHECKSUM := eb7874c4315872a6dd2b4805635f15c4d9ab391b
$(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL))

2
src/qtsensors.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtsensors
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 7750d4f9220dcf042ba578971c0312de1e71ad7c
$(PKG)_CHECKSUM := 0b1f51b4aebe39727e241aad5ceea8752cfee4a9
$(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL))

2
src/qtserialport.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtserialport
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := a1a02801662c441d25299615bd5188473a67e7de
$(PKG)_CHECKSUM := d510b0dde86f17ef69600325ec1738472737eefa
$(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL))

2
src/qtsvg.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtsvg
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 33fa0f432e66a84a5abfcd6a39e2a1fb1ed0ee03
$(PKG)_CHECKSUM := ca0ae973d62c99da1a222f9a3c641811c49677a3
$(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL))

2
src/qttools.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qttools
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 36ec1deb86c1669043349056d7c3e44b9424ce7a
$(PKG)_CHECKSUM := 0e11e5d4fa8c63d1967e62c7a007959b2d07ae89
$(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL))

2
src/qttranslations.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qttranslations
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 1561d8495aa29003240819a8cf6d7a64ff96a9b7
$(PKG)_CHECKSUM := 4c46bb1bfd141ccb52e8db173198869cdb83a17d
$(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL))

25
src/qtwinextras-1.patch
Unescape View File

@ -0,0 +1,25 @@
This file is part of MXE.
See index.html for further information.
From 78cac864153eb0bddb4436bfa929f21712e197e1 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 24 Oct 2013 22:29:51 +0200
Subject: [PATCH] Fix MinGW-w64 GCC 4.8.2 compilation
diff --git a/src/winextras/winshobjidl_p.h b/src/winextras/winshobjidl_p.h
index 91faed5..352c405 100644
--- a/src/winextras/winshobjidl_p.h
+++ b/src/winextras/winshobjidl_p.h
@@ -222,7 +222,7 @@ public:
#if (defined _MSC_VER && _MSC_VER < 1600) || defined(Q_CC_MINGW)
-# if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 301
+# if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 300
typedef struct SHARDAPPIDINFOLINK
{
--
1.8.4

23
src/qtwinextras.mk
Unescape View File

@ -0,0 +1,23 @@
# This file is part of MXE.
# See index.html for further information.
PKG := qtwinextras
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 3e2acdbbfc273864d9aba43c8db31463a5932075
$(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL))
$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia
define $(PKG)_UPDATE
echo $(qtbase_VERSION)
endef
define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef
$(PKG)_BUILD_i686-pc-mingw32 =

10
src/qtxmlpatterns-1.patch
Unescape View File

@ -1,22 +1,24 @@
This file is part of MXE.
See index.html for further information.
From 910b5fc6c65e2a4508077821a1d31e080d738766 Mon Sep 17 00:00:00 2001
From ec1bf00708e5aa804d392678bae5b32921ae0c2a Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 18 May 2013 17:03:55 +0200
Subject: [PATCH] mingw build fix: _fileno
diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro
index d349a91..13a70ae 100644
index 1fad197..2bbf5b5 100644
--- a/tools/xmlpatterns/xmlpatterns.pro
+++ b/tools/xmlpatterns/xmlpatterns.pro
@@ -11,4 +11,5 @@ HEADERS = main.h \
@@ -11,6 +11,7 @@ HEADERS = main.h \
qapplicationargument.cpp \
qapplicationargumentparser.cpp
+win32-g++*:QMAKE_CXXFLAGS += -U__STRICT_ANSI__
load(qt_tool)
# with c++11 / __STRICT_ANSI__ mingw.org stdio.h doesn't declare e.g. _fileno
--
1.8.1.4
1.8.4

2
src/qtxmlpatterns.mk
Unescape View File

@ -4,7 +4,7 @@
PKG := qtxmlpatterns
$(PKG)_IGNORE :=
$(PKG)_VERSION = $(qtbase_VERSION)
$(PKG)_CHECKSUM := 69f7f46f0072a35e67e820a3561b852b497a9d8f
$(PKG)_CHECKSUM := 1e8dd3a300dc5e326baace0825292cd9519fea24
$(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
$(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
$(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))

Write Preview
Loading…
Cancel
Save