mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sci-electronics/fritzing: drop 0.9.4-r3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -1,4 +1,2 @@
|
||||
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
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
commit 472951243d70eeb40a53b1f7e16e6eab0588d079
|
||||
Author: PsikoBlock <rramsch@googlemail.com>
|
||||
Date: Fri Apr 10 21:41:52 2020 +0200
|
||||
|
||||
Fix libgit2 version check to allow building with versions >= 1.0
|
||||
|
||||
diff --git a/src/version/partschecker.cpp b/src/version/partschecker.cpp
|
||||
index 65daf76e..36300fe0 100644
|
||||
--- a/src/version/partschecker.cpp
|
||||
+++ b/src/version/partschecker.cpp
|
||||
@@ -115,7 +115,7 @@ bool PartsChecker::newPartsAvailable(const QString &repoPath, const QString & sh
|
||||
/**
|
||||
* Connect to the remote.
|
||||
*/
|
||||
-#if LIBGIT2_VER_MINOR > 24
|
||||
+#if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR > 24)
|
||||
error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL, NULL);
|
||||
#elif LIBGIT2_VER_MINOR == 24
|
||||
error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL);
|
||||
@@ -1,28 +0,0 @@
|
||||
Fix build with QuaZip-1.0.
|
||||
|
||||
--- a/phoenix.pro
|
||||
+++ b/phoenix.pro
|
||||
@@ -194,8 +194,8 @@
|
||||
include(pri/qtsysteminfo.pri)
|
||||
|
||||
contains(DEFINES, QUAZIP_INSTALLED) {
|
||||
- INCLUDEPATH += /usr/include/quazip
|
||||
- LIBS += -lquazip
|
||||
+ 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 <quazip/quazip.h>
|
||||
-#include <quazip/quazipfile.h>
|
||||
+#include <quazip.h>
|
||||
+#include <quazipfile.h>
|
||||
#else
|
||||
#include "../lib/quazip/quazip.h"
|
||||
#include "../lib/quazip/quazipfile.h"
|
||||
@@ -1,81 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit qmake-utils xdg
|
||||
|
||||
MY_PV="CD-498"
|
||||
PARTS_P="${PN}-parts-${PV}"
|
||||
PARTS_COMMIT="e79a69765026f3fda8aab1b3e7a4952c28047a62"
|
||||
|
||||
DESCRIPTION="Electronic Design Automation"
|
||||
HOMEPAGE="https://fritzing.org/
|
||||
https://github.com/fritzing/fritzing-app/"
|
||||
SRC_URI="https://github.com/fritzing/fritzing-app/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
|
||||
https://github.com/fritzing/fritzing-parts/archive/${PARTS_COMMIT}.tar.gz -> ${PARTS_P}.tar.gz"
|
||||
|
||||
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
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-app-${MY_PV}"
|
||||
|
||||
DOCS=( README.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-fix-libgit2-version.patch"
|
||||
"${FILESDIR}/${P}-move-parts-db-path.patch"
|
||||
"${FILESDIR}/${P}-quazip1.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
xdg_src_prepare
|
||||
|
||||
if has_version "<dev-libs/quazip-1.0"; then
|
||||
sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i phoenix.pro || die
|
||||
fi
|
||||
|
||||
# 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
|
||||
|
||||
# Fritzing doesn't need zlib
|
||||
sed -i -e 's:LIBS += -lz::' -e 's:-lminizip::' phoenix.pro || 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 = ${MY_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}/*
|
||||
}
|
||||
Reference in New Issue
Block a user