Update PKGBUILD and patch for changes to CmakeLists.txt

3 files changed, 18 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f64f5788ab00..dbd80b411f46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Feb 15 15:33:29 UTC 2016
+# Thu Mar 17 19:12:40 UTC 2016
 pkgbase = cura-git
 	pkgdesc = A full software solution for 3D printing aimed at RepRaps and the Ultimaker.
-	pkgver = 15.06.03.1217.gd088044
+	pkgver = 15.06.03.1547.g6017d91
 	pkgrel = 1
 	url = https://github.com/daid/Cura
 	arch = any
@@ -23,7 +23,7 @@ pkgbase = cura-git
 	source = git+https://github.com/Ultimaker/Cura.git
 	source = site-packages-dir.patch
 	md5sums = SKIP
-	md5sums = c9ac02af3d23b7c271340458412ea9de
+	md5sums = 2638714c242785f94277a0a15a0ab087
 
 pkgname = cura-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e7976fc5c6a3..e50c1631fc41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Adam Goldsmith <contact@adamgoldsmith.name>
 
 pkgname=cura-git
-pkgver=15.06.03.1217.gd088044
+pkgver=15.06.03.1547.g6017d91
 pkgrel=1
 pkgdesc="A full software solution for 3D printing aimed at RepRaps and the Ultimaker."
 arch=('any')
@@ -12,7 +12,7 @@ conflicts=('cura')
 depends=('python' 'python-pyqt5' 'python-pyserial' 'python-numpy' 'python-protobuf3' 'qt5-quickcontrols' 'libarcus-git' 'uranium-git' 'curaengine-git')
 makedepends=('git' 'cmake')
 source=('git+https://github.com/Ultimaker/Cura.git' 'site-packages-dir.patch')
-md5sums=('SKIP' 'c9ac02af3d23b7c271340458412ea9de')
+md5sums=('SKIP' '2638714c242785f94277a0a15a0ab087')
 
 pkgver() {
   cd Cura
@@ -34,9 +34,6 @@ build() {
 package() {
   cd "$srcdir/Cura/build"
   make DESTDIR="$pkgdir/" install
-
-  chmod +x "$pkgdir/usr/bin/cura_app.py"
-  ln -s "cura_app.py" "$pkgdir/usr/bin/cura"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/site-packages-dir.patch b/site-packages-dir.patch
index 01795943ce42..782c5b65dd45 100644
--- a/site-packages-dir.patch
+++ b/site-packages-dir.patch
@@ -1,26 +1,15 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -56,16 +56,12 @@ find_package(PythonInterp 3.4.0 REQUIRED)
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- install(DIRECTORY plugins DESTINATION lib/cura)
- install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--if(NOT APPLE AND NOT WIN32)
--    install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages FILES_MATCHING PATTERN *.py)
--    install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura)
--    install(FILES cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
--    install(FILES cura.sharedmimeinfo
--            DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/
--            RENAME cura.xml )
--else()
--    install(DIRECTORY cura 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}.${PYTHON_VERSION_MINOR}/site-packages/cura)
--endif()
-+
-+install(DIRECTORY cura 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}.${PYTHON_VERSION_MINOR}/site-packages/cura)
-+install(FILES cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
-+install(FILES cura.sharedmimeinfo
-+        DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/
-+        RENAME cura.xml )
- 
- include(CPackConfig.cmake)
+@@ -64,10 +64,10 @@ if(NOT APPLE AND NOT WIN32)
+             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