From f6652ef9c05f9bc15eab1ef2f902f66314418caf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 21 Oct 2022 20:03:12 +0100
Subject: gentoo auto-resync : 21:10:2022 - 20:03:11

---
 sci-electronics/librepcb/Manifest                  |  1 -
 .../librepcb/files/librepcb-0.1.5-quazip1.x.patch  | 57 ----------------------
 2 files changed, 58 deletions(-)
 delete mode 100644 sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch

(limited to 'sci-electronics/librepcb')

diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest
index 3680d0de1a72..b70f86e547b6 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,4 +1,3 @@
-AUX librepcb-0.1.5-quazip1.x.patch 1799 BLAKE2B f883e5eec392aa2aa4e739d3057e36a558a691298bd89fdb2da7e80ac0b0ecc13dc76073544675cf6bc8998f9a7d92ea7e57f107568c9a5b8ebffefb76357152 SHA512 82b5adecd94e22148205f95a514ccb3ccce720b10925549c806f58cd59be42dc6912aef2c8c275c6b87cf02f48d200c847ec6e27525be050b824b90c7bb994b2
 AUX librepcb-0.1.6-muparser-fix.patch 1058 BLAKE2B 2d3885fc9e3f178cef352a276fa141f873478938c8b7136d11f69a2fabc73e7ec548c24ae9bd1cdcfc229b94f30368dd48f7b2e85ca065caa69fd1e266e34f7e SHA512 1443b14b562608e729bd75f49d8e1fc962afb3bd1562382bb39f060531f40769ab99ad485547ab2d2ab4b892702242c057fdad6158dbc9d33cce02dcc3566596
 DIST librepcb-0.1.6-source.zip 12671974 BLAKE2B bed8d6134159ec663dd88f9933ef0dad6d3bca70776537bf2e16397f0e4fd968a41661d95a118008fcf9d7d6d2432ebac81d78153b3c3ce8d69c64fb59aaf70e SHA512 a51ac2830d65bbd10be8904ecdcc6a7781d80c95e1423ed5bd04fcd009a0b7135ff3a49a87afe9e99006ae1f6ae44f2341021e5733675f2f20b05525860da5d7
 DIST librepcb-0.1.7-source.zip 13112342 BLAKE2B 53b6dad94febee84b60df1d848936f44093698c9965d4b24815395ff564a5634ab84f38574e7a1b6891f2cdd99b5162eb3747bbfdde2dfc2d680cff76a4e1cc1 SHA512 285ad661b9c528b1aa05c9a0482034af26e9344eb08a119ffabbadf518957a9784ccb9582bcfabcf5bf8982c33b6286b39722c0d59072df983925b3949b3e6c5
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
deleted file mode 100644
index 4e77ff9435ab..000000000000
--- a/sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
-
-- 
cgit v1.2.3