Carl Smedstad pushed to branch main at Arch Linux / Packaging / Packages /
openscad
Commits:
922ed129 by Carl Smedstad at 2024-08-31T15:34:42+02:00
upgpkg: 2021.01-12: boost 1.86.0 rebuild
Also:
- Use SPDX license identifier.
- Fetch Git source with tag instead of commit hash.
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + boost-1.86.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,10 +1,10 @@
pkgbase = openscad
pkgdesc = The programmers solid 3D CAD modeller
pkgver = 2021.01
- pkgrel = 11
+ pkgrel = 12
url = https://openscad.org
arch = x86_64
- license = GPL2
+ license = GPL-2.0-or-later
checkdepends = cmake
checkdepends = xorgproto
checkdepends = xorg-server-xvfb
@@ -39,9 +39,11 @@ pkgbase = openscad
depends = nettle
depends = mpfr
depends = hicolor-icon-theme
- source =
openscad::git+https://github.com/openscad/openscad#commit=41f58fe57c03457a3a8b4dc541ef5654ec3e8c78
+ source =
openscad::git+https://github.com/openscad/openscad#tag=openscad-2021.01
source = github.com-openscad-MCAD::git+https://github.com/openscad/MCAD
+ source = boost-1.86.patch
+ b2sums =
077aeeeb7b43c69337793dd7543c179234c6f08ff6ef6c67b36bdeaa0be44fb5acb86574447d0a6b9c3f266fcf844d5cc355e76c84383975643da9e8c84c750d
b2sums = SKIP
- b2sums = SKIP
+ b2sums =
767d9a9d666d3c8a28ff0a8d8355124cf3518388672d27cb4511ec6f990f8fafe55ad16e4f7c1c2491aebc489421b711f3d8eca6ff74f370ad82abb6f205cc84
pkgname = openscad
=====================================
PKGBUILD
=====================================
@@ -6,11 +6,11 @@
pkgname=openscad
pkgver=2021.01
-pkgrel=11
+pkgrel=12
pkgdesc='The programmers solid 3D CAD modeller'
arch=('x86_64')
url='https://openscad.org'
-license=('GPL2')
+license=('GPL-2.0-or-later')
depends=(
'glibc'
'gcc-libs'
@@ -53,19 +53,14 @@ checkdepends=(
'xorg-server-xvfb'
'python'
)
-_commit='41f58fe57c03457a3a8b4dc541ef5654ec3e8c78'
source=(
- "$pkgname::git+https://github.com/openscad/openscad#commit=$_commit";
+ "$pkgname::git+https://github.com/openscad/openscad#tag=openscad-$pkgver";
"github.com-openscad-MCAD::git+https://github.com/openscad/MCAD";
+ "boost-1.86.patch"
)
-b2sums=('SKIP'
- 'SKIP')
-
-pkgver() {
- cd "$pkgname"
-
- git describe --tags | sed 's/^openscad-//'
-}
+b2sums=('077aeeeb7b43c69337793dd7543c179234c6f08ff6ef6c67b36bdeaa0be44fb5acb86574447d0a6b9c3f266fcf844d5cc355e76c84383975643da9e8c84c750d'
+ 'SKIP'
+
'767d9a9d666d3c8a28ff0a8d8355124cf3518388672d27cb4511ec6f990f8fafe55ad16e4f7c1c2491aebc489421b711f3d8eca6ff74f370ad82abb6f205cc84')
prepare() {
cd "$pkgname"
@@ -91,6 +86,9 @@ prepare() {
# fix boost join
git cherry-pick --no-commit 08bf69b4115c989fc5671254e0d05735d01bcca5
+ # boost 1.86 compatibility
+ patch -Np1 -i "$srcdir/boost-1.86.patch"
+
# prepare git submodule(s) - required for running tests
git submodule init libraries/MCAD
git config submodule.libraries/MCAD.url "$srcdir/github.com-openscad-MCAD"
=====================================
boost-1.86.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/src/FileModule.cc b/src/FileModule.cc
+index ce57b1fac..71e343cd7 100644
+--- a/src/FileModule.cc
++++ b/src/FileModule.cc
+@@ -65,7 +65,7 @@ void FileModule::registerUse(const std::string path, const
Location &loc)
+ auto ext = fs::path(path).extension().generic_string();
+
+ if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
+- if (fs::is_regular(path)) {
++ if (fs::is_regular_file(path)) {
+ FontCache::instance()->register_font_file(path);
+ } else {
+ LOG(message_group::Error,Location::NONE,"","Can't read
font with path '%1$s'",path);
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/openscad/-/commit/922ed129b1bfe386baaf5d419c2d85fe96bab67b
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/openscad/-/commit/922ed129b1bfe386baaf5d419c2d85fe96bab67b
You're receiving this email because of your account on gitlab.archlinux.org.
