summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2018-07-18 09:48:52 +0200
committerbartus2018-07-18 09:48:52 +0200
commitd582834199e104a9b47bc3a32ae6215bcfa09f4b (patch)
tree6fa46f928da3917d33c58701a3cc7536164dcbb0
parente63f2405eee10472427b690394e1bea16a8e8c43 (diff)
downloadaur-d582834199e104a9b47bc3a32ae6215bcfa09f4b.tar.gz
remove old patches
-rw-r--r--.SRCINFO8
-rw-r--r--CMakeLists.txt.patch18
-rw-r--r--PKGBUILD19
-rw-r--r--py_CMakeLists.txt.patch18
4 files changed, 8 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6c03569300c..03e7be0565a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = partio-git
pkgdesc = Particle IO and manipulation library (git version)
- pkgver = 1.1.0.r93.g8b6ea0d
- pkgrel = 5
+ pkgver = 1.1.0.r117.g2661682
+ pkgrel = 1
url = http://www.disneyanimation.com/technology/partio.html
arch = i686
arch = x86_64
@@ -17,11 +17,7 @@ pkgbase = partio-git
provides = partio
conflicts = partio
source = git+https://github.com/wdas/partio.git
- source = CMakeLists.txt.patch
- source = py_CMakeLists.txt.patch
md5sums = SKIP
- md5sums = 74e654e43cf9e9aacd9ac57c0e0e671c
- md5sums = 306cacec7af0af3adb7876c288881062
pkgname = partio-git
diff --git a/CMakeLists.txt.patch b/CMakeLists.txt.patch
deleted file mode 100644
index 9dc1d0b8250..00000000000
--- a/CMakeLists.txt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git /partio/CMakeLists.txt /partio/CMakeLists.txt
-index 92c1da0..6021a97 100644
---- /partio/CMakeLists.txt
-+++ /partio/CMakeLists.txt
-@@ -100,11 +100,11 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/lib )
-
- if (${PARTIO_SE_ENABLED})
- add_definitions(-DPARTIO_SE_ENABLED=1)
-- SET(SEEXPR_BASE "c:/aselle/seexpr-inst" CACHE STRING "path to SeExpr")
-+ SET(SEEXPR_BASE "/usr" CACHE STRING "path to SeExpr")
- SET(SEEXPR_INCLUDE_PATH ${SEEXPR_BASE}/include)
- SET(SEEXPR_LIBDIR ${CMAKE_INSTALL_LIBDIR})
- SET(SEEXPR_LINK_PATH ${SEEXPR_BASE}/${SEEXPR_LIBDIR})
-- SET(SEEXPR_LIBS "SeExpr")
-+ SET(SEEXPR_LIBS "SeExpr2")
- endif ()
-
-
diff --git a/PKGBUILD b/PKGBUILD
index 38813bec9fc..cfa911b16b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer : bartus <arch-user-repoᘓbartus.33mail.com>
# Maintainer: Alex Dahl <adahl1@umbc.edu>
pkgname=partio-git
-pkgver=1.1.0.r93.g8b6ea0d
-pkgrel=5
+pkgver=1.1.0.r117.g2661682
+pkgrel=1
pkgdesc="Particle IO and manipulation library (git version)"
arch=(i686 x86_64)
url="http://www.disneyanimation.com/technology/partio.html"
@@ -14,12 +14,8 @@ makedepends=('cmake>=2.4.6' 'swig' 'git')
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
source=('git+https://github.com/wdas/partio.git'
- 'CMakeLists.txt.patch'
- 'py_CMakeLists.txt.patch'
)
md5sums=('SKIP'
- '74e654e43cf9e9aacd9ac57c0e0e671c'
- '306cacec7af0af3adb7876c288881062'
)
pkgver() {
@@ -28,13 +24,10 @@ pkgver() {
git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- cd "$srcdir"
- # Fix SeExpr dependency and remove tests
- patch -p1 -i "$srcdir/CMakeLists.txt.patch"
- # Change Python version to 2 to work with SeExpr
- patch -p1 -i "$srcdir/py_CMakeLists.txt.patch"
-}
+#prepare() {
+# cd "$srcdir/${pkgname%-git}"
+# git apply ../
+#}
build() {
cd "$srcdir/${pkgname%-git}"
diff --git a/py_CMakeLists.txt.patch b/py_CMakeLists.txt.patch
deleted file mode 100644
index 2632cebed5c..00000000000
--- a/py_CMakeLists.txt.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/partio/src/py/CMakeLists.txt 2016-06-12 02:23:34.116897808 -0400
-+++ src/partio/src/py/CMakeLists.txt 2016-06-12 02:23:05.430315202 -0400
-@@ -35,13 +35,14 @@
-
- FIND_PACKAGE(SWIG)
- #IF(SWIG_FOUND)
-+set(Python_ADDITIONAL_VERSIONS 2.7 2.6 2.5 2.4)
- FIND_PACKAGE(PythonLibs)
- SET(TEST1 "test1" CACHE STRING "test val 1" FORCE)
- IF(PYTHONLIBS_FOUND)
-
- INCLUDE(${SWIG_USE_FILE})
-
--EXECUTE_PROCESS(COMMAND python -c "import sys;print('%s.%s'%sys.version_info[0:2])"
-+EXECUTE_PROCESS(COMMAND python2 -c "import sys;print('%s.%s'%sys.version_info[0:2])"
- OUTPUT_VARIABLE PYTHON_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- SET(TEST1 "test2" CACHE STRING "test val 2" FORCE)