diff options
author | Adam Goldsmith | 2017-09-21 10:41:17 -0400 |
---|---|---|
committer | Adam Goldsmith | 2017-09-21 10:41:17 -0400 |
commit | fd057196482d7df3f01bc83c9c0c2a39d4629101 (patch) | |
tree | 2a4d6e10ae1eccee00534c4e24fcc1040476f558 | |
parent | 3f64f2e06905eed0240a2d68b739f3e1fce0956d (diff) | |
download | aur-fd057196482d7df3f01bc83c9c0c2a39d4629101.tar.gz |
Remove now unneeded patch
site-packages finally fixed upstream
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | site-packages-dir.patch | 15 |
3 files changed, 5 insertions, 27 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Sep 5 06:33:42 UTC 2017 +# Thu Sep 21 14:38:57 UTC 2017 pkgbase = cura-git pkgdesc = A full software solution for 3D printing aimed at RepRaps and the Ultimaker. - pkgver = 2.7.0.348.g90240af8 + pkgver = 2.7.0.643.gf7d14c5b pkgrel = 1 url = https://github.com/Ultimaker/Cura arch = any @@ -24,9 +24,7 @@ pkgbase = cura-git provides = cura conflicts = cura source = git+https://github.com/Ultimaker/Cura.git - source = site-packages-dir.patch md5sums = SKIP - md5sums = 68ddf58623d21a736d1075099667bdef pkgname = cura-git @@ -1,7 +1,7 @@ # Maintainer: Adam Goldsmith <contact@adamgoldsmith.name> pkgname=cura-git -pkgver=2.7.0.348.g90240af8 +pkgver=2.7.0.643.gf7d14c5b pkgrel=1 pkgdesc="A full software solution for 3D printing aimed at RepRaps and the Ultimaker." arch=('any') @@ -15,19 +15,14 @@ optdepends=('python-zeroconf: Detecting mDNS printers' 'cura-binary-data-git: Firmwares and translations' 'python-pyserial: USB printing' 'cura-fdm-materials-git: Default Materials') -source=('git+https://github.com/Ultimaker/Cura.git' 'site-packages-dir.patch') -md5sums=('SKIP' '68ddf58623d21a736d1075099667bdef') +source=('git+https://github.com/Ultimaker/Cura.git') +md5sums=('SKIP') pkgver() { cd Cura git describe --tags | sed 's/-/./g' } -prepare() { - cd Cura - patch -Np1 -i ../site-packages-dir.patch -} - build() { mkdir -p Cura/build cd Cura/build diff --git a/site-packages-dir.patch b/site-packages-dir.patch deleted file mode 100644 index 0a9fa1a1d4de..000000000000 --- a/site-packages-dir.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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 ${CMAKE_BINARY_DIR}/cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES cura.sharedmimeinfo |