summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Hovorka2017-06-01 11:23:35 +0200
committerMarkus Hovorka2017-06-01 11:25:05 +0200
commit113c565db67ea59bf234a2b9031a0502b41dbff3 (patch)
tree969084a87b09cf0196091c8c190147a29ffcc48a
parentdc465119e64f948ae0a669913984325aad7fb59d (diff)
downloadaur-113c565db67ea59bf234a2b9031a0502b41dbff3.tar.gz
Remove patches applied upstream
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD16
-rw-r--r--fix-occ-search.patch24
-rw-r--r--rpath.patch16
4 files changed, 4 insertions, 58 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a53ed6a4849..3f91e54b458 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout
- pkgver = 0.17pre.r3961.g3b6020cda
+ pkgver = 0.17pre.r4505.gbc6a52ee9
pkgrel = 1
epoch = 1
url = http://www.freecadweb.org/
@@ -38,13 +38,9 @@ pkgbase = freecad-git
source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git
source = freecad.desktop
source = freecad.xml
- source = rpath.patch
- source = fix-occ-search.patch
md5sums = SKIP
md5sums = 7e781d41e90a1c137930e47672996a52
md5sums = c2f4154c8e4678825411de8e7fa54c6b
- md5sums = b313a990287bce43dc698affae35d58d
- md5sums = 5a7beefb78ef73241b0e421fec67f4db
pkgname = freecad-git
diff --git a/PKGBUILD b/PKGBUILD
index 16e378a8b7c..8c81ab43708 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_appname=freecad
pkgname="${_appname}-git"
-pkgver=0.17pre.r3961.g3b6020cda
+pkgver=0.17pre.r4505.gbc6a52ee9
pkgrel=1
epoch=1
pkgdesc='A general purpose 3D CAD modeler - git checkout'
@@ -21,26 +21,16 @@ provides=('freecad')
conflicts=('freecad')
source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git"
"freecad.desktop"
- "freecad.xml"
- "rpath.patch"
- "fix-occ-search.patch")
+ "freecad.xml")
md5sums=('SKIP'
'7e781d41e90a1c137930e47672996a52'
- 'c2f4154c8e4678825411de8e7fa54c6b'
- 'b313a990287bce43dc698affae35d58d'
- '5a7beefb78ef73241b0e421fec67f4db')
+ 'c2f4154c8e4678825411de8e7fa54c6b')
pkgver() {
cd "${srcdir}/${pkgname}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
}
-prepare() {
- cd "${srcdir}/${pkgname}"
- patch -Np1 -i "${srcdir}/rpath.patch"
- patch -Np1 -i "${srcdir}/fix-occ-search.patch"
-}
-
build() {
cd "${srcdir}/${pkgname}"
diff --git a/fix-occ-search.patch b/fix-occ-search.patch
deleted file mode 100644
index 6f770258a2d..00000000000
--- a/fix-occ-search.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/cMake/FindOpenCasCade.cmake b/cMake/FindOpenCasCade.cmake
-index 9944b8ade..2f60ba7dd 100644
---- a/cMake/FindOpenCasCade.cmake
-+++ b/cMake/FindOpenCasCade.cmake
-@@ -56,17 +56,8 @@ else(OCE_FOUND) #look for OpenCASCADE
- )
- endif(CYGWIN OR MINGW)
- else(WIN32)
-- FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
-- /usr/include/opencascade
-- /usr/local/include/opencascade
-- /opt/opencascade/include
-- /opt/opencascade/inc
-- )
-- FIND_LIBRARY(OCC_LIBRARY TKernel
-- /usr/lib
-- /usr/local/lib
-- /opt/opencascade/lib
-- )
-+ FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx)
-+ FIND_LIBRARY(OCC_LIBRARY TKernel)
- endif(WIN32)
- if(OCC_LIBRARY)
- GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
diff --git a/rpath.patch b/rpath.patch
deleted file mode 100644
index ceeaebd2dd1..00000000000
--- a/rpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake
-index 1faa610d8..18ccdeea6 100644
---- a/cMake/FreeCadMacros.cmake
-+++ b/cMake/FreeCadMacros.cmake
-@@ -239,9 +239,9 @@ MACRO(SET_BIN_DIR ProjectName OutputName)
- # FreeCADBase, SMDS, Driver, MEFISTO2 and area libs don't depend on parts from CMAKE_INSTALL_LIBDIR
- if(NOT ${ProjectName} MATCHES "^(FreeCADBase|SMDS|Driver|MEFISTO2|area)$")
- if(${ARGC} STREQUAL 4)
-- set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3})
-+ set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3})
- else(${ARGC} STREQUAL 4)
-- set_target_properties(${ProjectName} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
-+ set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
- endif()
- endif()
- endif(WIN32)