Update to 0.9.3b

Changes:
- remove .install file as the contained steps are now automatically performed
  by ALPM hooks
- add libgit2 as dependency
- apply upstream patches to fix .desktop file
- remove boost detection as it fails on non-dpkg distributions
- remove libgit2 detection as we need to build against ver. 0.24.x instead
- adapt to libgit2 0.24.x API changes
- set system-wide parts location as default

Issues:
- When using a user-writable location for parts (using -pp path) a parts.db
  file is created and Fritzing will through errors on next launch until this
  database is removed again.
- Automatic update of parts db does not seem to work, even when using a user-
  writable location.

10 files changed, 324 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index acb37e201a93..e0951396c879 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,40 @@
 # Generated by mksrcinfo v8
-# Sat Jan 30 10:48:22 UTC 2016
+# Sat Jun 11 22:24:26 UTC 2016
 pkgbase = fritzing
 	pkgdesc = PCB layout prototyping application
-	pkgver = 0.9.2b
-	pkgrel = 2
+	pkgver = 0.9.3b
+	pkgrel = 1
 	url = http://fritzing.org
-	install = fritzing.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = boost
 	depends = desktop-file-utils
 	depends = java-environment
+	depends = libgit2
 	depends = python2
 	depends = qt5-serialport
 	depends = qt5-svg
 	depends = shared-mime-info
-	source = https://github.com/fritzing/fritzing-app/archive/0.9.2b.tar.gz
-	source = https://github.com/fritzing/fritzing-parts/archive/de7f8a4c8f7df4ed57386edf68275cdd66a1910d.tar.gz
+	source = https://github.com/fritzing/fritzing-app/archive/0.9.3b.tar.gz
+	source = https://github.com/fritzing/fritzing-parts/archive/667a5360e53e8951e5ca6c952ae928f7077a9d5e.tar.gz
+	source = 0001-fix-application-icon-does-not-show-on-GNOME-desktop.patch
+	source = 0002-fix-desktop-Categories-entry.patch
+	source = 0003-remove-desktop-Version-entry.patch
+	source = 0004-Remove-boost-detection.patch
+	source = 0005-Remove-libgit2-detection.patch
+	source = 0006-Adapt-to-libgit2-0.24.x.patch
+	source = 0007-Provide-a-sane-default-for-parts-path.patch
 	source = fritzing.xml
-	sha256sums = 6e9dbb94a4ca5e23effc2056f471c78913b9efa4c154ced94de8f72bfe29735f
-	sha256sums = b9eeac2d8b169eb80162f607b5bedd9a2c92191690685955d674c14ba7aefcc1
+	sha256sums = 7d92579cf87bbde2325e641b674b6c340fd27ee28a8ffe4c03e527e9a4307d88
+	sha256sums = c6f9c5275a569e86c0cadb85844120e8f79ca79bea004b00916af78772969d76
+	sha256sums = 904942e9e300cad65736dc4f4a8b275725beada5b22d9055dd9575372a393a65
+	sha256sums = 6fa9c5deb9b230be610fde8ad1739ec26061ce30b92cf01fb2daea8adf782a5f
+	sha256sums = 32199648f399b8bdcd73e99f725ce1f9ae5b32ebe40ea498113c3f931be426b4
+	sha256sums = 11a0392f3447135e9758c3dc3eebfa8efa47bd5cb92a1f2f7d236c3917145bc3
+	sha256sums = bb36274fa1e13d0c8f383096463b3fa9c3e46916df1089185f166d9990e58049
+	sha256sums = 0be82b1afef07d739926943eb8c2eca939f1715b826e96ee368ff24be81f7e19
+	sha256sums = 49f68d73cc04d364a929b0a51128b8ac06a3b6fcd46bb233b6c9ca2688381fbf
 	sha256sums = 9aa55c4a27025b40a1573b3b09a59f48709dfa5ac637ef6a059fd8157d20192b
 
 pkgname = fritzing
