From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 61E2D1382C5 for ; Tue, 23 Feb 2021 19:53:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F6A7E0886; Tue, 23 Feb 2021 19:53:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17A5DE0882 for ; Tue, 23 Feb 2021 19:53:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A711B340DFB for ; Tue, 23 Feb 2021 19:53:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25E23581 for ; Tue, 23 Feb 2021 19:53:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1614109953.e50a08580ef0a3c86adb9ff6565c1bb57582c319.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/fritzing/, sci-electronics/fritzing/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild X-VCS-Directories: sci-electronics/fritzing/files/ sci-electronics/fritzing/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e50a08580ef0a3c86adb9ff6565c1bb57582c319 X-VCS-Branch: master Date: Tue, 23 Feb 2021 19:53:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b04d0c4f-2588-4c34-89ff-a8e60f6336ca X-Archives-Hash: 8bdf0e875bcb497684845ef071633b43 commit: e50a08580ef0a3c86adb9ff6565c1bb57582c319 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 20 20:16:53 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 23 19:52:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50a0858 sci-electronics/fritzing: Support build with >=dev-libs/quazip-1.0 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../fritzing/files/fritzing-0.9.4-quazip1.patch | 28 ++++++++ sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild | 81 ++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch b/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch new file mode 100644 index 00000000000..d218c10d90a --- /dev/null +++ b/sci-electronics/fritzing/files/fritzing-0.9.4-quazip1.patch @@ -0,0 +1,28 @@ +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 +-#include ++#include ++#include + #else + #include "../lib/quazip/quazip.h" + #include "../lib/quazip/quazipfile.h" diff --git a/sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild b/sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild new file mode 100644 index 00000000000..c3dc3e35c2b --- /dev/null +++ b/sci-electronics/fritzing/fritzing-0.9.4-r2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2021 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= + 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 "