| author | Antonio Rojas
<arojas@archlinux.org> 2024-04-15 23:05:59 UTC |
| committer | Antonio Rojas
<arojas@archlinux.org> 2024-04-15 23:05:59 UTC |
| parent | 03cef3d7e1e4ef8e67992d9eeaa7543e8bdb78d7 |
| .SRCINFO | +2 | -2 |
| PKGBUILD | +2 | -2 |
| pyside6.patch | +0 | -13 |
diff --git a/.SRCINFO b/.SRCINFO index 245cd28..c47c6b6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = freecad pkgdesc = Feature based parametric 3D CAD modeler pkgver = 0.21.2 - pkgrel = 14 + pkgrel = 15 url = https://freecadweb.org/ arch = x86_64 license = LGPL @@ -56,7 +56,7 @@ pkgbase = freecad source = https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch b2sums = b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7 b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5 - b2sums = fb2dace322b82be706e7bbcb4e73c3ddb817264e5aeb5ec943638173b3fabbe4b0abae3e159f64c56fc570f05df71154bf07d6948fe90929764442e88a6bcef1 + b2sums = 63bfac252cc813f4e2454b4bbd8b0c55e2882566bd39bf1d0b812bafc305cad6b65293bad4f3c043b58df93a2c685e82e5853059335fe8e90531dcbc23e324e9 b2sums = eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f b2sums = de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc diff --git a/PKGBUILD b/PKGBUILD index 8c6bd94..11fc655 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=freecad pkgver=0.21.2 -pkgrel=14 +pkgrel=15 pkgdesc='Feature based parametric 3D CAD modeler' arch=(x86_64) url='https://freecadweb.org/' @@ -34,7 +34,7 @@ source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver" https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch) b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7' 'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5' - 'fb2dace322b82be706e7bbcb4e73c3ddb817264e5aeb5ec943638173b3fabbe4b0abae3e159f64c56fc570f05df71154bf07d6948fe90929764442e88a6bcef1' + '63bfac252cc813f4e2454b4bbd8b0c55e2882566bd39bf1d0b812bafc305cad6b65293bad4f3c043b58df93a2c685e82e5853059335fe8e90531dcbc23e324e9' 'eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f' 'de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc') diff --git a/pyside6.patch b/pyside6.patch index 0229241..6584646 100644 --- a/pyside6.patch +++ b/pyside6.patch @@ -1,16 +1,3 @@ -diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -index 0569c1fde9..f5e3d0931f 100644 ---- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -+++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -@@ -165,6 +165,8 @@ macro(SetupShibokenAndPyside) - message(STATUS "PySide ${PySide_VERSION} Python module found at ${PRINT_OUTPUT}.\n") - endif() - -+ set_target_properties(Shiboken6::libshiboken PROPERTIES INTERFACE_COMPILE_DEFINITIONS "") -+ - endmacro(SetupShibokenAndPyside) - - # Locate the include directory for a pip-installed package -- uses pip show to find the base pip diff --git a/src/Mod/AddonManager/package_details.py b/src/Mod/AddonManager/package_details.py index c9d1ae311a..9c0e040ea5 100644 --- a/src/Mod/AddonManager/package_details.py