Set build configuration for sfdk 3.3.0

Changes needed to get the project to build on the Application SDK 3.3.0.
llewelld · Sep 7, 2020 · 3005d9d · 3005d9d
1 parent 6197bd0
commit 3005d9d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/contrac.pro b/contrac.pro
@@ -117,13 +117,14 @@ PKGCONFIG += \
     openssl \
     libxml-2.0 \
     libcurl \
-    protobuf-lite \
-    quazip
+    protobuf-lite
 
 DEFINES += LINUX
 
 QT += dbus
 
+LIBS += -lquazip
+
 OTHER_FILES += \
     version.pri \
     src/submissionpayload.proto \

diff --git a/contracd/contracd.pro b/contracd/contracd.pro
@@ -82,11 +82,12 @@ DISTFILES += \
 
 PKGCONFIG += \
     openssl \
-    protobuf-lite \
-    quazip
+    protobuf-lite
 
 QT += dbus
 
+LIBS += -lquazip
+
 OTHER_FILES += \
     src/contrac.proto
 

diff --git a/contracd/src/zipistreambuffer.h b/contracd/src/zipistreambuffer.h
@@ -1,8 +1,8 @@
 #ifndef ZIPISTREAMBUFFER_H
 #define ZIPISTREAMBUFFER_H
 
-#include <quazip5/quazip.h>
-#include <quazip5/quazipfile.h>
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
 
 #include <iostream>
 

diff --git a/rpm/harbour-contrac.spec b/rpm/harbour-contrac.spec
@@ -29,8 +29,8 @@ BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(protobuf-lite)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(quazip)
 BuildRequires:  protobuf-compiler
+BuildRequires:  quazip-devel
 BuildRequires:  desktop-file-utils
 
 %description

diff --git a/rpm/harbour-contrac.yaml b/rpm/harbour-contrac.yaml
@@ -28,11 +28,11 @@ PkgConfigBR:
   - protobuf-lite
   - libcurl
   - libxml-2.0
-  - quazip
 
 # Build dependencies without a pkgconfig setup can be listed here
 PkgBR:
   - protobuf-compiler
+  - quazip-devel
 
 # Runtime dependencies which are not automatically detected
 Requires:

diff --git a/tests/tests.pro b/tests/tests.pro
@@ -29,8 +29,9 @@ INCLUDEPATH += ../src/
 
 PKGCONFIG += \
     openssl \
-    protobuf-lite \
-    quazip
+    protobuf-lite
+
+LIBS += -lquazip
 
 SOURCES += \
     test_tracing.cpp