diff --git a/0001-fix-application-icon-does-not-show-on-GNOME-desktop.patch b/0001-fix-application-icon-does-not-show-on-GNOME-desktop.patch
new file mode 100644
index 000000000000..15523a6734cf
--- /dev/null
+++ b/0001-fix-application-icon-does-not-show-on-GNOME-desktop.patch
@@ -0,0 +1,29 @@
+From 627adc167c97c6fca4401e7d05ace1e288583e04 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Tue, 7 Jun 2016 20:01:55 +0100
+Subject: [PATCH 1/7] fix application icon does not show on GNOME desktop
+
+- phoenix.pro renames fritzing_icon.png to fritzing.png
+- Icon value should be either an absolute path or icon name
+
+(cherry picked from commit f712d0139e3a0b1146566c989a3d523da9cdcd42)
+---
+ fritzing.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fritzing.desktop b/fritzing.desktop
+index 854319e..1791c92 100644
+--- a/fritzing.desktop
++++ b/fritzing.desktop
+@@ -4,7 +4,7 @@ Name=Fritzing
+ GenericName=Fritzing
+ Comment=Electronic Design Automation software
+ Exec=Fritzing
+-Icon=icons/fritzing_icon.png
++Icon=fritzing
+ Terminal=false
+ Type=Application
+ Categories=Development;IDE;Electronics;EDA;
+-- 
+2.8.3
+
diff --git a/0002-fix-desktop-Categories-entry.patch b/0002-fix-desktop-Categories-entry.patch
new file mode 100644
index 000000000000..06733bec7276
--- /dev/null
+++ b/0002-fix-desktop-Categories-entry.patch
@@ -0,0 +1,29 @@
+From 37de3af53b97bebb4b6ef8c416ffb508fed94a6e Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Tue, 7 Jun 2016 20:01:55 +0100
+Subject: [PATCH 2/7] fix desktop Categories entry
+
+Single entry prefixing non-standard categories
+
+(cherry picked from commit a64635049f62234e03344da5be6f8d3bf09e2072)
+---
+ fritzing.desktop | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/fritzing.desktop b/fritzing.desktop
+index 1791c92..5b14537 100644
+--- a/fritzing.desktop
++++ b/fritzing.desktop
+@@ -7,8 +7,7 @@ Exec=Fritzing
+ Icon=fritzing
+ Terminal=false
+ Type=Application
+-Categories=Development;IDE;Electronics;EDA;
++Categories=Development;IDE;Electronics;X-EDA;X-PCB;
+ X-SuSE-translate=false
+ StartupNotify=true
+-Categories=PCB;
+ MimeType=application/x-fritzing-fz;application/x-fritzing-fzz;application/x-fritzing-fzp;application/x-fritzing-fzpz;application/x-fritzing-fzb;application/x-fritzing-fzbz;application/x-fritzing-fzm;
+-- 
+2.8.3
+
diff --git a/0003-remove-desktop-Version-entry.patch b/0003-remove-desktop-Version-entry.patch
new file mode 100644
index 000000000000..cacff36603d4
--- /dev/null
+++ b/0003-remove-desktop-Version-entry.patch
@@ -0,0 +1,25 @@
+From 1b6bb07fa4eedbedf85f413ccaa070aa8f659fec Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Tue, 7 Jun 2016 20:01:55 +0100
+Subject: [PATCH 3/7] remove desktop Version entry
+
+Version is the version of the Desktop Entry Specification not Fritzing
+
+(cherry picked from commit 789149760451defdf55a27647fcf1c20105cb2f8)
+---
+ fritzing.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/fritzing.desktop b/fritzing.desktop
+index 5b14537..6b88de2 100644
+--- a/fritzing.desktop
++++ b/fritzing.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Version=0.9.3b
+ Name=Fritzing
+ GenericName=Fritzing
+ Comment=Electronic Design Automation software
+-- 
+2.8.3
+
diff --git a/0004-Remove-boost-detection.patch b/0004-Remove-boost-detection.patch
new file mode 100644
index 000000000000..5a19bc3dfa98
--- /dev/null
+++ b/0004-Remove-boost-detection.patch
@@ -0,0 +1,65 @@
+From e1e5629a050414f35d6c5c6ac8596211ab0953c2 Mon Sep 17 00:00:00 2001
+From: Michael Lass <lass@mail.uni-paderborn.de>
+Date: Fri, 10 Jun 2016 21:14:07 +0200
+Subject: [PATCH 4/7] Remove boost detection
+
+For Linux this only works on distributions using dpkg. The Arch Linux package
+already makes sure that boost is installed.
+---
+ pri/utils.pri | 40 ----------------------------------------
+ 1 file changed, 40 deletions(-)
+
+diff --git a/pri/utils.pri b/pri/utils.pri
+index ae14ea8..eab99a0 100644
+--- a/pri/utils.pri
++++ b/pri/utils.pri
+@@ -17,46 +17,6 @@
+ # $Date: 2013-01-12 07:45:08 +0100 (Sa, 12. Jan 2013) $
+ # ********************************************************************/
+ 
+-# boost_1_54_0 is buggy
+-BOOSTS = 43 44 45 46 47 48 49 50 51 52 53 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
+-LATESTBOOST = 0
+-for(boost, BOOSTS) {
+-        exists(../src/lib/boost_1_$${boost}_0) {
+-                LATESTBOOST = $$boost
+-        }
+-}
+-
+-contains(LATESTBOOST, 0) {
+-    unix {
+-        !macx {
+-             BOOSTINFO = $$system(dpkg -s libboost-dev | grep 'Version')
+-             BADVERSION = $$find(BOOSTINFO, 1\.54)
+-             !isEmpty(BADVERSION) {
+-                 message("Boost 1.54 has a bug in a function that Fritzing uses, so download or install some other version")
+-                 error("Easiest to copy the boost library to .../src/lib/, so that you have .../src/lib/boost_1_xx_0")
+-             }
+-             isEmpty(BADVERSION) {
+-                 BOOSTVERSION = $$find(BOOSTINFO, 1\...\.0)
+-                 !isEmpty(BOOSTVERSION) {
+-                     LATESTBOOST = installed
+-                     message("using installed BOOST library")
+-                 }
+-             }
+-        }
+-    }
+-}
+-
+-contains(LATESTBOOST, 0) {
+-        message("Please download the boost library--you can find it at http://www.boost.org/")
+-        message("Note that boost 1.54 has a bug in a function that Fritzing uses, so download some other version")
+-        error("Copy the boost library to .../src/lib/, so that you have .../src/lib/boost_1_xx_0")
+-}
+-
+-!contains(LATESTBOOST, installed) {
+-    message("using boost from src/lib/boost_1_$${LATESTBOOST}_0")
+-    INCLUDEPATH += src/lib/boost_1_$${LATESTBOOST}_0
+-}
+-
+ HEADERS += \
+ src/utils/abstractstatesbutton.h \
+ src/utils/autoclosemessagebox.h \
+-- 
+2.8.3
+
diff --git a/0005-Remove-libgit2-detection.patch b/0005-Remove-libgit2-detection.patch
new file mode 100644
index 000000000000..f80fe85df8ee
--- /dev/null
+++ b/0005-Remove-libgit2-detection.patch
@@ -0,0 +1,75 @@
+From d0cca16811649548770360352f887f59588566a6 Mon Sep 17 00:00:00 2001
+From: Michael Lass <lass@mail.uni-paderborn.de>
+Date: Sat, 11 Jun 2016 21:48:25 +0200
+Subject: [PATCH 5/7] Remove libgit2 detection
+
+---
+ phoenix.pro | 52 +---------------------------------------------------
+ 1 file changed, 1 insertion(+), 51 deletions(-)
+
+diff --git a/phoenix.pro b/phoenix.pro
+index 301ce0c..1656382 100644
+--- a/phoenix.pro
++++ b/phoenix.pro
+@@ -163,57 +163,7 @@ RESOURCES += phoenixresources.qrc
+ 
+ # Fritzing is using libgit2 since version 0.9.3
+ 
+-LIBGIT2INCLUDE = ../libgit2/include
+-exists($$LIBGIT2INCLUDE/git2.h) {
+-    message("found libgit2 include path at $$LIBGIT2INCLUDE")
+-}
+-else {
+-    message("Fritzing requires libgit2")
+-    message("Build it from the repo at https://github.com/libgit2")
+-    message("See https://github.com/fritzing/fritzing-app/wiki for details.")
+-
+-    error("libgit2 include path not found in $$LIBGIT2INCLUDE")
+-}
+-
+-INCLUDEPATH += $$LIBGIT2INCLUDE
+-
+-win32 {
+-    contains(QMAKE_TARGET.arch, x86_64) {
+-            LIBGIT2LIB = ../libgit2/build64
+-    }
+-    else {
+-            LIBGIT2LIB = ../libgit2/build32
+-    }
+-
+-    exists($$LIBGIT2LIB/git2.lib) {
+-        message("found libgit2 library in $$LIBGIT2LIB")
+-    }
+-    else {
+-        error("libgit2 library not found in $$LIBGIT2LIB")
+-    }
+-}
+-
+-unix {
+-    LIBGIT2LIB = ../libgit2/build
+-    macx {
+-        exists($$LIBGIT2LIB/libgit2.dylib) {
+-            message("found libgit2 library in $$LIBGIT2LIB")
+-        }
+-        else {
+-            error("libgit2 library not found in $$LIBGIT2LIB")
+-        }
+-    }
+-    !macx {
+-        exists($$LIBGIT2LIB/libgit2.so) {
+-            message("found libgit2 library in $$LIBGIT2LIB")
+-        }
+-        else {
+-            error("libgit2 library not found in $$LIBGIT2LIB")
+-        }
+-    }
+-}
+-
+-LIBS += -L$$LIBGIT2LIB -lgit2
++LIBS += -lgit2
+ 
+ include(pri/kitchensink.pri)
+ include(pri/mainwindow.pri)
+-- 
+2.8.3
+
diff --git a/0006-Adapt-to-libgit2-0.24.x.patch b/0006-Adapt-to-libgit2-0.24.x.patch
new file mode 100644
index 000000000000..2773e00274dc
--- /dev/null
+++ b/0006-Adapt-to-libgit2-0.24.x.patch
@@ -0,0 +1,25 @@
+From 9eaf6f31b7f6266bbb87f11ca6a59e47f733ea00 Mon Sep 17 00:00:00 2001
+From: Michael Lass <lass@mail.uni-paderborn.de>
+Date: Sat, 11 Jun 2016 22:02:30 +0200
+Subject: [PATCH 6/7] Adapt to libgit2 0.24.x
+
+---
+ src/version/partschecker.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/version/partschecker.cpp b/src/version/partschecker.cpp
+index a3e3967..da61560 100644
+--- a/src/version/partschecker.cpp
++++ b/src/version/partschecker.cpp
+@@ -121,7 +121,7 @@ bool PartsChecker::newPartsAvailable(const QString &repoPath, const QString & sh
+     /**
+      * Connect to the remote.
+      */
+-    error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks);
++    error = git_remote_connect(remote, GIT_DIRECTION_FETCH, &callbacks, NULL);
+     if (error) {
+         partsCheckerResult.partsCheckerError = PARTS_CHECKER_ERROR_REMOTE;
+         partsCheckerResult.errorMessage = QObject::tr("Unable to access network site for '%1'. %2").arg(repoPath).arg(sBoilerPlate1);
+-- 
+2.8.3
+
diff --git a/0007-Provide-a-sane-default-for-parts-path.patch b/0007-Provide-a-sane-default-for-parts-path.patch
new file mode 100644
index 000000000000..9d72810461c5
--- /dev/null
+++ b/0007-Provide-a-sane-default-for-parts-path.patch
@@ -0,0 +1,24 @@
+From be14b73eb744b928c69b98a1679808f18b2d6c5c Mon Sep 17 00:00:00 2001
+From: Michael Lass <lass@mail.uni-paderborn.de>
+Date: Sat, 11 Jun 2016 23:07:30 +0200
+Subject: [PATCH 7/7] Provide a sane default for parts path
+
+---
+ src/fapplication.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/fapplication.cpp b/src/fapplication.cpp
+index 5a2693c..0624012 100644
+--- a/src/fapplication.cpp
++++ b/src/fapplication.cpp
+@@ -368,6 +368,7 @@ bool FApplication::init() {
+ 	m_serviceType = NoService;
+ 
+ 	QList<int> toRemove;
++	FolderUtils::setAppPartsPath("/usr/share/fritzing/parts/");
+ 	for (int i = 0; i < m_arguments.length(); i++) {
+ 		if ((m_arguments[i].compare("-h", Qt::CaseInsensitive) == 0) || 
+ 			(m_arguments[i].compare("-help", Qt::CaseInsensitive) == 0) || 
+-- 
+2.8.3
+
diff --git a/PKGBUILD b/PKGBUILD
index a9bb55455554..575258294c18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,25 +6,48 @@
 # https://github.com/michaellass/AUR
 
 pkgname=fritzing
-pkgver=0.9.2b
-pkgrel=2
-partsrev=de7f8a4c8f7df4ed57386edf68275cdd66a1910d
+pkgver=0.9.3b
+pkgrel=1
+partsrev=667a5360e53e8951e5ca6c952ae928f7077a9d5e
 pkgdesc='PCB layout prototyping application'
 arch=('i686' 'x86_64')
 url=http://fritzing.org
 license=(GPL3)
 makedepends=('boost')
-install=fritzing.install
-depends=('desktop-file-utils' 'java-environment' 'python2' 'qt5-serialport' 'qt5-svg' 'shared-mime-info')
+depends=('desktop-file-utils' 'java-environment' 'libgit2' 'python2' 'qt5-serialport' 'qt5-svg' 'shared-mime-info')
 source=(https://github.com/fritzing/fritzing-app/archive/${pkgver}.tar.gz
         https://github.com/fritzing/fritzing-parts/archive/${partsrev}.tar.gz
+        0001-fix-application-icon-does-not-show-on-GNOME-desktop.patch
+        0002-fix-desktop-Categories-entry.patch
+        0003-remove-desktop-Version-entry.patch
+        0004-Remove-boost-detection.patch
+        0005-Remove-libgit2-detection.patch
+        0006-Adapt-to-libgit2-0.24.x.patch
+        0007-Provide-a-sane-default-for-parts-path.patch
         fritzing.xml)
-sha256sums=('6e9dbb94a4ca5e23effc2056f471c78913b9efa4c154ced94de8f72bfe29735f'
-            'b9eeac2d8b169eb80162f607b5bedd9a2c92191690685955d674c14ba7aefcc1'
+sha256sums=('7d92579cf87bbde2325e641b674b6c340fd27ee28a8ffe4c03e527e9a4307d88'
+            'c6f9c5275a569e86c0cadb85844120e8f79ca79bea004b00916af78772969d76'
+            '904942e9e300cad65736dc4f4a8b275725beada5b22d9055dd9575372a393a65'
+            '6fa9c5deb9b230be610fde8ad1739ec26061ce30b92cf01fb2daea8adf782a5f'
+            '32199648f399b8bdcd73e99f725ce1f9ae5b32ebe40ea498113c3f931be426b4'
+            '11a0392f3447135e9758c3dc3eebfa8efa47bd5cb92a1f2f7d236c3917145bc3'
+            'bb36274fa1e13d0c8f383096463b3fa9c3e46916df1089185f166d9990e58049'
+            '0be82b1afef07d739926943eb8c2eca939f1715b826e96ee368ff24be81f7e19'
+            '49f68d73cc04d364a929b0a51128b8ac06a3b6fcd46bb233b6c9ca2688381fbf'
             '9aa55c4a27025b40a1573b3b09a59f48709dfa5ac637ef6a059fd8157d20192b')
 
 prepare() {
+  mkdir "$srcdir"/fritzing-app-${pkgver}/parts
   mv "$srcdir"/fritzing-parts-${partsrev}/* "$srcdir"/fritzing-app-${pkgver}/parts
+
+  cd "$srcdir"/fritzing-app-${pkgver}
+  patch -p1 < "$srcdir"/0001-fix-application-icon-does-not-show-on-GNOME-desktop.patch
+  patch -p1 < "$srcdir"/0002-fix-desktop-Categories-entry.patch
+  patch -p1 < "$srcdir"/0003-remove-desktop-Version-entry.patch
+  patch -p1 < "$srcdir"/0004-Remove-boost-detection.patch
+  patch -p1 < "$srcdir"/0005-Remove-libgit2-detection.patch
+  patch -p1 < "$srcdir"/0006-Adapt-to-libgit2-0.24.x.patch
+  patch -p1 < "$srcdir"/0007-Provide-a-sane-default-for-parts-path.patch
 }
 
 build() {
@@ -35,15 +58,8 @@ build() {
 
 package() {
   cd "$srcdir"/fritzing-app-${pkgver}
-
   make INSTALL_ROOT="$pkgdir" install
 
-  # patch python scripts to use python2
-  find "$pkgdir"/usr/share/$pkgname/parts/part-gen-scripts/ \
-    -name \*.py -exec sed -i \
-      -e 's#/usr/bin/env python$#/usr/bin/env python2#' \
-      -e 's#/usr/bin/python$#/usr/bin/python2#' {} \;
-
   # connect .fzz files to fritzing by default
   install -Dm644 "${srcdir}/fritzing.xml" "${pkgdir}/usr/share/mime/packages/fritzing.xml"
   echo "MimeType=application/x-fritzing;" >> "${pkgdir}/usr/share/applications/fritzing.desktop"
diff --git a/fritzing.install b/fritzing.install
deleted file mode 100644
index a3b7f96fa5fa..000000000000
--- a/fritzing.install
+++ /dev/null
@@ -1,17 +0,0 @@
-update() {
-	update-desktop-database /usr/share/applications
-	update-mime-database    /usr/share/mime
-}
-
-post_install() {
-	update
-}
-
-post_upgrade() {
-	update
-}
-
-post_remove() {
-	update
-}
-