PKGBUILDs/freecad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove merged build fix patch

Browse source
This commit is contained in:
Grey Christoforo 2019-12-31 13:48:34 +00:00
parent 3ea5de2c5a
commit 234acf35eb
3 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.SRCINFO
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.18.r3000.g9e4710d679 pkgver = 0.18.r3026.gdcc2790834
pkgrel = 1 pkgrel = 1
epoch = 0 epoch = 0
url = https://www.freecadweb.org/ url = https://www.freecadweb.org/
@ -40,7 +40,7 @@ pkgbase = freecad-git
conflicts = freecad conflicts = freecad
conflicts = freecad-appimage conflicts = freecad-appimage
conflicts = freecad-appimage-git conflicts = freecad-appimage-git
source = freecad-git::git+https://github.com/FreeCAD/FreeCAD.git source = git+https://github.com/FreeCAD/FreeCAD.git
md5sums = SKIP md5sums = SKIP
pkgname = freecad-git pkgname = freecad-git

16
.gitignore vendored
View file

@ -1,11 +1,5 @@
* src/
!.gitignore pkg/
!PKGBUILD FreeCAD/
!.SRCINFO *.tar.xz
!*.install *.tar.gz
!ChangeLog
!*.diff
!*.patch
<<<<<<< HEAD
!*.desktop
!*.xml

17
PKGBUILD
View file

@ -2,7 +2,7 @@
# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com> # Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
pkgname=freecad-git pkgname=freecad-git
pkgver=0.18.r3000.g9e4710d679 pkgver=0.18.r3026.gdcc2790834
pkgrel=1 pkgrel=1
epoch=0 epoch=0
pkgdesc='A general purpose 3D CAD modeler - git checkout' pkgdesc='A general purpose 3D CAD modeler - git checkout'
@ -18,26 +18,23 @@ makedepends=('boost' 'cmake' 'eigen' 'git' 'gcc-fortran'
optdepends=('pycollada: Create, edit and load COLLADA documents.') optdepends=('pycollada: Create, edit and load COLLADA documents.')
provides=('freecad') provides=('freecad')
conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git') conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git')
source=("${pkgname}::git+https://github.com/FreeCAD/FreeCAD.git") source=("git+https://github.com/FreeCAD/FreeCAD.git")
md5sums=('SKIP') md5sums=('SKIP')
pkgver() { pkgver() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/FreeCAD"
# upstream recyles the "pre" and "staging" tags so they do not produces stable commit counts # upstream recyles the "pre" and "staging" tags so they do not produces stable commit counts
git describe --long --tags --exclude '*pre*' --exclude '*staging*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//' git describe --long --tags --exclude '*pre*' --exclude '*staging*' | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/_//'
} }
prepare() { prepare() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/FreeCAD"
# fix a build error # fix a build error
curl -L "https://github.com/FreeCAD/FreeCAD/pull/2842/commits/095984fce44931a4c8e2ace269d45a62640fbfb4.patch" | patch -p1 #curl -L "https://github.com/FreeCAD/FreeCAD/pull/2842/commits/095984fce44931a4c8e2ace269d45a62640fbfb4.patch" | patch -p1
# patch.txt
#dos2unix patch.txt
#patch --binary -p1 -i patch.txt
} }
build() { build() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/FreeCAD"
# we need to manually set all PYSIDE_* paths as autodetection is broken: # we need to manually set all PYSIDE_* paths as autodetection is broken:
# https://github.com/FreeCAD/FreeCAD/pull/2020 # https://github.com/FreeCAD/FreeCAD/pull/2020
@ -63,7 +60,7 @@ build() {
} }
package() { package() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/FreeCAD"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install