From 8db90186a3e6635fa1844813e2cfbcc8963d1e81 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Fri, 6 Jul 2018 15:58:46 +0200 Subject: [PATCH] Fritzing: fix package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - include part definitions, updated to latest git commit - add wrapper script - fix .desktop file to find the icon - removed GPL-2 from license because there doesn’t seem to be any code using it closes #671 Closes: #697 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/Fritzing/files/Fritzing | 3 +++ srcpkgs/Fritzing/template | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/Fritzing/files/Fritzing diff --git a/srcpkgs/Fritzing/files/Fritzing b/srcpkgs/Fritzing/files/Fritzing new file mode 100644 index 00000000000..384c040bb57 --- /dev/null +++ b/srcpkgs/Fritzing/files/Fritzing @@ -0,0 +1,3 @@ +#! /bin/sh +cd /usr/share/fritzing/parts +exec /usr/bin/Fritzing-bin "$@" diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template index eb97a521742..0919052071d 100644 --- a/srcpkgs/Fritzing/template +++ b/srcpkgs/Fritzing/template @@ -1,20 +1,21 @@ # Template file for 'Fritzing' pkgname=Fritzing version=0.9.3b -revision=1 +revision=2 +_partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14 +wrksrc="fritzing-app-${version}" build_style=qmake hostmakedepends="qt5-qmake" makedepends="qt5-devel qt5-serialport-devel qt5-svg-devel boost-devel libgit2-devel" depends="qt5-plugin-sqlite" short_desc="Software for electronics prototyping" maintainer="Steve Prybylski " -license="GPL-2,GPL-3, CC-BY-SA-3.0" +license="GPL-3.0-or-later, CC-BY-SA-3.0" homepage="http://fritzing.org" distfiles="https://github.com/${pkgname}/${pkgname}-app/archive/${version}.tar.gz>fritzing-app-${version}.tar.gz - https://github.com/${pkgname}/${pkgname}-parts/archive/${version}.tar.gz>fritzing-parts-${version}.tar.gz" + https://github.com/${pkgname}/${pkgname}-parts/archive/${_partshash}.tar.gz>fritzing-parts-${_partshash}.tar.gz" checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8 - c40a9a50df0af78905968792b2ce595896af1935633600d6136eca0cf9797fdb" -wrksrc="fritzing-app-${version}" + 2d5882f0180d04c582ef418fd286bf1d04142409d316a4cd5c9ce3e2d91434dd" if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-serialport-devel qt5-svg-devel" @@ -32,6 +33,9 @@ post_extract() { pri/utils.pri } -pre_build() { - mv ${XBPS_BUILDDIR}/fritzing-parts-$version/ $wrksrc/parts +post_install() { + mv ${XBPS_BUILDDIR}/fritzing-parts-$_partshash/ ${DESTDIR}/usr/share/fritzing/parts + mv ${DESTDIR}/usr/bin/Fritzing{,-bin} + vbin ${FILESDIR}/Fritzing + sed -i -e "s;^Icon=.*;Icon=fritzing;" ${DESTDIR}/usr/share/applications/fritzing.desktop }