diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2017-01-30 19:33:16 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2017-01-30 21:15:01 (GMT) |
| commit | dc52997aa586545d9bd868793a24bc919a715026 (patch) | |
| tree | 9be2a8c91a68888e1375218e3a9e62ac407f70dd | |
| parent | 0f724ee4b398bab31567a2ad3a54a56ac2911c0f (diff) | |
| download | mxe-dc52997aa586545d9bd868793a24bc919a715026.zip mxe-dc52997aa586545d9bd868793a24bc919a715026.tar.gz mxe-dc52997aa586545d9bd868793a24bc919a715026.tar.bz2 | |
qtofficeopenxml: build fix for Qt 5.8.0
| -rw-r--r-- | src/qtofficeopenxml-1.patch | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/src/qtofficeopenxml-1.patch b/src/qtofficeopenxml-1.patch index 2312c98..b45bf41 100644 --- a/src/qtofficeopenxml-1.patch +++ b/src/qtofficeopenxml-1.patch @@ -1,7 +1,7 @@ From 57c93e64b512b24c1ca983a91c18c1e4bb158d2a Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 19 Mar 2016 15:37:43 +0100 -Subject: [PATCH] fix typo/build failure +Subject: [PATCH 1/2] fix typo/build failure diff --git a/src/officeopenxml/sml/smlworkbook.cpp b/src/officeopenxml/sml/smlworkbook.cpp @@ -18,5 +18,30 @@ index dfa8e13..74432db 100644 void Workbook::setBookView(const QString &attribute, const QString &val) -- -2.5.0 +2.9.3 + + +From 549e186188a635ed32e1a5abb1ea0fef854fcb25 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Mon, 30 Jan 2017 20:31:36 +0100 +Subject: [PATCH 2/2] build fix for Qt 5.8.0 + + +diff --git a/src/3rdParty/karchive/karchive.pri b/src/3rdParty/karchive/karchive.pri +index afe4965..af9116b 100644 +--- a/src/3rdParty/karchive/karchive.pri ++++ b/src/3rdParty/karchive/karchive.pri +@@ -42,8 +42,8 @@ SOURCES += \ + win32: LIBS += -ladvapi32 + msvc*: DEFINES += _CRT_SECURE_NO_WARNINGS + +-contains(QT_CONFIG, system-zlib) { +- if(unix|win32-g++*): LIBS_PRIVATE += -lz ++contains(QT_CONFIG, system-zlib) | qtConfig(system-zlib) { ++ if(unix|mingw): LIBS += -lz + else: LIBS += zdll.lib + } else { + p1 = $$[QT_INSTALL_HEADERS/get]/QtZlib +-- +2.9.3 |