From 469c3c02bfc4a9c3c3bf03e6b857c799d7f0c8cf Mon Sep 17 00:00:00 2001
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Sat, 7 Jul 2018 18:28:47 +0000
Subject: [PATCH] Add two missing patches.

---
 cad/qcad/files/patch-src_zip_RZip.cpp | 11 +++++++++++
 cad/qcad/files/patch-src_zip_zip.pro  | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 cad/qcad/files/patch-src_zip_RZip.cpp
 create mode 100644 cad/qcad/files/patch-src_zip_zip.pro

diff --git a/cad/qcad/files/patch-src_zip_RZip.cpp b/cad/qcad/files/patch-src_zip_RZip.cpp
new file mode 100644
index 000000000000..c483bf9f9df7
--- /dev/null
+++ 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"
+ 
diff --git a/cad/qcad/files/patch-src_zip_zip.pro b/cad/qcad/files/patch-src_zip_zip.pro
new file mode 100644
index 000000000000..f826cae6b98b
--- /dev/null
+++ 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