summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Goldsmith2017-09-21 22:09:22 -0400
committerAdam Goldsmith2017-09-21 22:09:22 -0400
commit669e385477c226de359cfa7511dea96bf3627d3c (patch)
treee9ff2dc3ec22522e3f69f029b2debfc1c6f7d809
parentbaafa5401409bff3544377ad300909c56b422624 (diff)
downloadaur-669e385477c226de359cfa7511dea96bf3627d3c.tar.gz
Remove site-packages-dir patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--site-packages-dir.patch15
3 files changed, 5 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6a38a611e62d..550d4690292b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Sep 11 14:40:04 UTC 2017
+# Fri Sep 22 02:09:09 UTC 2017
pkgbase = uranium-git
pkgdesc = A Python framework for building Desktop applications.
- pkgver = 2.7.0.40.gfc3e0f7d3
+ pkgver = 2.7.0.70.g7e2ccc383
pkgrel = 1
url = https://github.com/Ultimaker/Uranium
arch = any
@@ -19,9 +19,7 @@ pkgbase = uranium-git
provides = uranium
conflicts = uranium
source = git+https://github.com/Ultimaker/Uranium.git
- source = site-packages-dir.patch
md5sums = SKIP
- md5sums = d9d257943ae1d30bb9279b1183bd06bf
pkgname = uranium-git
diff --git a/PKGBUILD b/PKGBUILD
index bf318bae1a9a..66b244efa691 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Original Author: Grey Christoforo <first name [at] last name [dot] net>
pkgname=uranium-git
-pkgver=2.7.0.40.gfc3e0f7d3
+pkgver=2.7.0.70.g7e2ccc383
pkgrel=1
pkgdesc="A Python framework for building Desktop applications."
url="https://github.com/Ultimaker/Uranium"
@@ -12,19 +12,14 @@ provides=('uranium')
conflicts=('uranium')
depends=('python' 'qt5-quickcontrols' 'pyqt5-common' 'python-pyqt5' 'python-numpy' 'python-scipy' 'libarcus-git')
makedepends=('cmake' 'git')
-source=('git+https://github.com/Ultimaker/Uranium.git' 'site-packages-dir.patch')
-md5sums=('SKIP' 'd9d257943ae1d30bb9279b1183bd06bf')
+source=('git+https://github.com/Ultimaker/Uranium.git')
+md5sums=('SKIP')
pkgver() {
cd Uranium
git describe --tags | sed 's/-/./g'
}
-prepare(){
- cd Uranium
- patch -Np1 -i ../site-packages-dir.patch
-}
-
build() {
mkdir -p Uranium/build
cd Uranium/build
diff --git a/site-packages-dir.patch b/site-packages-dir.patch
deleted file mode 100644
index 0b5e964221d2..000000000000
--- a/site-packages-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,11 +43,7 @@ add_custom_target(extract-messages ${CMAKE_SOURCE_DIR}/scripts/extract-messages
- # Build Translations
- CREATE_TRANSLATION_TARGETS()
-
--if(APPLE OR WIN32)
-- install(DIRECTORY UM DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
--else()
-- install(DIRECTORY UM DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages)
--endif()
-+install(DIRECTORY UM DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
- DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)