From 9c7085fe2b0497ddf139521e5e1e7a981d7f4b44 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 13 Jan 2018 12:02:38 +0100
Subject: [PATCH] Fritzing: update to 0.9.3b

Closes: #10762 [via git-merge-pr]
---
 srcpkgs/Fritzing/patches/libgit2.patch | 19 ++++++++++++++++++
 srcpkgs/Fritzing/template              | 27 ++++++++++++++++++--------
 2 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/Fritzing/patches/libgit2.patch

diff --git a/srcpkgs/Fritzing/patches/libgit2.patch b/srcpkgs/Fritzing/patches/libgit2.patch
new file mode 100644
index 00000000000..dd11447f187
--- /dev/null
+++ b/srcpkgs/Fritzing/patches/libgit2.patch
@@ -0,0 +1,19 @@
+make compatible with libgit2 >= 0.24.0
+https://github.com/fritzing/fritzing-app/commit/4cb5185d464bf98e9da5ceca72d5af907ff824ef
+
+--- src/version/partschecker.cpp.orig	2016-06-01 21:48:27.000000000 +0200
++++ src/version/partschecker.cpp	2018-01-13 11:30:34.895137270 +0100
+@@ -121,7 +121,13 @@
+     /**
+      * Connect to the remote.
+      */
++#if 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);
++#else
+     error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks);
++#endif
+     if (error) {
+         partsCheckerResult.partsCheckerError = PARTS_CHECKER_ERROR_REMOTE;
+         partsCheckerResult.errorMessage = QObject::tr("Unable to access network site for '%1'. %2").arg(repoPath).arg(sBoilerPlate1);
diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template
index 4d6785f347f..eb97a521742 100644
--- a/srcpkgs/Fritzing/template
+++ b/srcpkgs/Fritzing/template
@@ -1,26 +1,37 @@
 # Template file for 'Fritzing'
 pkgname=Fritzing
-version=0.9.2b
-revision=2
+version=0.9.3b
+revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake"
-makedepends="qt5-devel qt5-serialport-devel qt5-svg-devel boost-devel"
+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 <sa.prybylx@gmail.com>"
 license="GPL-2,GPL-3, CC-BY-SA-3.0"
 homepage="http://fritzing.org"
-distfiles="https://github.com/${pkgname}/${pkgname}-app/archive/${version}.tar.gz
- https://github.com/${pkgname}/${pkgname}-parts/archive/${version}.tar.gz>parts.tar.gz"
-checksum="6e9dbb94a4ca5e23effc2056f471c78913b9efa4c154ced94de8f72bfe29735f
- 5f5f5e26bfc33911f57b1620912fdf0a834c50d196b930ef70e784f3a447194b"
+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"
+checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8
+ c40a9a50df0af78905968792b2ce595896af1935633600d6136eca0cf9797fdb"
 wrksrc="fritzing-app-${version}"
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-serialport-devel qt5-svg-devel"
 fi
 
+post_extract() {
+	# 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|" \
+	 -e "s|\(LIBGIT2LIB = \)../libgit2/build|\1 ${XBPS_CROSS_BASE}/usr/lib|" \
+	 phoenix.pro
+
+	sed -i -e "/error/d" \
+	 -e "s/\(BOOSTINFO =\).*/\1/" \
+	 pri/utils.pri
+}
+
 pre_build() {
-	rmdir "${wrksrc}/parts"
 	mv ${XBPS_BUILDDIR}/fritzing-parts-$version/ $wrksrc/parts
 }