blob: 0e43c537da8e8d63a2f15fa741a0cf8d2320f602 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 69458713de372d1e988ac1f9d095c5d6f50510bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20La=C3=9F?= <bevan@bi-co.net>
Date: Thu, 26 Jan 2023 19:18:56 +0100
Subject: [PATCH 1/4] Quick & Dirty patch to allow finding quazip-qt6 on Arch
Linux
---
pri/quazipdetect.pri | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/pri/quazipdetect.pri b/pri/quazipdetect.pri
index f8d6c525..f13c5dff 100644
--- a/pri/quazipdetect.pri
+++ b/pri/quazipdetect.pri
@@ -1,6 +1,6 @@
# Copyright (c) 2021,2024 Fritzing GmbH
-message("Using Fritzing quazip detect script.")
+message("Using custom quazip detect script.")
# We are currently using a quazip version from this PR:
# https://github.com/stachenov/quazip/pull/199
@@ -10,28 +10,10 @@ message("Using Fritzing quazip detect script.")
# issues that need # work. Code review is welcome for all pull requests.
# If you are well versed in # Qt and C/C++ please start helping around
# and check https://github.com/stachenov/quazip/issues/185
-QUAZIP_VERSION=1.4
-QUAZIP_PATH=$$absolute_path($$PWD/../../quazip-$$QT_VERSION-$$QUAZIP_VERSION)intuisphere
-QUAZIP_INCLUDE_PATH=$$QUAZIP_PATH/include/QuaZip-Qt6-$$QUAZIP_VERSION
-QUAZIP_LIB_PATH=$$QUAZIP_PATH/lib
SOURCES += \
src/zlibdummy.c \
-exists($$QUAZIP_PATH) {
- message("found quazip in $${QUAZIP_PATH}")
- } else {
- error("quazip could not be found at $$QUAZIP_PATH")
- }
-
-INCLUDEPATH += $$QUAZIP_INCLUDE_PATH
-LIBS += -L$$QUAZIP_LIB_PATH -lquazip1-qt$$QT_MAJOR_VERSION
-
-unix {
- message("set rpath for quazip")
- QMAKE_RPATHDIR += $$QUAZIP_LIB_PATH
-}
-
-macx {
- LIBS += -lz
-}
+message("including Arch's quazip library")
+INCLUDEPATH += /usr/include/QuaZip-Qt6-1.5/
+LIBS += -lquazip1-qt6
--
2.49.0
|