summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Souza Franco2018-04-21 12:03:20 +0200
committerGabriel Souza Franco2018-04-21 12:03:20 +0200
commitcd733757bc18992ed67a7e4e2b631cc3760963ab (patch)
tree7a3b230808597aa8821cfbf5ae6fb0ece3d9d1c9
parent3e6b68c0a1422860ec47160ff5c6b46ff8322a97 (diff)
downloadaur-cd733757bc18992ed67a7e4e2b631cc3760963ab.tar.gz
Integrate upstream patches
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD6
3 files changed, 9 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ae8a035a579..50f7f9904e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = freecad
pkgdesc = A general purpose 3D CAD modeler
pkgver = 0.17
- pkgrel = 1
+ pkgrel = 2
url = http://www.freecadweb.org/
arch = x86_64
license = LGPL
@@ -37,10 +37,12 @@ pkgbase = freecad
optdepends = graphviz
optdepends = openscad
source = freecad-0.17.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/0.17.tar.gz
+ source = freecad-e17b340-rollup.patch::https://github.com/FreeCAD/FreeCAD/compare/0.17...e17b340.patch
source = freecad.desktop
source = freecad.xml
source = remove-qtwebkit.patch
sha256sums = ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb
+ sha256sums = b8504058e8b46b600b28262a38cf2605989ca0c3a81ab0ed6326704b9913e62b
sha256sums = 617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296
sha256sums = 248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a
sha256sums = de214a281d421d44b02b469ecf72e36c4d61f10c40431e511e09734aca316baf
diff --git a/.gitignore b/.gitignore
index e06614aafa0..a6097aa29be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
freecad-*.tar.gz
+*rollup.patch
*.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index 2162c6affa2..fc8f807653d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,8 @@
pkgname=freecad
pkgver=0.17
-pkgrel=1
+_rollup=e17b340
+pkgrel=2
pkgdesc='A general purpose 3D CAD modeler'
arch=('x86_64')
url='http://www.freecadweb.org/'
@@ -22,9 +23,11 @@ makedepends=('boost' 'eigen' 'gcc-fortran' 'swig' 'xerces-c'
'desktop-file-utils' 'cmake' 'coin>=3.1.3-9' 'python2-pyside')
optdepends=('python2-matplotlib' 'python2-pyqt4' 'graphviz' 'openscad')
source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeCAD/FreeCAD/archive/$pkgver.tar.gz"
+ "$pkgname-$_rollup-rollup.patch::https://github.com/FreeCAD/FreeCAD/compare/$pkgver...$_rollup.patch"
"${pkgname}.desktop" "${pkgname}.xml"
'remove-qtwebkit.patch')
sha256sums=('ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb'
+ 'b8504058e8b46b600b28262a38cf2605989ca0c3a81ab0ed6326704b9913e62b'
'617968d7bbd1da71bdedaed1b66c5d6eaf24e0fb34678b93f5d925d370c66296'
'248918de7d3c2145b5cc4fbbc9e224d22f4a6ca7ead2680e8c3a32e91772482a'
'de214a281d421d44b02b469ecf72e36c4d61f10c40431e511e09734aca316baf')
@@ -32,6 +35,7 @@ sha256sums=('ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb'
prepare() {
cd "${srcdir}/FreeCAD-${pkgver}"
+ patch -Np1 -i ../$pkgname-$_rollup-rollup.patch
patch -Np1 -i ../remove-qtwebkit.patch
}