mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
extra/freecad to 0.21.2-17
This commit is contained in:
parent
194877bed5
commit
74128e4993
3 changed files with 11 additions and 32 deletions
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = freecad
|
pkgbase = freecad
|
||||||
pkgdesc = Feature based parametric 3D CAD modeler
|
pkgdesc = Feature based parametric 3D CAD modeler
|
||||||
pkgver = 0.21.2
|
pkgver = 0.21.2
|
||||||
pkgrel = 15
|
pkgrel = 17
|
||||||
url = https://freecadweb.org/
|
url = https://freecadweb.org/
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = LGPL
|
license = LGPL
|
||||||
|
@ -54,10 +54,12 @@ pkgbase = freecad
|
||||||
source = pyside6.patch
|
source = pyside6.patch
|
||||||
source = 62c3836c.patch
|
source = 62c3836c.patch
|
||||||
source = https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch
|
source = https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch
|
||||||
|
source = https://github.com/FreeCAD/FreeCAD/commit/ac9a88c2.patch
|
||||||
b2sums = b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7
|
b2sums = b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7
|
||||||
b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5
|
b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5
|
||||||
b2sums = 63bfac252cc813f4e2454b4bbd8b0c55e2882566bd39bf1d0b812bafc305cad6b65293bad4f3c043b58df93a2c685e82e5853059335fe8e90531dcbc23e324e9
|
b2sums = eceb2d1b580fafaeec35de31fb3f4ec947ad32afe96734aa86d338364c97bbe5218506627957063c35ea2f360b7f7f916c9b7a1c0ef674c35d1f7972c070210e
|
||||||
b2sums = eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f
|
b2sums = eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f
|
||||||
b2sums = de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc
|
b2sums = de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc
|
||||||
|
b2sums = 02284db1b17dc88d0522eb3a726076b9f1ded740fdab1a185e48534c3606c77e51a12690b02bf5e0d9d1f72d1d8389ba84a54cba274200e69b6b10a431bbfdfe
|
||||||
|
|
||||||
pkgname = freecad
|
pkgname = freecad
|
||||||
|
|
|
@ -18,7 +18,7 @@ highmem=1
|
||||||
|
|
||||||
pkgname=freecad
|
pkgname=freecad
|
||||||
pkgver=0.21.2
|
pkgver=0.21.2
|
||||||
pkgrel=15
|
pkgrel=17
|
||||||
pkgdesc='Feature based parametric 3D CAD modeler'
|
pkgdesc='Feature based parametric 3D CAD modeler'
|
||||||
arch=(x86_64)
|
arch=(x86_64)
|
||||||
url='https://freecadweb.org/'
|
url='https://freecadweb.org/'
|
||||||
|
@ -37,17 +37,20 @@ source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver"
|
||||||
freecad-vtk9.3.patch
|
freecad-vtk9.3.patch
|
||||||
pyside6.patch
|
pyside6.patch
|
||||||
62c3836c.patch
|
62c3836c.patch
|
||||||
https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch)
|
https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch
|
||||||
|
https://github.com/FreeCAD/FreeCAD/commit/ac9a88c2.patch)
|
||||||
b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7'
|
b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7'
|
||||||
'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5'
|
'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5'
|
||||||
'63bfac252cc813f4e2454b4bbd8b0c55e2882566bd39bf1d0b812bafc305cad6b65293bad4f3c043b58df93a2c685e82e5853059335fe8e90531dcbc23e324e9'
|
'eceb2d1b580fafaeec35de31fb3f4ec947ad32afe96734aa86d338364c97bbe5218506627957063c35ea2f360b7f7f916c9b7a1c0ef674c35d1f7972c070210e'
|
||||||
'eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f'
|
'eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f'
|
||||||
'de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc')
|
'de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc'
|
||||||
|
'02284db1b17dc88d0522eb3a726076b9f1ded740fdab1a185e48534c3606c77e51a12690b02bf5e0d9d1f72d1d8389ba84a54cba274200e69b6b10a431bbfdfe')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
|
patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
|
||||||
patch -d freecad -Np1 -i ../62c3836c.patch # Fix Qt6 issues in addons manager
|
patch -d freecad -Np1 -i ../62c3836c.patch # Fix Qt6 issues in addons manager
|
||||||
patch -d freecad -Np1 -i ../pyside6.patch
|
patch -d freecad -Np1 -i ../pyside6.patch
|
||||||
|
patch -d freecad -Np1 -i ../ac9a88c2.patch # Fix more pyside6 issues
|
||||||
patch -d freecad -Np1 -i ../6043c904.patch # Fix build with Python 3.12
|
patch -d freecad -Np1 -i ../6043c904.patch # Fix build with Python 3.12
|
||||||
sed -e 's|Shiboken::Module::getTypes(requiredModule)|reinterpret_cast<PyTypeObject **>(Shiboken::Module::getTypes(requiredModule))|' \
|
sed -e 's|Shiboken::Module::getTypes(requiredModule)|reinterpret_cast<PyTypeObject **>(Shiboken::Module::getTypes(requiredModule))|' \
|
||||||
-i freecad/src/Gui/PythonWrapper.cpp # Fix build with PySide 6.7
|
-i freecad/src/Gui/PythonWrapper.cpp # Fix build with PySide 6.7
|
||||||
|
|
|
@ -93,29 +93,3 @@ index cb8bb63d8a..7445173537 100644
|
||||||
# restart FreeCAD after a delay to give time to this dialog to close
|
# restart FreeCAD after a delay to give time to this dialog to close
|
||||||
QtCore.QTimer.singleShot(1000, utils.restart_freecad)
|
QtCore.QTimer.singleShot(1000, utils.restart_freecad)
|
||||||
|
|
||||||
diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py
|
|
||||||
index 8935233f09..20c395ed9d 100644
|
|
||||||
--- a/src/Mod/Arch/importIFClegacy.py
|
|
||||||
+++ b/src/Mod/Arch/importIFClegacy.py
|
|
||||||
@@ -1800,7 +1800,7 @@ def explorer(filename,schema="IFC2X3_TC1.exp"):
|
|
||||||
tree.headerItem().setText(1, "")
|
|
||||||
tree.headerItem().setText(2, "Item and Properties")
|
|
||||||
bold = QtGui.QFont()
|
|
||||||
- bold.setWeight(75)
|
|
||||||
+ bold.setWeight(QtGui.QFont.Weight(75))
|
|
||||||
bold.setBold(True)
|
|
||||||
|
|
||||||
#print(ifc.Entities)
|
|
||||||
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
|
|
||||||
index b19101e9ca..b44425e012 100644
|
|
||||||
--- a/src/Mod/Draft/DraftGui.py
|
|
||||||
+++ b/src/Mod/Draft/DraftGui.py
|
|
||||||
@@ -406,7 +406,7 @@ class DraftToolBar:
|
|
||||||
self.promptlabel = self._label("promptlabel", self.layout, hide=task)
|
|
||||||
self.cmdlabel = self._label("cmdlabel", self.layout, hide=task)
|
|
||||||
boldtxt = QtGui.QFont()
|
|
||||||
- boldtxt.setWeight(75)
|
|
||||||
+ boldtxt.setWeight(QtGui.QFont.Weight(75))
|
|
||||||
boldtxt.setBold(True)
|
|
||||||
self.cmdlabel.setFont(boldtxt)
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue