commit: 9bad9f86bd1fa7b883640b9f816983b61d086789 Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Fri Jun 16 06:40:45 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Fri Oct 27 09:14:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bad9f86
sci-electronics/fritzing: add 0.9.6 Co-authored-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> Closes: https://bugs.gentoo.org/898070 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/31480 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-electronics/fritzing/Manifest | 2 + .../fritzing-0.9.6-dropping-register-keyword.patch | 25 ++++++++ .../fritzing/files/fritzing-0.9.6-quazip-qt5.patch | 28 ++++++++ sci-electronics/fritzing/fritzing-0.9.6.ebuild | 75 ++++++++++++++++++++++ 4 files changed, 130 insertions(+) diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest index d96da819aa9b..c6e0e183278a 100644 --- a/sci-electronics/fritzing/Manifest +++ b/sci-electronics/fritzing/Manifest @@ -1,2 +1,4 @@ DIST fritzing-0.9.4.tar.gz 11430102 BLAKE2B 20232b3c33308edcab188c61597f87d8a21d9b786eeab4e398c1add6e263562d1b0df95634850d5271decfa380d7b2b0c18c7f19f8b8544f330687e4cffa3700 SHA512 b148d8b93d2e452c975ca3acfd2ad5de4259f99da69c5890ebeea30730674526d480ee3830f61f6057e83b7720f07fce80ef3a74d4b718be691a92d656b755e0 +DIST fritzing-0.9.6.tar.gz 11521767 BLAKE2B 01c6ea87108b70161350b79c4878c288935c3f0a37464cf3c4e276a746edb2bbcb2c3b7bcf0b3a879232f5f79fd15b573f930b8cea96924b04b1e5b3ddade542 SHA512 d91fcf79760b9570513e8315bcb29fcd1d53684920e8563539669a0dedd164e35031e53da7ea2c12e95e564b3f95a05ce953082ffdfa54f4e4f99c50a4991a52 DIST fritzing-parts-0.9.4.tar.gz 17662003 BLAKE2B a67f4f1297793131d25e6b9c853e987fc0c5ecebd5f57b3675b7f9c4539f867ad18fc6e854c7a2bef1669e05dbc13dcc93df9b9befb8991ca64b2bc3e2a71b84 SHA512 f6f6c396eaf0b61dd56ece22f6bb8fce4369503729fd8f5550643e74a60aaad75abce9e391d63d52f12e4f3420296791fdf9832f7c8507dad2cf623e1bd8340f +DIST fritzing-parts-0.9.6.tar.gz 14982269 BLAKE2B 0f017a2a3eb654ed26d647faa463024c52aab58df7a487c75e1636efb288dc9fad9aa8499404f381012287e6e3312a569ed2f171d20b2d5df85440d97673fe9c SHA512 d39096bcb89e2aa04c285aaddd575a54a08d016d859399133eab89d69ed37d5e5e5a5a9e838cad5879835bcdcdd9c3b484179104e04d8f96d4eef1004047162b diff --git a/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch b/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch new file mode 100644 index 000000000000..e7e9d6d27ac5 --- /dev/null +++ b/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch @@ -0,0 +1,25 @@ +https://github.com/fritzing/fritzing-app/pull/4033 +From: Brahmajit Das <brahmajit....@gmail.com> +Date: Fri, 16 Jun 2023 06:29:28 +0000 +Subject: [PATCH] clipablewire.cpp: Dropping usage of register storage class + +The register storage class has been depreacted in C++14 and completely +removed in C++17. Thus resulting in buils errors such as: + +clipablewire.cpp:55:2: error: ISO C++17 does not allow register storage class specifier [-Wregister] + +Refer: https://en.cppreference.com/w/cpp/language/storage_duration +Bug: https://bugs.gentoo.org/898070 +Signed-off-by: Brahmajit Das <brahmajit....@gmail.com> +--- a/src/items/clipablewire.cpp ++++ b/src/items/clipablewire.cpp +@@ -50,7 +50,7 @@ static double connectorRectClipInset = 0.5; + int CrossingsTest( double pgon[][2], int numverts, double point[2] ) + { + #ifdef WINDING +- register int crossings ; ++ int crossings ; + #endif + int j, yflag0, yflag1, inside_flag, xflag0 ; + double ty, tx, *vtx0, *vtx1 ; + diff --git a/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch b/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch new file mode 100644 index 000000000000..9d3853c516ab --- /dev/null +++ b/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch @@ -0,0 +1,28 @@ +Fix build with QuaZip-1.0. + +--- a/phoenix.pro ++++ b/phoenix.pro +@@ -194,8 +194,9 @@ + include(test/version.pri) + + contains(DEFINES, QUAZIP_INSTALLED) { + !build_pass:message("using installed QuaZIP library") +- LIBS += -lquazip5 ++ CONFIG += link_pkgconfig ++ PKGCONFIG += quazip1-qt5 + } else { + include(pri/quazip.pri) + } +--- a/src/utils/folderutils.cpp ++++ b/src/utils/folderutils.cpp +@@ -35,8 +35,8 @@ + + #include "../debugdialog.h" + #ifdef QUAZIP_INSTALLED +-#include <quazip5/quazip.h> +-#include <quazip5/quazipfile.h> ++#include <quazip.h> ++#include <quazipfile.h> + #else + #include "../lib/quazip/quazip.h" + #include "../lib/quazip/quazipfile.h" diff --git a/sci-electronics/fritzing/fritzing-0.9.6.ebuild b/sci-electronics/fritzing/fritzing-0.9.6.ebuild new file mode 100644 index 000000000000..4fb515cfa82f --- /dev/null +++ b/sci-electronics/fritzing/fritzing-0.9.6.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils xdg + +PARTS_P="${PN}-parts-${PV}" +PARTS_COMMIT="667a5360e53e8951e5ca6c952ae928f7077a9d5e" + +DESCRIPTION="Electronic Design Automation" +HOMEPAGE=" + https://fritzing.org/ + https://github.com/fritzing/fritzing-app/ +" +SRC_URI=" + https://github.com/fritzing/fritzing-app/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/fritzing/fritzing-parts/archive/${PARTS_COMMIT}.tar.gz -> ${PARTS_P}.tar.gz +" +S="${WORKDIR}/${PN}-app-${PV}" + +LICENSE="CC-BY-SA-3.0 GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-libs/quazip:0=[qt5(+)] + dev-libs/libgit2:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 +" +DEPEND="${RDEPEND} + dev-libs/boost +" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.4-move-parts-db-path.patch" + "${FILESDIR}/${PN}-0.9.6-quazip-qt5.patch" + "${FILESDIR}/${PN}-0.9.6-dropping-register-keyword.patch" +) + +src_prepare() { + default + + # Get a rid of the bundled libs + # Bug 412555 and + # https://code.google.com/p/fritzing/issues/detail?id=1898 + rm -r src/lib/quazip/ pri/quazip.pri || die + + # Use system libgit + sed -i -e 's:LIBGIT_STATIC.*:LIBGIT_STATIC = false:' phoenix.pro || die + + # Add correct git version + sed -i -e "s:GIT_VERSION = \$\$system.*$:GIT_VERSION = ${PV}:" pri/gitversion.pri || die +} + +src_configure() { + eqmake5 'DEFINES=QUAZIP_INSTALLED PARTS_COMMIT=\\\"'"${PARTS_COMMIT}"'\\\"' phoenix.pro +} + +src_install() { + PARTS_DIR="${WORKDIR}/fritzing-parts-${PARTS_COMMIT}" + INSTALL_ROOT="${D}" default + insinto /usr/share/fritzing/fritzing-parts + doins -r ${PARTS_DIR}/* + einstalldocs +}
