From cdeced06f92e0c4f247cdcc933b1a012db4a335e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 19 Sep 2021 18:41:35 +0700 Subject: [PATCH] Fritzing: fix clean up after build --- srcpkgs/Fritzing/patches/libgit2.patch | 4 ++-- srcpkgs/Fritzing/template | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/srcpkgs/Fritzing/patches/libgit2.patch b/srcpkgs/Fritzing/patches/libgit2.patch index beb24655b92..2eab4a00dd6 100644 --- a/srcpkgs/Fritzing/patches/libgit2.patch +++ b/srcpkgs/Fritzing/patches/libgit2.patch @@ -2,8 +2,8 @@ make compatible with libgit2 >= 0.24.0 https://github.com/fritzing/fritzing-app/commit/4cb5185d464bf98e9da5ceca72d5af907ff824ef https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079 ---- a/src/version/partschecker.cpp 2016-06-01 21:48:27.000000000 +0200 -+++ b/src/version/partschecker.cpp 2018-01-13 11:30:34.895137270 +0100 +--- a/app/src/version/partschecker.cpp 2016-06-01 21:48:27.000000000 +0200 ++++ b/app/src/version/partschecker.cpp 2018-01-13 11:30:34.895137270 +0100 @@ -121,7 +121,13 @@ /** * Connect to the remote. diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template index c0436d6506d..6ac5673ef72 100644 --- a/srcpkgs/Fritzing/template +++ b/srcpkgs/Fritzing/template @@ -3,7 +3,8 @@ pkgname=Fritzing version=0.9.3b revision=6 _partshash=359eb1933622e4c4fa456ad043543681984a4d64 # 2018-03-14 -wrksrc="fritzing-app-${version}" +create_wrksrc=yes +build_wrksrc="app" build_style=qmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-devel qt5-serialport-devel qt5-svg-devel boost-devel libgit2-devel" @@ -18,6 +19,11 @@ checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8 2d5882f0180d04c582ef418fd286bf1d04142409d316a4cd5c9ce3e2d91434dd" post_extract() { + mv fritzing-app-* app + mv fritzing-parts-* parts +} + +post_patch() { # looks for libgit2 and boost in the source tree # make it use the system libraries sed -i -e "s|\(LIBGIT2INCLUDE =\) ../libgit2/include|\1 ${XBPS_CROSS_BASE}/usr/include|" \ @@ -30,7 +36,8 @@ post_extract() { } post_install() { - mv ${XBPS_BUILDDIR}/fritzing-parts-$_partshash/ ${DESTDIR}/usr/share/fritzing/parts + vmkdir usr/share/fritzing + vcopy ../parts/ usr/share/fritzing/ mv ${DESTDIR}/usr/bin/Fritzing{,-bin} vbin ${FILESDIR}/Fritzing sed -i -e "s;^Icon=.*;Icon=fritzing;" ${DESTDIR}/usr/share/applications/fritzing.desktop