bump to version 2.3.0

3 files changed, 9 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd65ef58659d..12ba471477f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Aug  8 17:14:29 UTC 2016
+# Fri Oct 21 20:11:16 UTC 2016
 pkgbase = cura
 	pkgdesc = A software solution for 3D printing aimed at RepRaps and the Ultimaker.
-	pkgver = 2.1.3
+	pkgver = 2.3.0
 	pkgrel = 1
 	url = https://ultimaker.com/en/products/cura-software
 	install = cura.install
@@ -17,10 +17,8 @@ pkgbase = cura
 	depends = uranium
 	depends = curaengine
 	provides = cura
-	source = https://github.com/Ultimaker/Cura/archive/2.1.3.tar.gz
-	source = fix-python-dir.patch
-	sha1sums = 6318bea1603bbf3e43202f0894780de433c97410
-	sha1sums = 439a5efb8371bbfd1266a6b6434c0584f00baaa9
+	source = https://github.com/Ultimaker/Cura/archive/2.3.0.tar.gz
+	sha1sums = 8db40ca9282b3ce0a2513b2cf840d7cd871513b3
 
 pkgname = cura
 
diff --git a/PKGBUILD b/PKGBUILD
index 2457c56a5921..cebe7cdcd34f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Grey Christoforo <my first name [at] my last name [dot] net>
 
 pkgname=cura
-pkgver=2.1.3
+pkgver=2.3.0
 pkgrel=1
 pkgdesc="A software solution for 3D printing aimed at RepRaps and the Ultimaker."
 depends=('qt5-svg' 'python-pyserial' 'python-numpy' 'uranium' 'curaengine')
@@ -10,15 +10,15 @@ provides=('cura')
 url="https://ultimaker.com/en/products/cura-software"
 license=('AGPLv3')
 arch=('i686' 'x86_64')
-source=(https://github.com/Ultimaker/Cura/archive/${pkgver}.tar.gz fix-python-dir.patch)
-sha1sums=('6318bea1603bbf3e43202f0894780de433c97410'
-          '439a5efb8371bbfd1266a6b6434c0584f00baaa9')
+source=(https://github.com/Ultimaker/Cura/archive/${pkgver}.tar.gz)
+sha1sums=('8db40ca9282b3ce0a2513b2cf840d7cd871513b3')
 
 install=cura.install
 
 prepare(){
   cd Cura-${pkgver}
-  patch -Np1 -i ../fix-python-dir.patch
+  sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages,DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
+  sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura),DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura),g' CMakeLists.txt
 
   cat > "${srcdir}/${pkgname}.desktop" <<END
 [Desktop Entry]
diff --git a/fix-python-dir.patch b/fix-python-dir.patch
deleted file mode 100644
index 103e0872ce27..000000000000
--- a/fix-python-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt	2016-04-12 16:39:03.000000000 +0100
-+++ b/CMakeLists.txt	2016-05-24 16:04:27.614499586 +0100
-@@ -65,10 +65,10 @@
-             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-             RENAME cura)
-     install(DIRECTORY cura
--            DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages
-+            DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-             FILES_MATCHING PATTERN *.py)
-     install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
--            DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
-+            DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura)
-     install(FILES cura.desktop
-             DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-     install(FILES cura.sharedmimeinfo