commit: 341846a7feadae8042487550952386fcbbefca30 Author: Victor Kustov <ktrace <AT> yandex <DOT> ru> AuthorDate: Sun Feb 14 13:08:43 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun May 30 21:01:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341846a7
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 <AT> yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/19384 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-electronics/librepcb/Manifest | 1 + .../librepcb/files/librepcb-0.1.5-quazip1.x.patch | 57 ++++++++++++++++++++++ sci-electronics/librepcb/librepcb-0.1.5.ebuild | 55 +++++++++++++++++++++ 3 files changed, 113 insertions(+) diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest index 72b59cca066..61e8f60ff02 100644 --- a/sci-electronics/librepcb/Manifest +++ b/sci-electronics/librepcb/Manifest @@ -1 +1,2 @@ DIST librepcb-0.1.3-source.zip 12148919 BLAKE2B 2be3455c9be3e60a7cb314292e2a6ffe10d98f0c647d9c79f223ee5c5ef50675685d914889f772448dba699742d3bcd5b6636d489e630c8033912f3c9f223715 SHA512 28d45800bbbbcee8d30973c1a1e1e561c0fe2c65339eda4f6170779d921a9f5b2f5fb8c1cda00477e59976b88a3c368bb4985f31331bb16f761823642138c78b +DIST librepcb-0.1.5-source.zip 13111207 BLAKE2B 3a8c5f8b310971e1a6bd5b1fa8eb8059cd1c571e9ab369bf80c946ccbd320c258d5e8c65bea3b5a5bc4d85a38cac8205d5bbfbaad6aebf0a031315b73e9b99f4 SHA512 ed8c8fc154a03082bcbfe414bdb934870d09cf137811036a3ce59d70e1ad0b582fea64c31037c84e76a939bf1d087caabb9aa349578b525bce882e853a969653 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 00000000000..4e77ff9435a --- /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 <[email protected]> +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 + diff --git a/sci-electronics/librepcb/librepcb-0.1.5.ebuild b/sci-electronics/librepcb/librepcb-0.1.5.ebuild new file mode 100644 index 00000000000..84229df8b49 --- /dev/null +++ b/sci-electronics/librepcb/librepcb-0.1.5.ebuild @@ -0,0 +1,55 @@ +# Copyright 2009-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils virtualx xdg + +DESCRIPTION="Free EDA software to develop printed circuit boards" +HOMEPAGE="https://librepcb.org/"; +SRC_URI="https://download.librepcb.org/releases/${PV}/${P}-source.zip"; + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND=" + app-arch/unzip + dev-qt/linguist-tools:5" + +RDEPEND=" + dev-libs/quazip:= + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-libs/zlib" + +DEPEND="${RDEPEND} + dev-qt/qttest:5" + +PATCHES=( "${FILESDIR}"/${P}-quazip1.x.patch ) + +src_configure() { + local pro_lst + for pro_lst in $(find libs/librepcb/ -type f -name "*.pro" || die) + do + sed -e 's:target.path = $${PREFIX}/lib:target.path = $${PREFIX}/'$(get_libdir)':' -i ${pro_lst} || die "Can't fix ${pro_lst} file" + done + eqmake5 -r PREFIX="/usr" UNBUNDLE+="quazip" +} + +src_install() { + emake INSTALL_ROOT="${D}" install +} + +src_test() { + cd "${S}"/output + virtx ./librepcb-unittests --gtest_filter=-SystemInfoTest.testGetUsername +}
