Update to 3.2.0

4 files changed, 29 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99d974de8168..0a89a9db1ed8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Mar 15 21:33:24 UTC 2017
+# Fri Aug 11 22:11:39 UTC 2017
 pkgbase = sam-ba
 	pkgdesc = Atmel SAM Boot Assistant
-	pkgver = 3.1.4
-	pkgrel = 3
+	pkgver = 3.2.0
+	pkgrel = 1
 	url = https://github.com/atmelcorp/sam-ba
 	arch = i686
 	arch = x86_64
@@ -12,12 +12,12 @@ pkgbase = sam-ba
 	depends = qt5-base
 	depends = qt5-serialport
 	depends = qt5-declarative
-	source = https://github.com/atmelcorp/sam-ba/archive/v3.1.4.tar.gz
+	source = https://github.com/atmelcorp/sam-ba/archive/v3.2.0.tar.gz
 	source = 0001-Dont-install-thirdparty-libs.patch
 	source = 0002-Dont-rely-on-applicationDirPath.patch
-	md5sums = 54d7332f4463e0ca9cf7fa83864f9fe7
+	md5sums = 45050cb8efabf12581524de76a2d9e40
 	md5sums = 6b29a65bbc96b608d7628e8a25ae1f50
-	md5sums = 41b845c88f5c389b01690baeb78ad9e1
+	md5sums = 2218a4d3c49cdfe9965da98840939926
 
 pkgname = sam-ba
 
diff --git a/.gitignore b/.gitignore
index fe732bfcf1d9..5d2e3b13bf66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 
 /src
 /pkg
-*.pkg.tar.xz
+*.pkg.tar*
diff --git a/0002-Dont-rely-on-applicationDirPath.patch b/0002-Dont-rely-on-applicationDirPath.patch
index c16b761949ac..8031267729a0 100644
--- a/0002-Dont-rely-on-applicationDirPath.patch
+++ b/0002-Dont-rely-on-applicationDirPath.patch
@@ -1,27 +1,27 @@
 diff --git a/src/sambacommon/sambaengine.cpp b/src/sambacommon/sambaengine.cpp
-index fb5b48c..d831490 100644
+index 8f36080..2fda3c2 100644
 --- a/src/sambacommon/sambaengine.cpp
 +++ b/src/sambacommon/sambaengine.cpp
-@@ -25,9 +25,6 @@ SambaEngine::SambaEngine(QObject *parent)
- 					 this, &SambaEngine::engineQuit, Qt::QueuedConnection);
+@@ -26,9 +26,6 @@ SambaEngine::SambaEngine(QObject *parent)
  	QObject::connect(&m_qmlEngine, &QQmlEngine::warnings,
  					 this, &SambaEngine::engineWarnings);
--
+ 
 -	// add import path
 -	m_qmlEngine.addImportPath(QCoreApplication::applicationDirPath() + "/qml");
+-
+ 	// create metadata object
+ 	m_metadata = new SambaMetadata(this);
  }
+diff --git a/src/sambacommon/sambametadata.cpp b/src/sambacommon/sambametadata.cpp
+index 1c65370..577303d 100644
+--- a/src/sambacommon/sambametadata.cpp
++++ b/src/sambacommon/sambametadata.cpp
+@@ -122,7 +122,7 @@ void SambaMetadata::loadAllMetadata()
+ #endif
+ 		paths = QString::fromLatin1(envImportPath).split(pathSep, QString::SkipEmptyParts);
+ 	}
+-	paths << (QCoreApplication::applicationDirPath() + "/metadata");
++	paths << "/usr/share/sam-ba/metadata";
  
- void SambaEngine::engineQuit()
-diff --git a/src/tools/sam-ba/sambatool.cpp b/src/tools/sam-ba/sambatool.cpp
-index fb359ce..51dff52 100644
---- a/src/tools/sam-ba/sambatool.cpp
-+++ b/src/tools/sam-ba/sambatool.cpp
-@@ -71,7 +71,7 @@ static bool portCompare(const SambaConnection* p1, const SambaConnection* p2)
- 
- bool SambaTool::loadAllMetadata()
- {
--	QDir metadataDir(applicationDirPath() + "/metadata");
-+	QDir metadataDir("/usr/share/sam-ba/metadata");
- 	foreach (QString fileName, metadataDir.entryList(QStringList() << "*.json",
- 	                                                 QDir::Files))
- 	{
+ 	foreach (QString path, paths) {
+ 		QDir metadataDir(path);
diff --git a/PKGBUILD b/PKGBUILD
index 7c7cf779d2aa..1a7850192771 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Streetwalrus <streetwalrus@codewalr.us>
 pkgname=sam-ba
-pkgver=3.1.4
-pkgrel=3
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="Atmel SAM Boot Assistant"
 arch=('i686' 'x86_64')
 url="https://github.com/atmelcorp/sam-ba"
@@ -11,9 +11,9 @@ makedepends=('qt5-tools')
 source=("https://github.com/atmelcorp/sam-ba/archive/v$pkgver.tar.gz"
         "0001-Dont-install-thirdparty-libs.patch"
         "0002-Dont-rely-on-applicationDirPath.patch")
-md5sums=('54d7332f4463e0ca9cf7fa83864f9fe7'
+md5sums=('45050cb8efabf12581524de76a2d9e40'
          '6b29a65bbc96b608d7628e8a25ae1f50'
-         '41b845c88f5c389b01690baeb78ad9e1')
+         '2218a4d3c49cdfe9965da98840939926')
 
 prepare() {
   cd "${srcdir}/sam-ba-$pkgver"