[gentoo-commits] repo/gentoo:master commit in: sci-electronics/librepcb/files/, sci-electronics/librepcb/
commit: 30b7c3d0bfae5d50d0b30b9c9f23f25a5625df66
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Fri Oct 27 08:01:35 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Fri Oct 27 08:01:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30b7c3d0
sci-electronics/librepcb: drop 0.1.6-r1
Co-authored-by: Victor Kustov yandex.ru>
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-electronics/librepcb/Manifest | 1 -
.../files/librepcb-0.1.6-muparser-fix.patch| 28
sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild | 50 --
3 files changed, 79 deletions(-)
diff --git a/sci-electronics/librepcb/Manifest
b/sci-electronics/librepcb/Manifest
index fd5bb0564575..9105662fe2a4 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,3 +1,2 @@
-DIST librepcb-0.1.6-source.zip 12671974 BLAKE2B
bed8d6134159ec663dd88f9933ef0dad6d3bca70776537bf2e16397f0e4fd968a41661d95a118008fcf9d7d6d2432ebac81d78153b3c3ce8d69c64fb59aaf70e
SHA512
a51ac2830d65bbd10be8904ecdcc6a7781d80c95e1423ed5bd04fcd009a0b7135ff3a49a87afe9e99006ae1f6ae44f2341021e5733675f2f20b05525860da5d7
DIST librepcb-0.1.7-source.zip 13112342 BLAKE2B
53b6dad94febee84b60df1d848936f44093698c9965d4b24815395ff564a5634ab84f38574e7a1b6891f2cdd99b5162eb3747bbfdde2dfc2d680cff76a4e1cc1
SHA512
285ad661b9c528b1aa05c9a0482034af26e9344eb08a119ffabbadf518957a9784ccb9582bcfabcf5bf8982c33b6286b39722c0d59072df983925b3949b3e6c5
DIST librepcb-1.0.0-source.zip 1496 BLAKE2B
5b78bb0bd32de78207a95916bc7a7ff85b58f3b4b67e6faf9180bae852ce11416ac3740c04eb30b57073a21eb24d8041136e1ef17f5614e3f7d340e7b813b03d
SHA512
7bc056be37fd39d873f6a40cf04c529e95dfc2b69d1cc8246ccbba0932a67c0f017e939c206cf0656b4657cb5c99c10c7e19b9dc4969d54d0a80014029da9439
diff --git a/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
b/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
deleted file mode 100644
index 2abb26b18b59..
--- a/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/./libs/librepcb/common/utils/mathparser.cpp.orig
b/./libs/librepcb/common/utils/mathparser.cpp
-index 618de36..e0903de 100644
a/./libs/librepcb/common/utils/mathparser.cpp.orig
-+++ b/./libs/librepcb/common/utils/mathparser.cpp
-@@ -22,7 +22,7 @@
-
**/
- #include "mathparser.h"
-
--#include "muparser/include/muParser.h"
-+#include
-
-
/***
- * Namespace
-diff --git a/./cmake/FindMuParser.cmake.orig b/./cmake/FindMuParser.cmake
a/./cmake/FindMuParser.cmake.orig 2021-11-03 01:04:32.0 +0300
-+++ b/./cmake/FindMuParser.cmake 2022-04-24 18:01:23.996260205 +0300
-@@ -37,6 +37,11 @@
- if(muparser_FOUND)
- message(STATUS "Using system MuParser")
-
-+ # Add uppercase alias if only the lowercase target is defined
-+ if(NOT TARGET MuParser::MuParser)
-+add_library(MuParser::MuParser ALIAS muparser::muparser)
-+ endif()
-+
- # Stop here, we're done
- return()
- endif()
diff --git a/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild
b/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild
deleted file mode 100644
index ff7207a0da95..
--- a/sci-electronics/librepcb/librepcb-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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-cpp/muParser:=
- dev-libs/quazip:=[qt5(+)]
- 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}-muparser-fix.patch )
-
-src_configure() {
- local mycmakeargs+=(
- -DUNBUNDLE_QUAZIP=ON
- -DUNBUNDLE_MUPARSER=ON )
- cmake_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}"/tests/unittests || die
- virtx ./librepcb-unittests
--gtest_filter=-SystemInfoTest.testGetUsername
-}
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/librepcb/files/, sci-electronics/librepcb/
commit: 988bbcc04c1f98aa018ee1891379e52176e94c79
Author: Victor Kustov yandex ru>
AuthorDate: Sun Apr 17 17:58:28 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Apr 25 06:56:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=988bbcc0
sci-electronics/librepcb: up to 0.1.6
- switch from qmake to cmake
- unbundle dev-cpp/muParser and dev-libs/quazip
- backport librepcb-0.1.6-muparser-fix.patch from master
- bugreport QA warning to upstream
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Victor Kustov yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/25069
Signed-off-by: Joonas Niilola gentoo.org>
sci-electronics/librepcb/Manifest | 1 +
.../files/librepcb-0.1.6-muparser-fix.patch| 28
sci-electronics/librepcb/librepcb-0.1.6.ebuild | 50 ++
3 files changed, 79 insertions(+)
diff --git a/sci-electronics/librepcb/Manifest
b/sci-electronics/librepcb/Manifest
index 61e8f60ff028..febaf25c929b 100644
--- a/sci-electronics/librepcb/Manifest
+++ b/sci-electronics/librepcb/Manifest
@@ -1,2 +1,3 @@
DIST librepcb-0.1.3-source.zip 12148919 BLAKE2B
2be3455c9be3e60a7cb314292e2a6ffe10d98f0c647d9c79f223ee5c5ef50675685d914889f772448dba699742d3bcd5b6636d489e630c8033912f3c9f223715
SHA512
28d45800cee8d30973c1a1e1e561c0fe2c65339eda4f6170779d921a9f5b2f5fb8c1cda00477e59976b88a3c368bb4985f31331bb16f761823642138c78b
DIST librepcb-0.1.5-source.zip 13111207 BLAKE2B
3a8c5f8b310971e1a6bd5b1fa8eb8059cd1c571e9ab369bf80c946ccbd320c258d5e8c65bea3b5a5bc4d85a38cac8205d5bbfbaad6aebf0a031315b73e9b99f4
SHA512
ed8c8fc154a03082bcbfe414bdb934870d09cf137811036a3ce59d70e1ad0b582fea64c31037c84e76a939bf1d087caabb9aa349578b525bce882e853a969653
+DIST librepcb-0.1.6-source.zip 12671974 BLAKE2B
bed8d6134159ec663dd88f9933ef0dad6d3bca70776537bf2e16397f0e4fd968a41661d95a118008fcf9d7d6d2432ebac81d78153b3c3ce8d69c64fb59aaf70e
SHA512
a51ac2830d65bbd10be8904ecdcc6a7781d80c95e1423ed5bd04fcd009a0b7135ff3a49a87afe9e99006ae1f6ae44f2341021e5733675f2f20b05525860da5d7
diff --git a/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
b/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
new file mode 100644
index ..2abb26b18b59
--- /dev/null
+++ b/sci-electronics/librepcb/files/librepcb-0.1.6-muparser-fix.patch
@@ -0,0 +1,28 @@
+diff --git a/./libs/librepcb/common/utils/mathparser.cpp.orig
b/./libs/librepcb/common/utils/mathparser.cpp
+index 618de36..e0903de 100644
+--- a/./libs/librepcb/common/utils/mathparser.cpp.orig
b/./libs/librepcb/common/utils/mathparser.cpp
+@@ -22,7 +22,7 @@
+
**/
+ #include "mathparser.h"
+
+-#include "muparser/include/muParser.h"
++#include
+
+
/***
+ * Namespace
+diff --git a/./cmake/FindMuParser.cmake.orig b/./cmake/FindMuParser.cmake
+--- a/./cmake/FindMuParser.cmake.orig 2021-11-03 01:04:32.0 +0300
b/./cmake/FindMuParser.cmake 2022-04-24 18:01:23.996260205 +0300
+@@ -37,6 +37,11 @@
+ if(muparser_FOUND)
+ message(STATUS "Using system MuParser")
+
++ # Add uppercase alias if only the lowercase target is defined
++ if(NOT TARGET MuParser::MuParser)
++add_library(MuParser::MuParser ALIAS muparser::muparser)
++ endif()
++
+ # Stop here, we're done
+ return()
+ endif()
diff --git a/sci-electronics/librepcb/librepcb-0.1.6.ebuild
b/sci-electronics/librepcb/librepcb-0.1.6.ebuild
new file mode 100644
index ..69a4c50b530d
--- /dev/null
+++ b/sci-electronics/librepcb/librepcb-0.1.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2009-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake 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-cpp/muParser:=
+ 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}-muparser-fix.patch )
+
+src_configure() {
+ local mycmakeargs+=(
+ -DUNBUNDLE_QUAZIP=ON
+ -DUNBUNDLE_MUPARSER=ON )
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}"/tests/unittests || die
+ virtx ./librepcb-unittests
--gtest_filter=-SystemInfoTest.testGetUsername || die
+}
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/librepcb/files/, sci-electronics/librepcb/
commit: 341846a7feadae8042487550952386fcbbefca30
Author: Victor Kustov yandex ru>
AuthorDate: Sun Feb 14 13:08:43 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 30 21:01:27 2021 +
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 yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/19384
Signed-off-by: Andreas Sturmlechner 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
28d45800cee8d30973c1a1e1e561c0fe2c65339eda4f6170779d921a9f5b2f5fb8c1cda00477e59976b88a3c368bb4985f31331bb16f761823642138c78b
+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 000..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
+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.5.ebuild
b/sci-electronics/librepcb/librepcb-0.1.5.ebuild
new file mode 100644
index 000..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
