version bump to 2.1.3

5 files changed, 18 insertions, 206 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08f38dfce733..9126d7e640b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 # Generated by mksrcinfo v8
-# Tue May 24 14:10:34 UTC 2016
+# Mon Aug  8 17:07:02 UTC 2016
 pkgbase = uranium
 	pkgdesc = A Python framework for building Desktop applications.
-	pkgver = 2.1.0
+	pkgver = 2.1.3
 	pkgrel = 1
 	url = https://github.com/Ultimaker/Uranium
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = GPLv3
 	makedepends = cmake
 	depends = python
@@ -15,14 +14,8 @@ pkgbase = uranium
 	depends = python-pyqt5
 	depends = python-numpy
 	depends = arcus
-	source = https://github.com/Ultimaker/uranium/archive/2.1.0.tar.gz
-	source = qt5.patch
-	source = scripts.patch
-	source = Backend.py.patch
-	md5sums = 6e0a674a38b4a25c7a6dec859852aa33
-	md5sums = e4975dddd0524845b9574b4142274f5a
-	md5sums = d1832c5533c1ab6ceffd0a70768ccbd6
-	md5sums = 3d48bccc0d20475927c1badd81a95e35
+	source = https://github.com/Ultimaker/uranium/archive/2.1.3.tar.gz
+	md5sums = 94f92cbac5c7953d3c2c55b40bad86c6
 
 pkgname = uranium
 
diff --git a/Backend.py.patch b/Backend.py.patch
deleted file mode 100644
index b9eb2318a3aa..000000000000
--- a/Backend.py.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-*** a/UM/Backend/Backend.py	2015-07-27 08:51:09.000000000 +0100
---- b/UM/Backend/Backend.py	2016-02-15 10:53:34.986201167 +0000
-***************
-*** 89,100 ****
-      ##  Start the (external) backend process.
-      def _runEngineProcess(self, command_list):
-          kwargs = {}
--         if subprocess.mswindows:
--             su = subprocess.STARTUPINFO()
--             su.dwFlags |= subprocess.STARTF_USESHOWWINDOW
--             su.wShowWindow = subprocess.SW_HIDE
--             kwargs["startupinfo"] = su
--             kwargs["creationflags"] = 0x00004000 #BELOW_NORMAL_PRIORITY_CLASS
-          return subprocess.Popen(command_list, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs)
-  
-      def _storeOutputToLogThread(self, handle):
---- 89,94 ----
diff --git a/PKGBUILD b/PKGBUILD
index bda43f628d18..9638e906f2e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,34 @@
 # Maintainer: Grey Christoforo <first name [at] last name [dot] net>
 
 pkgname=uranium
-pkgver=2.1.0
+pkgver=2.1.3
 pkgrel=1
 pkgdesc="A Python framework for building Desktop applications."
 url="https://github.com/Ultimaker/Uranium"
-arch=('i686' 'x86_64')
+arch=('any')
 license=('GPLv3')
 depends=('python' 'qt5-quickcontrols' 'pyqt5-common' 'python-pyqt5' 'python-numpy' 'arcus')
 makedepends=('cmake')
