diff options
Diffstat (limited to 'net-im/psi/files/psi-0.14-minizip-detection.patch')
| -rw-r--r-- | net-im/psi/files/psi-0.14-minizip-detection.patch | 284 |
1 files changed, 0 insertions, 284 deletions
diff --git a/net-im/psi/files/psi-0.14-minizip-detection.patch b/net-im/psi/files/psi-0.14-minizip-detection.patch deleted file mode 100644 index 1eff6dadec4d..000000000000 --- a/net-im/psi/files/psi-0.14-minizip-detection.patch +++ /dev/null @@ -1,284 +0,0 @@ -=== modified file 'conf_windows.pri' ---- conf_windows.pri 2011-10-25 10:03:42 +0000 -+++ conf_windows.pri 2011-10-25 10:04:13 +0000 -@@ -5,7 +5,7 @@ - #CONFIG += qca-static - - # tell iris to use our internal libz --CONFIG += psi-zip -+CONFIG += psi-winzlib - - # OpenSSL - qca-static { - -=== modified file 'configure' ---- configure 2011-10-25 10:03:42 +0000 -+++ configure 2011-10-25 10:04:13 +0000 -@@ -955,41 +955,68 @@ - { - #ifdef Q_OS_WIN - // HACK: on windows, always use psi's bundled zlib -- conf->addExtra("CONFIG += psi-zip"); -+ conf->addExtra("CONFIG += psi-winzlib psi-minizip"); - return true; - #else -- QString inc, lib; -+ QStringList incs; -+ QString version, libs, other; - QString s; - -- s = conf->getenv("QC_WITH_ZLIB_INC"); -- if(!s.isEmpty()) { -- if(!conf->checkHeader(s, "zlib.h")) -- return false; -- inc = s; -- } -- else { -- if(!conf->findHeader("zlib.h", QStringList(), &s)) -- return false; -- inc = s; -- } -- -- s = conf->getenv("QC_WITH_ZLIB_LIB"); -- if(!s.isEmpty()) { -- if(!conf->checkLibrary(s, "z")) -- return false; -- lib = s; -- } -- else { -- if(!conf->findLibrary("z", &s)) -- return false; -- lib = s; -- } -- -- if(!inc.isEmpty()) -+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) { -+ -+ s = conf->getenv("QC_WITH_ZLIB_INC"); -+ if(!s.isEmpty()) { -+ if(!conf->checkHeader(s, "zlib.h")) -+ return false; -+ } -+ else { -+ if(!conf->findHeader("zlib.h", QStringList(), &s)) -+ return false; -+ } -+ incs.append(s); -+ -+ s = conf->getenv("QC_WITH_ZLIB_LIB"); -+ if(!s.isEmpty()) { -+ if(!conf->checkLibrary(s, "z")) -+ return false; -+ } -+ else { -+ if(!conf->findLibrary("z", &s)) -+ return false; -+ } -+ libs = QString("-L%1 -lz").arg(s); -+ } -+ -+ foreach(const QString &inc, incs) { - conf->addIncludePath(inc); -- if(!lib.isEmpty()) -- conf->addLib(QString("-L") + s); -- conf->addLib("-lz"); -+ } -+ conf->addLib(libs); -+ -+ incs.clear(); -+ libs.clear(); -+ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) { -+ -+ s = conf->getenv("QC_WITH_MINIZIP_INC"); -+ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) || -+ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) { -+ incs.append(s); -+ } -+ -+ s = conf->getenv("QC_WITH_MINIZIP_LIB"); -+ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) || -+ (s.isEmpty() && conf->findLibrary("minizip", &s))) { -+ libs = QString("-L%1 -lminizip").arg(s); -+ } -+ } -+ -+ if (!incs.isEmpty() && !libs.isEmpty()) { -+ foreach(const QString &inc, incs) { -+ conf->addIncludePath(inc); -+ } -+ conf->addLib(libs); -+ } else { -+ conf->addExtra("CONFIG += psi-minizip"); -+ } - - return true; - #endif - -=== modified file 'qcm/zlib.qcm' ---- qcm/zlib.qcm 2011-10-25 10:03:42 +0000 -+++ qcm/zlib.qcm 2011-10-25 10:04:13 +0000 -@@ -26,41 +26,68 @@ - { - #ifdef Q_OS_WIN - // HACK: on windows, always use psi's bundled zlib -- conf->addExtra("CONFIG += psi-zip"); -+ conf->addExtra("CONFIG += psi-winzlib psi-minizip"); - return true; - #else -- QString inc, lib; -+ QStringList incs; -+ QString version, libs, other; - QString s; - -- s = conf->getenv("QC_WITH_ZLIB_INC"); -- if(!s.isEmpty()) { -- if(!conf->checkHeader(s, "zlib.h")) -- return false; -- inc = s; -- } -- else { -- if(!conf->findHeader("zlib.h", QStringList(), &s)) -- return false; -- inc = s; -- } -- -- s = conf->getenv("QC_WITH_ZLIB_LIB"); -- if(!s.isEmpty()) { -- if(!conf->checkLibrary(s, "z")) -- return false; -- lib = s; -- } -- else { -- if(!conf->findLibrary("z", &s)) -- return false; -- lib = s; -- } -- -- if(!inc.isEmpty()) -+ if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) { -+ -+ s = conf->getenv("QC_WITH_ZLIB_INC"); -+ if(!s.isEmpty()) { -+ if(!conf->checkHeader(s, "zlib.h")) -+ return false; -+ } -+ else { -+ if(!conf->findHeader("zlib.h", QStringList(), &s)) -+ return false; -+ } -+ incs.append(s); -+ -+ s = conf->getenv("QC_WITH_ZLIB_LIB"); -+ if(!s.isEmpty()) { -+ if(!conf->checkLibrary(s, "z")) -+ return false; -+ } -+ else { -+ if(!conf->findLibrary("z", &s)) -+ return false; -+ } -+ libs = QString("-L%1 -lz").arg(s); -+ } -+ -+ foreach(const QString &inc, incs) { - conf->addIncludePath(inc); -- if(!lib.isEmpty()) -- conf->addLib(QString("-L") + s); -- conf->addLib("-lz"); -+ } -+ conf->addLib(libs); -+ -+ incs.clear(); -+ libs.clear(); -+ if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) { -+ -+ s = conf->getenv("QC_WITH_MINIZIP_INC"); -+ if ((!s.isEmpty() && conf->checkHeader(s, "unzip.h")) || -+ (s.isEmpty() && conf->findHeader("unzip.h", QStringList(), &s))) { -+ incs.append(s); -+ } -+ -+ s = conf->getenv("QC_WITH_MINIZIP_LIB"); -+ if((!s.isEmpty() && conf->checkLibrary(s, "minizip")) || -+ (s.isEmpty() && conf->findLibrary("minizip", &s))) { -+ libs = QString("-L%1 -lminizip").arg(s); -+ } -+ } -+ -+ if (!incs.isEmpty() && !libs.isEmpty()) { -+ foreach(const QString &inc, incs) { -+ conf->addIncludePath(inc); -+ } -+ conf->addLib(libs); -+ } else { -+ conf->addExtra("CONFIG += psi-minizip"); -+ } - - return true; - #endif - -=== modified file 'src/conf_iris.pri' ---- src/conf_iris.pri 2011-10-25 10:03:42 +0000 -+++ src/conf_iris.pri 2011-10-25 10:04:13 +0000 -@@ -13,11 +13,6 @@ - CONFIG += crypto - } - --# use zlib from psi if necessary --psi-zip { -- INCLUDEPATH += $$PWD/libpsi/tools/zip/minizip/win32 --} -- - mac { - # Universal binaries - qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) { - -=== modified file 'src/libpsi/tools/zip/zip.cpp' ---- src/libpsi/tools/zip/zip.cpp 2011-10-25 10:03:42 +0000 -+++ src/libpsi/tools/zip/zip.cpp 2011-10-25 10:04:13 +0000 -@@ -22,7 +22,11 @@ - #include <QStringList> - #include <QFile> - -+#ifdef PSIMINIZIP - #include "minizip/unzip.h" -+#else -+#include <minizip/unzip.h> -+#endif - #include "zip.h" - - class UnZipPrivate - -=== modified file 'src/libpsi/tools/zip/zip.pri' ---- src/libpsi/tools/zip/zip.pri 2011-10-25 10:03:42 +0000 -+++ src/libpsi/tools/zip/zip.pri 2011-10-25 10:04:13 +0000 -@@ -2,17 +2,20 @@ - $$PWD/zip.h - - SOURCES += \ -- $$PWD/zip.cpp \ -- $$PWD/minizip/unzip.c -- --INCLUDEPATH += $$PWD --DEPENDPATH += $$PWD -- --win32: { -+ $$PWD/zip.cpp -+ -+psi-minizip { -+ SOURCES += $$PWD/minizip/unzip.c -+ DEFINES += PSIMINIZIP -+ INCLUDEPATH += $$PWD -+ DEPENDPATH += $$PWD -+} -+ -+psi-winzlib { - INCLUDEPATH += $$PWD/minizip/win32 - DEPENDPATH += $$PWD/minizip/win32 - LIBS += $$PWD/minizip/win32/libz.a - } --mac: { -+mac { - QMAKE_LFLAGS += -lz - } - |