mirror of https://git.wownero.com/dsc/mxe.git
package qtbase: use icu
This commit is contained in:
Mark Brand
parent
b9e1fb90c0
commit
9898a6ec18
|
|
@ -4,7 +4,7 @@ See index.html for further information.
|
|||
From d04c8e88266737b6fb7ed29780905b54ee68eb5e Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Tue, 26 Feb 2013 13:23:33 +0100
|
||||
Subject: [PATCH 1/8] use pkg-config for freetype
|
||||
Subject: [PATCH 1/9] use pkg-config for freetype
|
||||
|
||||
Change-Id: Id2f78ed9dbdcacd570eb25982cbd700d0437542a
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ index 6b5f6d0..d21f4e3 100644
|
|||
From b96f92ed207c7039d753e0ba8fffda4d676c3f38 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sat, 22 Dec 2012 17:45:34 +0100
|
||||
Subject: [PATCH 2/8] WIP: qmake writeFile(): work around concurrent
|
||||
Subject: [PATCH 2/9] WIP: qmake writeFile(): work around concurrent
|
||||
QDir::mkpath() failure
|
||||
|
||||
This actually happened when building qtimageformats with make -j4.
|
||||
|
|
@ -68,7 +68,7 @@ index f46d66b..4632cf7 100644
|
|||
From 63f1f49850ac741eb604d6cae959546d73ea9a7d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@computer.org>
|
||||
Date: Sat, 23 Feb 2013 23:14:50 -0500
|
||||
Subject: [PATCH 3/8] Rename qAbs Function for timeval
|
||||
Subject: [PATCH 3/9] Rename qAbs Function for timeval
|
||||
|
||||
This decouples it from qAbs which is declared as a constexpr under
|
||||
certain compilation flags and enables for qtbase to be compiled with
|
||||
|
|
@ -108,7 +108,7 @@ index 0eee425..7a29247 100644
|
|||
From 1b78b16a6544a5002ce2dbc10c87c6195d7a0a01 Mon Sep 17 00:00:00 2001
|
||||
From: Israel Lins <israelins85@yahoo.com.br>
|
||||
Date: Mon, 11 Feb 2013 16:13:24 -0300
|
||||
Subject: [PATCH 4/8] ODBC: fix loss of milliseconds when binding QDateTime
|
||||
Subject: [PATCH 4/9] ODBC: fix loss of milliseconds when binding QDateTime
|
||||
|
||||
Caused by operator precedence error.
|
||||
|
||||
|
|
@ -166,7 +166,7 @@ index 1d2a605..951d6d7 100644
|
|||
From c80f315f5e21d1550140e8ac6dd682fcdf50889c Mon Sep 17 00:00:00 2001
|
||||
From: Israel Lins <israelins85@yahoo.com.br>
|
||||
Date: Sun, 17 Mar 2013 23:23:15 -0300
|
||||
Subject: [PATCH 5/8] ODBC: fixed consistence of return of QODBCResult::exec()
|
||||
Subject: [PATCH 5/9] ODBC: fixed consistence of return of QODBCResult::exec()
|
||||
|
||||
The QODBCResult::exec() returns false when query is an delete
|
||||
with no data do delete caused by SQLExecute function returning
|
||||
|
|
@ -212,7 +212,7 @@ index 951d6d7..eb5c309 100644
|
|||
From c31329e0d735e1c36c1762d0a05764c9e4a52ca2 Mon Sep 17 00:00:00 2001
|
||||
From: Israel Lins <israelins85@yahoo.com.br>
|
||||
Date: Sun, 17 Mar 2013 23:20:55 -0300
|
||||
Subject: [PATCH 6/8] ODBC: lost info about column metadata on SQL_NO_DATA
|
||||
Subject: [PATCH 6/9] ODBC: lost info about column metadata on SQL_NO_DATA
|
||||
|
||||
In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata
|
||||
is ignored.
|
||||
|
|
@ -244,7 +244,7 @@ index c6fd49d..5932b57 100644
|
|||
From 8f8677970ed5ca7e333095ab48a9b2bccbfd3eb5 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Tue, 23 Apr 2013 22:46:43 +0200
|
||||
Subject: [PATCH 7/8] qsql_odbc: fix SQLGetStmtAtt usage
|
||||
Subject: [PATCH 7/9] qsql_odbc: fix SQLGetStmtAtt usage
|
||||
|
||||
Failure to initialize the variable can cause spurious non-zero
|
||||
values.
|
||||
|
|
@ -308,7 +308,7 @@ index 5932b57..b05cd4d 100644
|
|||
From 4f46ba28ffdb15a18c2ec77ed8bd81e90883c972 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Fischer <matt.fischer@garmin.com>
|
||||
Date: Thu, 28 Feb 2013 10:52:12 -0600
|
||||
Subject: [PATCH 8/8] Fixed -dbus-linked when cross-compiling from Windows
|
||||
Subject: [PATCH 8/9] Fixed -dbus-linked when cross-compiling from Windows
|
||||
|
||||
Since Windows doesn't have pkg-config, it doesn't get -ldbus-1
|
||||
added to the command line automatically like Linux does. Code
|
||||
|
|
@ -348,3 +348,25 @@ index 5ad77dd..2e4119b 100644
|
|||
--
|
||||
1.8.1.4
|
||||
|
||||
|
||||
From 583ca93da5936dccb8fde5d47313774684cd8c41 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sat, 18 May 2013 23:07:46 +0200
|
||||
Subject: [PATCH 9/9] use pkgconfig for icu detection (MXE specific)
|
||||
|
||||
Change-Id: I874171361fec812cb5a5a56e4d8d90a630be3bf3
|
||||
|
||||
diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
|
||||
index 8e58334..1d66c16 100644
|
||||
--- a/config.tests/unix/icu/icu.pro
|
||||
+++ b/config.tests/unix/icu/icu.pro
|
||||
@@ -1,4 +1,4 @@
|
||||
SOURCES = icu.cpp
|
||||
CONFIG -= qt dylib app_bundle
|
||||
-unix:LIBS += -licuuc -licui18n
|
||||
-win32:LIBS += -licuin
|
||||
+CONFIG += link_pkgconfig
|
||||
+PKGCONFIG += icu-i18n
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 1220c88ad7f50bf1c08208e1eb05ee5d56635361
|
|||
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://origin.releases.qt-project.org/qt5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus
|
||||
$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg sqlite pcre fontconfig freetype dbus icu4c
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
$(WGET) -q -O- http://origin.releases.qt-project.org/qt5/ | \
|
||||
|
|
@ -31,6 +31,7 @@ define $(PKG)_BUILD
|
|||
-release \
|
||||
-static \
|
||||
-prefix '$(PREFIX)/$(TARGET)/qt5' \
|
||||
-icu \
|
||||
-opengl desktop \
|
||||
-no-glib \
|
||||
-accessibility \
|
||||
|
|
|
|||
Loading…
Reference in New Issue