Add two missing patches.

svn path=/head/; revision=474116
2018-07-07 18:28:47 +00:00 · 2018-07-07 18:28:47 +00:00 · 469c3c02bf · 2021-03-31 03:12:20 +00:00
commit 469c3c02bf
parent 192bb1d772
2 changed files with 30 additions and 0 deletions
--- a/cad/qcad/files/patch-src_zip_RZip.cpp
+++ b/cad/qcad/files/patch-src_zip_RZip.cpp
@ -0,0 +1,11 @@
+--- src/zip/RZip.cpp.orig	2018-07-01 14:53:24 UTC
+++ src/zip/RZip.cpp
+@@ -19,7 +19,7 @@
+ //#include <QTextStream>
+ //#include <QResource>
+ 
+-#include "JlCompress.h"
+#include <quazip5/JlCompress.h>
+ 
+ #include "RZip.h"
+ 
--- a/cad/qcad/files/patch-src_zip_zip.pro
+++ b/cad/qcad/files/patch-src_zip_zip.pro
@ -0,0 +1,19 @@
+--- src/zip/zip.pro.orig	2018-07-01 14:10:25 UTC
+++ src/zip/zip.pro
+@@ -1,6 +1,6 @@
+ include( ../../shared.pri )
+ 
+-INCLUDEPATH+=../3rdparty/quazip/src
+# INCLUDEPATH+=../3rdparty/quazip/src
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
+@@ -23,7 +23,7 @@ else {
+     CONFIG += plugin
+ }
+ TARGET = $${RLIBNAME}zip
+-LIBS += -l$${RLIBNAME}core -lquazip
+LIBS += -l$${RLIBNAME}core -lquazip5
+ OTHER_FILES += zip.dox
+ DEFINES += QCADZIP_LIBRARY
+ RC_FILE = zip.rc