commit: 1859c87c8ebf0e7a227f78bb0c7d6861e3a6eb87 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri May 30 16:39:23 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri May 30 21:10:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1859c87c
sci-electronics/fritzing: treeclean Closes: https://bugs.gentoo.org/947619 (pkgremoved) Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/package.mask | 9 --- sci-electronics/fritzing/Manifest | 2 - .../files/fritzing-0.9.4-move-parts-db-path.patch | 55 ---------------- .../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 ---------------------- sci-electronics/fritzing/metadata.xml | 8 --- 7 files changed, 202 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 3b2420d71911..f166e200465a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -286,15 +286,6 @@ x11-misc/qcomicbook # 1.0 release was almost 8 years old already. ~media-gfx/fotowall-1.0 -# Andreas Sturmlechner <[email protected]> (2025-05-01) -# No maintainer in Gentoo since 2016, current package is still Qt5 based; -# upstream does not even bother making tags let alone releases; anyone who -# wants to deal with that shall step up as permanent maintainer and cut -# some kind of Qt6 based package. -# See also: https://github.com/fritzing/fritzing-app/issues/4086 -# Bug #947619; removal on 2025-05-31 -sci-electronics/fritzing - # Matt Jolly <[email protected]> (2025-04-28) # Unmaintained in Gentoo, depends on masked x11-wm/fvwm, # SRC_URI uses mirror://gentoo and the files don't exist on mirrors. diff --git a/sci-electronics/fritzing/Manifest b/sci-electronics/fritzing/Manifest deleted file mode 100644 index 071b6fb775d2..000000000000 --- a/sci-electronics/fritzing/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST fritzing-0.9.6.tar.gz 11521767 BLAKE2B 01c6ea87108b70161350b79c4878c288935c3f0a37464cf3c4e276a746edb2bbcb2c3b7bcf0b3a879232f5f79fd15b573f930b8cea96924b04b1e5b3ddade542 SHA512 d91fcf79760b9570513e8315bcb29fcd1d53684920e8563539669a0dedd164e35031e53da7ea2c12e95e564b3f95a05ce953082ffdfa54f4e4f99c50a4991a52 -DIST fritzing-parts-0.9.6.tar.gz 14982269 BLAKE2B 0f017a2a3eb654ed26d647faa463024c52aab58df7a487c75e1636efb288dc9fad9aa8499404f381012287e6e3312a569ed2f171d20b2d5df85440d97673fe9c SHA512 d39096bcb89e2aa04c285aaddd575a54a08d016d859399133eab89d69ed37d5e5e5a5a9e838cad5879835bcdcdd9c3b484179104e04d8f96d4eef1004047162b diff --git a/sci-electronics/fritzing/files/fritzing-0.9.4-move-parts-db-path.patch b/sci-electronics/fritzing/files/fritzing-0.9.4-move-parts-db-path.patch deleted file mode 100644 index 97835d489cc6..000000000000 --- a/sci-electronics/fritzing/files/fritzing-0.9.4-move-parts-db-path.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/src/fapplication.cpp b/src/fapplication.cpp -index 72159c99..d6ba26ef 100644 ---- a/src/fapplication.cpp -+++ b/src/fapplication.cpp -@@ -785,7 +785,7 @@ bool FApplication::loadReferenceModel(const QString & databaseName, bool fullLoa - bool FApplication::loadReferenceModel(const QString & databaseName, bool fullLoad, ReferenceModel * referenceModel) - { - QDir dir = FolderUtils::getAppPartsSubFolder(""); -- QString dbPath = dir.absoluteFilePath("parts.db"); -+ QString dbPath = FolderUtils::getTopLevelDocumentsPath() + "/parts.db"; - - QFileInfo info(dbPath); - bool dbExists = (info.size() > 0) && !fullLoad; -@@ -798,7 +798,11 @@ bool FApplication::loadReferenceModel(const QString & databaseName, bool fullLo - sha = PartsChecker::getSha(dir.absolutePath()); - if (sha.isEmpty()) { - DebugDialog::debug(QString("1.6 SHA empty")); -+#ifdef PARTS_COMMIT -+ sha = PARTS_COMMIT; -+#else - return false; -+#endif - } - referenceModel->setSha(sha); - } -@@ -2042,7 +2046,7 @@ void FApplication::regeneratePartsDatabase() { - void FApplication::regeneratePartsDatabaseAux(QDialog * progressDialog) { - ReferenceModel * referenceModel = new CurrentReferenceModel(); - QDir dir = FolderUtils::getAppPartsSubFolder(""); -- QString dbPath = dir.absoluteFilePath("parts.db"); -+ QString dbPath = FolderUtils::getTopLevelDocumentsPath() + "/parts.db"; - RegenerateDatabaseThread *thread = new RegenerateDatabaseThread(dbPath, progressDialog, referenceModel); - connect(thread, SIGNAL(finished()), this, SLOT(regenerateDatabaseFinished())); - FMessageBox::BlockMessages = true; -diff --git a/src/version/updatedialog.cpp b/src/version/updatedialog.cpp -index 58c71da8..c481cdec 100644 ---- a/src/version/updatedialog.cpp -+++ b/src/version/updatedialog.cpp -@@ -28,6 +28,7 @@ along with Fritzing. If not, see <http://www.gnu.org/licenses/>. - #include "versionchecker.h" - #include "modfiledialog.h" - #include "../debugdialog.h" -+#include "../utils/folderutils.h" - - #include <QVBoxLayout> - #include <QPushButton> -@@ -183,7 +184,7 @@ void UpdateDialog::releasesAvailableSlot() { - permissionTest.close(); - permissionTest.remove(); - if (count > 0) { -- QFile db(repoDir.absoluteFilePath("parts.db")); -+ QFile db(FolderUtils::getTopLevelDocumentsPath() + "/parts.db"); - if (db.open(QFile::Append)) { - canWrite = true; - db.close(); 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 deleted file mode 100644 index e7e9d6d27ac5..000000000000 --- a/sci-electronics/fritzing/files/fritzing-0.9.6-dropping-register-keyword.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/fritzing/fritzing-app/pull/4033 -From: Brahmajit Das <[email protected]> -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 <[email protected]> ---- 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 deleted file mode 100644 index 9d3853c516ab..000000000000 --- a/sci-electronics/fritzing/files/fritzing-0.9.6-quazip-qt5.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 4fb515cfa82f..000000000000 --- a/sci-electronics/fritzing/fritzing-0.9.6.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# 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 -} diff --git a/sci-electronics/fritzing/metadata.xml b/sci-electronics/fritzing/metadata.xml deleted file mode 100644 index b88fe6f9630b..000000000000 --- a/sci-electronics/fritzing/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">fritzing/fritzing-app</remote-id> - </upstream> -</pkgmetadata>
