File chessx-use_system_quazip.patch of Package chessx

Overview Repositories Revisions Requests Users Attributes Meta

File chessx-use_system_quazip.patch of Package chessx (Revision e2fba1f5c5e74fd6e57891c0516e3bf3)

Currently displaying revision e2fba1f5c5e74fd6e57891c0516e3bf3 , Show latest

Index: chessx-1.5.4/chessx.pro
===================================================================
--- chessx-1.5.4.orig/chessx.pro
+++ chessx-1.5.4/chessx.pro
@@ -39,7 +39,6 @@ static { # Everything below takes effect
     message("Static build.")
 }
 
-DEFINES += QUAZIP_STATIC
 DEFINES += QT_NO_CAST_TO_ASCII
 DEFINES *= QT_USE_QSTRINGBUILDER
 
@@ -156,22 +155,6 @@ HEADERS += src/database/board.h \
     src/gui/engineoptionlist.h \
     src/gui/helpbrowser.h \
     src/database/downloadmanager.h \
-    src/quazip/zip.h \
-    src/quazip/unzip.h \
-    src/quazip/quazipnewinfo.h \
-    src/quazip/quazipfileinfo.h \
-    src/quazip/quazipfile.h \
-    src/quazip/quazipdir.h \
-    src/quazip/quazip.h \
-    src/quazip/quazip_global.h \
-    src/quazip/quaziodevice.h \
-    src/quazip/quagzipfile.h \
-    src/quazip/quacrc32.h \
-    src/quazip/quachecksum32.h \
-    src/quazip/quaadler32.h \
-    src/quazip/JlCompress.h \
-    src/quazip/ioapi.h \
-    src/quazip/crypt.h \
     src/gui/toolmainwindow.h \
     src/gui/playerlistwidget.h \
     src/gui/qled.h \
@@ -321,16 +304,6 @@ SOURCES += src/database/board.cpp \
     src/gui/engineoptionlist.cpp \
     src/gui/helpbrowser.cpp \
     src/database/downloadmanager.cpp \
-    src/quazip/quazipnewinfo.cpp \
-    src/quazip/quazipfile.cpp \
-    src/quazip/quazipdir.cpp \
-    src/quazip/quazip.cpp \
-    src/quazip/quaziodevice.cpp \
-    src/quazip/quagzipfile.cpp \
-    src/quazip/quacrc32.cpp \
-    src/quazip/quaadler32.cpp \
-    src/quazip/qioapi.cpp \
-    src/quazip/JlCompress.cpp \
     src/gui/toolmainwindow.cpp \
     src/gui/playerlistwidget.cpp \
     src/gui/qled.cpp \
@@ -401,8 +374,6 @@ SOURCES += src/database/board.cpp \
     src/gui/historylabel.cpp \
     src/database/streamdatabase.cpp \
     src/database/refcount.cpp \
-    src/quazip/unzip.cpp \
-    src/quazip/zip.cpp \
     src/database/arenabook.cpp \
     src/gui/gamelistsortmodel.cpp \
     src/gui/listwidgetex.cpp
@@ -412,8 +383,25 @@ INCLUDEPATH += src/database
 INCLUDEPATH += src/guess
 INCLUDEPATH += src/gui
 INCLUDEPATH += src/dialogs
-INCLUDEPATH += src/quazip
-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
+
+CONFIG += link_pkgconfig
+packagesExist(quazip1-qt5) {
+  HAVE_QUAZIP = yes
+  PKGCONFIG += quazip1-qt5
+  message("Using quazip1-qt5")
+}
+packagesExist(quazip) {
+  !defined(HAVE_QUAZIP, var) {
+    HAVE_QUAZIP = yes
+    PKGCONFIG += quazip
+    DEFINES += USE_QUAZIP5
+    message("Using quazip")
+  }
+}
+
+!defined(HAVE_QUAZIP, var) {
+  error("Need at least one of quazip1-qt5 or quazip")
+}
 
 win32 {
     # DEFINES += ZLIB_WINAPI
Index: chessx-1.5.4/src/gui/mainwindow.cpp
===================================================================
--- chessx-1.5.4.orig/src/gui/mainwindow.cpp
+++ chessx-1.5.4/src/gui/mainwindow.cpp
@@ -43,8 +43,13 @@
 #include "output.h"
 #include "pgndatabase.h"
 #include "playerlistwidget.h"
-#include "quazip.h"
-#include "quazipfile.h"
+#ifndef USE_QUAZIP5
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
+#else
+#include <quazip5/quazip.h>
+#include <quazip5/quazipfile.h>
+#endif
 #include "savedialog.h"
 #include "settings.h"
 #include "style.h"

Places

File chessx-use_system_quazip.patch of Package chessx (Revision e2fba1f5c5e74fd6e57891c0516e3bf3)

Places