Remove patches applied upstream

This commit is contained in:
Markus Hovorka 2017-06-01 11:23:35 +02:00
parent dc465119e6
commit 113c565db6
4 changed files with 4 additions and 58 deletions

View file

@ -1,6 +1,6 @@
pkgbase = freecad-git pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout pkgdesc = A general purpose 3D CAD modeler - git checkout
pkgver = 0.17pre.r3961.g3b6020cda pkgver = 0.17pre.r4505.gbc6a52ee9
pkgrel = 1 pkgrel = 1
epoch = 1 epoch = 1
url = http://www.freecadweb.org/ url = http://www.freecadweb.org/
@ -38,13 +38,9 @@ pkgbase = freecad-git
source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git
source = freecad.desktop source = freecad.desktop
source = freecad.xml source = freecad.xml
source = rpath.patch
source = fix-occ-search.patch
md5sums = SKIP md5sums = SKIP
md5sums = 7e781d41e90a1c137930e47672996a52 md5sums = 7e781d41e90a1c137930e47672996a52
md5sums = c2f4154c8e4678825411de8e7fa54c6b md5sums = c2f4154c8e4678825411de8e7fa54c6b
md5sums = b313a990287bce43dc698affae35d58d
md5sums = 5a7beefb78ef73241b0e421fec67f4db
pkgname = freecad-git pkgname = freecad-git

View file

@ -3,7 +3,7 @@
_appname=freecad _appname=freecad
pkgname="${_appname}-git" pkgname="${_appname}-git"
pkgver=0.17pre.r3961.g3b6020cda pkgver=0.17pre.r4505.gbc6a52ee9
pkgrel=1 pkgrel=1
epoch=1 epoch=1
pkgdesc='A general purpose 3D CAD modeler - git checkout' pkgdesc='A general purpose 3D CAD modeler - git checkout'
@ -21,26 +21,16 @@ provides=('freecad')
conflicts=('freecad') conflicts=('freecad')
source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git" source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git"
"freecad.desktop" "freecad.desktop"
"freecad.xml" "freecad.xml")
"rpath.patch"
"fix-occ-search.patch")
md5sums=('SKIP' md5sums=('SKIP'
'7e781d41e90a1c137930e47672996a52' '7e781d41e90a1c137930e47672996a52'
'c2f4154c8e4678825411de8e7fa54c6b' 'c2f4154c8e4678825411de8e7fa54c6b')
'b313a990287bce43dc698affae35d58d'
'5a7beefb78ef73241b0e421fec67f4db')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/${pkgname}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//' 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() { build() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/${pkgname}"

View file

@ -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)

View file

@ -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)