diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-11-01 07:35:53 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-11-01 07:35:53 (GMT) |
| commit | a4ebc1d7537626e8469631c90b8037a7611eb44f (patch) | |
| tree | ca07b2b10eaf8a082d7c5dd02249b1d0cae8d616 /src/quazip-1-fixes.patch | |
| parent | f4fb19227719f68522a2e547e35ae8cb4baa2629 (diff) | |
| download | mxe-a4ebc1d7537626e8469631c90b8037a7611eb44f.zip mxe-a4ebc1d7537626e8469631c90b8037a7611eb44f.tar.gz mxe-a4ebc1d7537626e8469631c90b8037a7611eb44f.tar.bz2 | |
quazip: various fixups
- use standard header
- add website
- add explicit zlib dependency
- build out of source
- fix indentation
- fix qmake handling of import lib
- consolidate patches
Diffstat (limited to 'src/quazip-1-fixes.patch')
| -rw-r--r-- | src/quazip-1-fixes.patch | 121 |
1 files changed, 121 insertions, 0 deletions
diff --git a/src/quazip-1-fixes.patch b/src/quazip-1-fixes.patch new file mode 100644 index 0000000..2622110 --- /dev/null +++ b/src/quazip-1-fixes.patch @@ -0,0 +1,121 @@ +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: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> +Date: Sun, 4 Jun 2017 03:19:59 +0200 +Subject: [PATCH] add pkg-config generation to qmake build + +Sent to upstream: https://sourceforge.net/p/quazip/patches/31/ + +Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> + +diff --git a/quazip/quazip.pro b/quazip/quazip.pro +index 1111111..2222222 100644 +--- a/quazip/quazip.pro ++++ b/quazip/quazip.pro +@@ -2,6 +2,13 @@ TEMPLATE = lib + CONFIG += qt warn_on + QT -= gui + ++# Creating pkgconfig .pc file ++CONFIG += create_prl no_install_prl create_pc ++ ++QMAKE_PKGCONFIG_PREFIX = $$PREFIX ++QMAKE_PKGCONFIG_INCDIR = $$headers.path ++QMAKE_PKGCONFIG_REQUIRES = Qt5Core ++ + # The ABI version. + + !win32:VERSION = 1.0.0 +@@ -43,6 +50,7 @@ unix:!symbian { + headers.path=$$PREFIX/include/quazip + headers.files=$$HEADERS + target.path=$$PREFIX/lib/$${LIB_ARCH} ++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig + INSTALLS += headers target + + OBJECTS_DIR=.obj +@@ -53,8 +61,21 @@ unix:!symbian { + win32 { + headers.path=$$PREFIX/include/quazip + headers.files=$$HEADERS +- target.path=$$PREFIX/lib + INSTALLS += headers target ++ CONFIG(staticlib){ ++ target.path=$$PREFIX/lib ++ QMAKE_PKGCONFIG_LIBDIR = $$PREFIX/lib/ ++ } else { ++ target.path=$$PREFIX/bin ++ QMAKE_PKGCONFIG_LIBDIR = $$PREFIX/bin/ ++ } ++ ++ ## odd, this path seems to be relative to the ++ ## target.path, so if we install the .dll into ++ ## the 'bin' dir, the .pc will go there as well, ++ ## unless have hack the needed path... ++ ## TODO any nicer solution? ++ QMAKE_PKGCONFIG_DESTDIR = ../lib/pkgconfig + # workaround for qdatetime.h macro bug + DEFINES += NOMINMAX + } + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> +Date: Sun, 4 Jun 2017 03:22:13 +0200 +Subject: [PATCH] add -lz dir for win build + +Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> + +diff --git a/quazip/quazip.pro b/quazip/quazip.pro +index 1111111..2222222 100644 +--- a/quazip/quazip.pro ++++ b/quazip/quazip.pro +@@ -78,6 +78,8 @@ win32 { + QMAKE_PKGCONFIG_DESTDIR = ../lib/pkgconfig + # workaround for qdatetime.h macro bug + DEFINES += NOMINMAX ++ ++ LIBS += -lz + } + + +diff --git a/qztest/qztest.pro b/qztest/qztest.pro +index 1111111..2222222 100644 +--- a/qztest/qztest.pro ++++ b/qztest/qztest.pro +@@ -40,8 +40,8 @@ testquazipfile.cpp \ + OBJECTS_DIR = .obj + MOC_DIR = .moc + +-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip +-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazipd ++win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip -lz ++else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazipd -lz + else:mac:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazip_debug + else:unix: LIBS += -L$$OUT_PWD/../quazip/ -lquazip + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> +Date: Sat, 3 Jun 2017 11:24:17 +0200 +Subject: [PATCH] use lowercase windows.h + +Sent to upstream: https://sourceforge.net/p/quazip/patches/30/ + +Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com> + +diff --git a/qztest/testjlcompress.cpp b/qztest/testjlcompress.cpp +index 1111111..2222222 100644 +--- a/qztest/testjlcompress.cpp ++++ b/qztest/testjlcompress.cpp +@@ -34,7 +34,7 @@ see quazip/(un)zip.h files for details. Basically it's the zlib license. + #include <quazip/JlCompress.h> + + #ifdef Q_OS_WIN +-#include <Windows.h> ++#include <windows.h> + #endif + + void TestJlCompress::compressFile_data() |