-source=("https://github.com/Ultimaker/${pkgname}/archive/${pkgver}.tar.gz" qt5.patch scripts.patch Backend.py.patch)
-md5sums=('6e0a674a38b4a25c7a6dec859852aa33'
-         'e4975dddd0524845b9574b4142274f5a'
-         'd1832c5533c1ab6ceffd0a70768ccbd6'
-         '3d48bccc0d20475927c1badd81a95e35')
-
-prepare(){
-  cd Uranium-${pkgver}
-  #patch -Np1 -i ../qt5.patch
-  #patch -Np1 -i ../scripts.patch
-  #patch -Np1 -i ../Backend.py.patch
-}
+source=("https://github.com/Ultimaker/${pkgname}/archive/${pkgver}.tar.gz")
+md5sums=('94f92cbac5c7953d3c2c55b40bad86c6')
 
 build() {
   cd Uranium-${pkgver}
-  cmake ./ -DCMAKE_INSTALL_PREFIX=/usr
+  mkdir -p build
+  cd build
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 
 package() {
-  cd Uranium-${pkgver}
+  cd Uranium-${pkgver}/build
   make DESTDIR="${pkgdir}" install
+
   SITE_PACKAGES=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-  mkdir -p "${pkgdir}${SITE_PACKAGES}"
-  mv "${pkgdir}"/usr/lib/python3/dist-packages/* "${pkgdir}${SITE_PACKAGES}"/.
+  mkdir -p "${pkgdir}$(dirname $SITE_PACKAGES)"
+  mv "${pkgdir}/usr/lib/python3/dist-packages" "${pkgdir}${SITE_PACKAGES}"
   rm -rf "${pkgdir}"/usr/lib/python3
   #install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/qt5.patch b/qt5.patch
deleted file mode 100644
index cee63bf90f98..000000000000
--- a/qt5.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 041ae0ee89b9af5a53c20589a51c70a7a9e761d7 Mon Sep 17 00:00:00 2001
-From: Arjen Hiemstra <ahiemstra@heimr.nl>
-Date: Thu, 23 Jul 2015 16:37:07 +0200
-Subject: [PATCH] Fix issues related to PyQt 5.5
-
----
- UM/Qt/Bindings/AngledCornerRectangle.py | 63 +++++++++++++++++++--------------
- UM/Qt/ListModel.py                      | 14 ++++----
- 2 files changed, 44 insertions(+), 33 deletions(-)
-
-diff --git a/UM/Qt/Bindings/AngledCornerRectangle.py b/UM/Qt/Bindings/AngledCornerRectangle.py
-index 00481b5..e6b01dd 100644
---- a/UM/Qt/Bindings/AngledCornerRectangle.py
-+++ b/UM/Qt/Bindings/AngledCornerRectangle.py
-@@ -1,7 +1,7 @@
- # Copyright (c) 2015 Ultimaker B.V.
- # Uranium is released under the terms of the AGPLv3 or higher.
- 
--from PyQt5.QtCore import pyqtSlot, pyqtProperty, pyqtSignal
-+from PyQt5.QtCore import pyqtSlot, pyqtProperty, pyqtSignal, PYQT_VERSION
- from PyQt5.QtGui import QColor
- from PyQt5.QtQuick import QQuickItem, QSGGeometryNode, QSGGeometry, QSGFlatColorMaterial, QSGSimpleRectNode
- 
-@@ -17,6 +17,7 @@ def __init__(self, parent = None):
-         self._geometry = None
-         self._material = None
-         self._node = None
-+        self._attributes = None
- 
-     def getCornerSize(self):
-         return self._corner_size
-@@ -43,38 +44,46 @@ def color(self):
-         return self._color
- 
-     def updatePaintNode(self, paint_node, update_data):
--        self._node = QSGGeometryNode()
-+        if PYQT_VERSION < 0x050500:
-+            self._node = QSGGeometryNode()
- 
--        self._geometry = QSGGeometry(QSGGeometry.defaultAttributes_Point2D(), 6, 12)
--        self._geometry.setDrawingMode(0x0004)
--        self._geometry.vertexDataAsPoint2D()[0].set(self._corner_size, 0)
--        self._geometry.vertexDataAsPoint2D()[1].set(0, self._corner_size)
--        self._geometry.vertexDataAsPoint2D()[2].set(0, self.height())
--        self._geometry.vertexDataAsPoint2D()[3].set(self.width() - self._corner_size, self.height())
--        self._geometry.vertexDataAsPoint2D()[4].set(self.width(), self.height() - self._corner_size)
--        self._geometry.vertexDataAsPoint2D()[5].set(self.width(), 0)
-+            attribs = QSGGeometry.defaultAttributes_Point2D()
-+            self._geometry = QSGGeometry(attribs, 6, 12)
-+            self._geometry.setDrawingMode(0x0004)
-+            self._geometry.vertexDataAsPoint2D()[0].set(self._corner_size, 0)
-+            self._geometry.vertexDataAsPoint2D()[1].set(0, self._corner_size)
-+            self._geometry.vertexDataAsPoint2D()[2].set(0, self.height())
-+            self._geometry.vertexDataAsPoint2D()[3].set(self.width() - self._corner_size, self.height())
-+            self._geometry.vertexDataAsPoint2D()[4].set(self.width(), self.height() - self._corner_size)
-+            self._geometry.vertexDataAsPoint2D()[5].set(self.width(), 0)
- 
--        self._geometry.indexDataAsUShort()[0] = 0
--        self._geometry.indexDataAsUShort()[1] = 1
--        self._geometry.indexDataAsUShort()[2] = 2
-+            self._geometry.indexDataAsUShort()[0] = 0
-+            self._geometry.indexDataAsUShort()[1] = 1
-+            self._geometry.indexDataAsUShort()[2] = 2
- 
--        self._geometry.indexDataAsUShort()[3] = 0
--        self._geometry.indexDataAsUShort()[4] = 2
--        self._geometry.indexDataAsUShort()[5] = 3
-+            self._geometry.indexDataAsUShort()[3] = 0
-+            self._geometry.indexDataAsUShort()[4] = 2
-+            self._geometry.indexDataAsUShort()[5] = 3
- 
--        self._geometry.indexDataAsUShort()[6] = 0
--        self._geometry.indexDataAsUShort()[7] = 3
--        self._geometry.indexDataAsUShort()[8] = 4
-+            self._geometry.indexDataAsUShort()[6] = 0
-+            self._geometry.indexDataAsUShort()[7] = 3
-+            self._geometry.indexDataAsUShort()[8] = 4
- 
--        self._geometry.indexDataAsUShort()[9] = 0
--        self._geometry.indexDataAsUShort()[10] = 4
--        self._geometry.indexDataAsUShort()[11] = 5
-+            self._geometry.indexDataAsUShort()[9] = 0
-+            self._geometry.indexDataAsUShort()[10] = 4
-+            self._geometry.indexDataAsUShort()[11] = 5
- 
--        self._node.setGeometry(self._geometry)
-+            self._node.setGeometry(self._geometry)
- 
--        self._material = QSGFlatColorMaterial()
--        self._material.setColor(self._color)
-+            self._material = QSGFlatColorMaterial()
-+            self._material.setColor(self._color)
- 
--        self._node.setMaterial(self._material)
-+            self._node.setMaterial(self._material)
-+        else:
-+            if paint_node is None:
-+                paint_node = QSGSimpleRectNode()
- 
--        return self._node
-+            paint_node.setRect(0, 0, self.width(), self.height())
-+            paint_node.setColor(self._color)
-+
-+        return paint_node
-diff --git a/UM/Qt/ListModel.py b/UM/Qt/ListModel.py
-index c2fb363..5d71bc5 100644
---- a/UM/Qt/ListModel.py
-+++ b/UM/Qt/ListModel.py
-@@ -1,7 +1,7 @@
- # Copyright (c) 2015 Ultimaker B.V.
- # Uranium is released under the terms of the AGPLv3 or higher.
- 
--from PyQt5.QtCore import QObject, QAbstractListModel, QVariant, QModelIndex, pyqtSlot, pyqtProperty
-+from PyQt5.QtCore import QObject, QAbstractListModel, QVariant, QModelIndex, pyqtSlot, pyqtProperty, QByteArray
- 
- ##  Convenience base class for models of a list of items.
- #
-@@ -21,16 +21,18 @@ def rowCount(self, parent = None):
-         return len(self._items)
- 
-     def addRoleName(self,role,name):
--        self._role_names[role] = name
--        
-+        # Qt roleNames expects a QByteArray. PyQt 5.5 does not convert str to bytearray implicitly so
-+        # force the conversion manually.
-+        self._role_names[role] = name.encode("utf-8")
-+
-     def roleNames(self):
-         return self._role_names
--    
-+
-     ##  Reimplemented from QAbstractListModel
-     def data(self, index, role):
-         if not index.isValid():
-             return QVariant()
--        return self._items[index.row()][self._role_names[role]]
-+        return self._items[index.row()][self._role_names[role].decode("utf-8")]
- 
-     ##  Get an item from the list
-     @pyqtSlot(int, result="QVariantMap")
-@@ -70,7 +72,7 @@ def clear(self):
-         self.beginResetModel()
-         self._items.clear()
-         self.endResetModel()
--        
-+
-     @pyqtSlot(int, str, QVariant)
-     def setProperty(self, index, property, value):
-         self._items[index][property] = value
diff --git a/scripts.patch b/scripts.patch
deleted file mode 100644
index 185293f552f9..000000000000
--- a/scripts.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt	2015-07-27 08:51:09.000000000 +0100
-+++ b/CMakeLists.txt	2015-08-23 18:30:00.642231499 +0100
-@@ -82,6 +82,7 @@
-     install(DIRECTORY UM DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages)
- endif()
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
-+install(DIRECTORY scripts DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium USE_SOURCE_PERMISSIONS)
- install(DIRECTORY plugins DESTINATION lib/uranium)
- 
- include(CPackConfig.cmake)