From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- sci-electronics/librepcb/Manifest | 5 +- .../librepcb/files/librepcb-0.1.5-quazip1.x.patch | 57 ++++++++++++++++++++++ sci-electronics/librepcb/librepcb-0.1.3.ebuild | 5 +- sci-electronics/librepcb/librepcb-0.1.5.ebuild | 55 +++++++++++++++++++++ 4 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 sci-electronics/librepcb/files/librepcb-0.1.5-quazip1.x.patch create mode 100644 sci-electronics/librepcb/librepcb-0.1.5.ebuild (limited to 'sci-electronics/librepcb') diff --git a/sci-electronics/librepcb/Manifest b/sci-electronics/librepcb/Manifest index d8c0343f1e64..b61dcf0151ea 100644 --- a/sci-electronics/librepcb/Manifest +++ b/sci-electronics/librepcb/Manifest @@ -1,3 +1,6 @@ +AUX librepcb-0.1.5-quazip1.x.patch 1799 BLAKE2B f883e5eec392aa2aa4e739d3057e36a558a691298bd89fdb2da7e80ac0b0ecc13dc76073544675cf6bc8998f9a7d92ea7e57f107568c9a5b8ebffefb76357152 SHA512 82b5adecd94e22148205f95a514ccb3ccce720b10925549c806f58cd59be42dc6912aef2c8c275c6b87cf02f48d200c847ec6e27525be050b824b90c7bb994b2 DIST librepcb-0.1.3-source.zip 12148919 BLAKE2B 2be3455c9be3e60a7cb314292e2a6ffe10d98f0c647d9c79f223ee5c5ef50675685d914889f772448dba699742d3bcd5b6636d489e630c8033912f3c9f223715 SHA512 28d45800bbbbcee8d30973c1a1e1e561c0fe2c65339eda4f6170779d921a9f5b2f5fb8c1cda00477e59976b88a3c368bb4985f31331bb16f761823642138c78b -EBUILD librepcb-0.1.3.ebuild 948 BLAKE2B 54ea0908b371f979cfa70ac2098f2d6870afb648a9b2d5cac4d0db4230e52684e7d131936960549471ec77360b8d4a7e996c55a53b87fd92ddfe0c61d14162e1 SHA512 586b81f4d3710cdd41432bb0cf61898e126cd639809ee25b4184d9df975f48537af607cd9e1535e03e7a7444c4e1b752e13091c66dce62d9c9755b2ab4ef847d +DIST librepcb-0.1.5-source.zip 13111207 BLAKE2B 3a8c5f8b310971e1a6bd5b1fa8eb8059cd1c571e9ab369bf80c946ccbd320c258d5e8c65bea3b5a5bc4d85a38cac8205d5bbfbaad6aebf0a031315b73e9b99f4 SHA512 ed8c8fc154a03082bcbfe414bdb934870d09cf137811036a3ce59d70e1ad0b582fea64c31037c84e76a939bf1d087caabb9aa349578b525bce882e853a969653 +EBUILD librepcb-0.1.3.ebuild 965 BLAKE2B e0deb76d90054abdb78b4c4daf014be24add7a1bf0f5e2cdc56624af1723243bc43d46f5d17995659b3268fa0535b396464b83a90bf6374d2c195dd280f5503d SHA512 b330f566302d600c20807c24ae826fba6652ae99947fdccc14e46b27aad12d7d45690d8055c7fe511ad90ae5ab488abba051d53775d836cd12309be5a78b8f9a +EBUILD librepcb-0.1.5.ebuild 1195 BLAKE2B 7cd91cf9229a1b90f03fc36dba98a1fb6cea4b4a9a2cab876ff5a9831c73a0db7878c2bb0efcc4a7b82d98d437d80ed3e8696d4a85893a1b8a33257cda91c24a SHA512 a3c2ee3cfc5dafe2d77633d4885a03acd62dd9a228cc5b40e5432fab0f7ef37ed4535273872e76a1488d826acddde1220dc8adf3579410cf7bac429fd5eef446 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 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 +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 +-#include +-#include ++#include ++#include ++#include + #else + #include + #include +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 + + #ifdef SYSTEM_QUAZIP +-#include ++#include + #else + #include + #endif +-- +2.26.3 + diff --git a/sci-electronics/librepcb/librepcb-0.1.3.ebuild b/sci-electronics/librepcb/librepcb-0.1.3.ebuild index fe132f053703..610277aedbe6 100644 --- a/sci-electronics/librepcb/librepcb-0.1.3.ebuild +++ b/sci-electronics/librepcb/librepcb-0.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,8 @@ RDEPEND=" dev-qt/qtxml:5 sys-libs/zlib" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-qt/qttest:5" src_configure() { eqmake5 -r PREFIX="/usr" 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 000000000000..84229df8b492 --- /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 +} -- cgit v1.2.3