[arch-commits] Commit in openscad/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Tuesday, March 15, 2022 @ 23:34:36
  Author: archange
Revision: 1155239

upgpkg: openscad 2021.01-4

Switch to headers-only cgal.
Includes bringing all upstream commits that were backported to release branch.

Modified:
  openscad/trunk/PKGBUILD

----------+
 PKGBUILD |   35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-15 23:33:33 UTC (rev 1155238)
+++ PKGBUILD	2022-03-15 23:34:36 UTC (rev 1155239)
@@ -4,27 +4,50 @@
 # Contributor: Pierre DOUCET <pierre at equinoxefr.org>
 pkgname=openscad
 pkgver=2021.01
-pkgrel=3
+pkgrel=4
 pkgdesc="The programmers solid 3D CAD modeller"
 url="http://openscad.org/"
 arch=('x86_64')
 license=('GPL2')
 changelog=CHANGELOG
-depends=('qt5-base' 'qscintilla-qt5' 'cgal' 'opencsg' 'boost-libs'
+depends=('qt5-base' 'qscintilla-qt5' 'opencsg' 'boost-libs'
          'shared-mime-info' 'libzip' 'qt5-multimedia' 'libspnav'
-         'lib3mf-1' 'nettle')
-makedepends=('eigen' 'boost' 'imagemagick')
+         'lib3mf-1' 'nettle' 'mpfr')
+makedepends=('cgal' 'eigen' 'boost' 'imagemagick')
 # full tests need imagemagick and an X11 or framebuffer session
 # can't find lib3MF from libsavitar?
 checkdepends=('cmake' 'xorgproto' 'libx11' 'python')
 validpgpkeys=('E2EBDADD336FF516ADD51A78F3E12CCC22164A0F'
               'B3C94B4250DC097E9FFF81778AF822A975097442')
-source=("https://files.openscad.org/openscad-$pkgver.src.tar.gz"{,.asc})
+source=("https://files.openscad.org/openscad-$pkgver.src.tar.gz"{,.asc}
+        ${pkgname}-CVE-2022-0496.patch::https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41.patch
+        ${pkgname}-CVE-2022-0497.patch::https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch
+        ${pkgname}-undefine-boost-libintl.patch::https://github.com/openscad/openscad/commit/4c5d19c302d7d440d1c11c3d02b3ce5eb2e548da.patch
+        ${pkgname}-fix-cgal5.3.patch::https://github.com/openscad/openscad/commit/9aa0d7e9f2914fe5f547bdde69202161d1c6064d.patch
+        ${pkgname}-fix-boost-x32-x64.patch::https://github.com/openscad/openscad/commit/c50837d597a17b5d4cd8c7ed8e09cb07edb98a6f.patch
+        ${pkgname}-fix-cgal5.4.patch::https://github.com/openscad/openscad/commit/abfebc651343909b534ef337aacc7604c99cf0ea.patch
+        ${pkgname}-fix-boost-join.patch::https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5.patch)
 md5sums=('79f8e3a42bcfeeb3ddde9e5bc2311f76'
-         'SKIP')
+         'SKIP'
+         '0e167b71226a710579952b5615f92197'
+         'e20293c1622d7f92dcf3345d41932546'
+         '9a4f85bf85a85d8208d716e69469cbce'
+         '3ddcfeaadf03731f65e3567b59789919'
+         '3534172852255788e283789d7ca33a0c'
+         '3bec8ba891cb62751429ab9592c6d50e'
+         'ff10e30e6cea3c432280afff86f08425')
 
 prepare() {
     cd "$srcdir/$pkgname-$pkgver"
+    patch -p1 < ../${pkgname}-CVE-2022-0496.patch
+    patch -p1 < ../${pkgname}-CVE-2022-0497.patch
+    patch -p1 < ../${pkgname}-undefine-boost-libintl.patch
+    patch -p1 < ../${pkgname}-fix-cgal5.3.patch
+    patch -p1 < ../${pkgname}-fix-boost-x32-x64.patch
+    patch -p1 < ../${pkgname}-fix-cgal5.4.patch
+    patch -p1 < ../${pkgname}-fix-boost-join.patch
+    # CGAL 5.4 compatibility
+    sed -i "s|CGAL_VERSION_NR < 1050401000|CGAL_VERSION_NR < CGAL_VERSION_NUMBER(5, 4, 0)|" src/cgalutils-tess.cc
 }
 
 build() {