-
-
Save Civil/84abb5d51204383ccb1ca00be6e83498 to your computer and use it in GitHub Desktop.
PSI+ Qt 5.9 OSX Patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configure b/configure | |
index a5bb2cf..9b2f792 100755 | |
--- a/configure | |
+++ b/configure | |
@@ -851,7 +851,7 @@ static QString internal_crypto_prf(const QString &incdir, const QString &libdir, | |
"\\n" | |
"# else, link normally\\n" | |
"isEmpty(LINKAGE) {\\n" | |
-" !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/QtCrypto\\n" | |
+" !isEmpty(QCA_INCDIR):INCLUDEPATH += \$\$QCA_INCDIR/\\n" | |
" !isEmpty(QCA_LIBDIR):LIBS += -L\$\$QCA_LIBDIR\\n" | |
" LINKAGE = -l\$\${QCA_NAME}\\n" | |
" CONFIG(debug, debug|release) {\\n" | |
diff --git a/iris/src/libbase.pri b/iris/src/libbase.pri | |
index f123437..f1a8a23 100644 | |
--- a/iris/src/libbase.pri | |
+++ b/iris/src/libbase.pri | |
@@ -5,4 +5,4 @@ include($$top_iris_builddir/../conf.pri) | |
include(../common.pri) | |
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3 | |
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 | |
diff --git a/src/libpsi/tools/zip/minizip/unzip.h b/src/libpsi/tools/zip/minizip/unzip.h | |
index 07a32d5..7e5759b 100644 | |
--- a/src/libpsi/tools/zip/minizip/unzip.h | |
+++ b/src/libpsi/tools/zip/minizip/unzip.h | |
@@ -111,6 +111,9 @@ typedef struct unz_file_info_s | |
tm_unz tmu_date; | |
} unz_file_info; | |
+#ifndef OF | |
+#define OF(x) x | |
+#endif | |
extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, | |
const char* fileName2, | |
int iCaseSensitivity)); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment