git » openscad.git » commit df26560

upgpkg: 2021.01-10

author George Rawlinson
2023-10-12 03:14:35 UTC
committer George Rawlinson
2023-10-12 03:14:35 UTC
parent a6bae787b98d4c56397d220102f4a9a8a4a90f93

upgpkg: 2021.01-10

* Switch to lib3mf from lib3mf-1.

.SRCINFO +47 -0
PKGBUILD +7 -2

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 0000000..a254ba9
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,47 @@
+pkgbase = openscad
+	pkgdesc = The programmers solid 3D CAD modeller
+	pkgver = 2021.01
+	pkgrel = 10
+	url = https://openscad.org
+	arch = x86_64
+	license = GPL2
+	checkdepends = cmake
+	checkdepends = xorgproto
+	checkdepends = xorg-server-xvfb
+	checkdepends = python
+	makedepends = git
+	makedepends = cgal
+	makedepends = eigen
+	makedepends = boost
+	makedepends = imagemagick
+	depends = glibc
+	depends = gcc-libs
+	depends = glib2
+	depends = freetype2
+	depends = fontconfig
+	depends = harfbuzz
+	depends = libx11
+	depends = libglvnd
+	depends = glu
+	depends = gmp
+	depends = double-conversion
+	depends = glew
+	depends = libxml2
+	depends = cairo
+	depends = qt5-base
+	depends = qscintilla-qt5
+	depends = opencsg
+	depends = boost-libs
+	depends = libzip
+	depends = qt5-multimedia
+	depends = libspnav
+	depends = lib3mf
+	depends = nettle
+	depends = mpfr
+	depends = hicolor-icon-theme
+	source = openscad::git+https://github.com/openscad/openscad#commit=41f58fe57c03457a3a8b4dc541ef5654ec3e8c78
+	source = github.com-openscad-MCAD::git+https://github.com/openscad/MCAD
+	b2sums = SKIP
+	b2sums = SKIP
+
+pkgname = openscad
diff --git a/PKGBUILD b/PKGBUILD
index 200a76a..887a9dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=openscad
 pkgver=2021.01
-pkgrel=9
+pkgrel=10
 pkgdesc='The programmers solid 3D CAD modeller'
 arch=('x86_64')
 url='https://openscad.org'
@@ -33,7 +33,7 @@ depends=(
   'libzip'
   'qt5-multimedia'
   'libspnav'
-  'lib3mf-1'
+  'lib3mf'
   'nettle'
   'mpfr'
   'hicolor-icon-theme'
@@ -100,6 +100,11 @@ prepare() {
 build() {
   cd "$pkgname"
 
+  # https://github.com/openscad/openscad/commit/426e71260e2ac178289c30eb1a228912d07c5b16
+  export LIB3MF_INCLUDEPATH="/usr/include/lib3mf/Bindings/Cpp"
+
+  # cmake scripts have no install instructions as of ver 2021.01,
+  # so let's wait until using cmake for building
   qmake-qt5 PREFIX="/usr"
 
   make