diff options
| author |   Victor Kustov <ktrace@yandex.ru> | 2021-02-14 16:08:43 +0300 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-05-30 23:01:27 +0200 |
| commit | 341846a7feadae8042487550952386fcbbefca30 (patch) | |
| tree | b4cc6bb616ec7f3dda3844557f2c5be6257e066b /sci-electronics/librepcb/files | |
| parent | package.use.stable.mask: Mask test for dev-perl/Net-Netmask (diff) | |
| download | gentoo-341846a7feadae8042487550952386fcbbefca30.tar.gz gentoo-341846a7feadae8042487550952386fcbbefca30.tar.bz2 gentoo-341846a7feadae8042487550952386fcbbefca30.zip | |
sci-electronics/librepcb: bump version to 0.1.5
- unbundle quazip
- switch to quazip 1.x
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Victor Kustov <ktrace@yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/19384
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'sci-electronics/librepcb/files')
| -rw-r--r-- | sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch b/sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch new file mode 100644 index 000000000000..4e77ff9435ab --- /dev/null +++ b/sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch @@ -0,0 +1,57 @@ +From 7e01cb556ce5daee19b0270dded8eca9fcb1ea60 Mon Sep 17 00:00:00 2001 +From: Victor Kustov <ktrace@yandex.ru> +Date: Tue, 25 May 2021 01:52:57 +0300 +Subject: [PATCH] Fix for quazip 1.x usage + +--- + libs/librepcb/common/common.pro | 2 +- + libs/librepcb/common/fileio/transactionalfilesystem.cpp | 6 +++--- + libs/librepcb/common/network/filedownload.cpp | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libs/librepcb/common/common.pro b/libs/librepcb/common/common.pro +index 6a6b623..d6ce077 100644 +--- a/libs/librepcb/common/common.pro ++++ b/libs/librepcb/common/common.pro +@@ -333,7 +333,7 @@ FORMS += \ + + # quazip + contains(UNBUNDLE, quazip) { +- PKGCONFIG += quazip ++ PKGCONFIG += quazip1-qt5 + } else { + INCLUDEPATH += ../../quazip + } +diff --git a/libs/librepcb/common/fileio/transactionalfilesystem.cpp b/libs/librepcb/common/fileio/transactionalfilesystem.cpp +index c98c84e..7b4927b 100644 +--- a/libs/librepcb/common/fileio/transactionalfilesystem.cpp ++++ b/libs/librepcb/common/fileio/transactionalfilesystem.cpp +@@ -27,9 +27,9 @@ + #include "sexpression.h" + + #ifdef SYSTEM_QUAZIP +-#include <quazip5/quazip.h> +-#include <quazip5/quazipdir.h> +-#include <quazip5/quazipfile.h> ++#include <quazip.h> ++#include <quazipdir.h> ++#include <quazipfile.h> + #else + #include <quazip/quazip.h> + #include <quazip/quazipdir.h> +diff --git a/libs/librepcb/common/network/filedownload.cpp b/libs/librepcb/common/network/filedownload.cpp +index 110fae3..718a137 100644 +--- a/libs/librepcb/common/network/filedownload.cpp ++++ b/libs/librepcb/common/network/filedownload.cpp +@@ -27,7 +27,7 @@ + #include <QtCore> + + #ifdef SYSTEM_QUAZIP +-#include <quazip5/JlCompress.h> ++#include <JlCompress.h> + #else + #include <quazip/JlCompress.h> + #endif +-- +2.26.3 + |