| author | George Rawlinson
<grawlinson@archlinux.org> 2023-06-08 08:25:29 UTC |
| committer | George Rawlinson
<grawlinson@archlinux.org> 2023-06-08 08:25:29 UTC |
| parent | dae1512872eacb1ec2cacb29062b6471d91e7bfe |
| CHANGELOG | +0 | -187 |
| PKGBUILD | +126 | -62 |
| keys/pgp/B3C94B4250DC097E9FFF81778AF822A975097442.asc | +0 | -99 |
| keys/pgp/E2EBDADD336FF516ADD51A78F3E12CCC22164A0F.asc | +0 | -51 |
diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 940d812..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,187 +0,0 @@ -2021-04-14 Kyle Keen <keenerd@gmail.com> - * 2021.01-1 - - New release! - -2020-05-14 Kyle Keen <keenerd@gmail.com> - * 2019.05-7 - - explicitly depend on nettle to fix headless installs - -2020-04-25 foutrelis - * 2019.05-6 - - glew 2.2.0 rebuild - -2020-01-27 felixonmars - * 2019.05-5 - - boost 1.72.0 rebuild - -2020-01-27 foutrelis - * 2019.05-4 - - Update checkdepends: xproto -> xorgproto - -2019-11-20 Kyle Keen <keenerd@gmail.com> - * 2019.05-4 - - build with lib3mf-1 (FS#64355) - -2019-10-22 Kyle Keen <keenerd@gmail.com> - * 2019.05-3 - - build with libspnav - -2019-09-13 Felix Yan - * 2019.05-2 - - Rebuild for boost 1.71.0 - -2019-05-14 Kyle Keen <keenerd@gmail.com> - * 2019.05-1 - - New release! - -2018-02-07 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-15 - - Switch to Qt5 - -2017-12-27 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-14 - - Rebuild for boost 1.66.0 - -2017-09-10 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-13 - - Rebuild for boost 1.65.1 - -2017-08-03 felixonmars <felixonmars@gmail.com> - * 2015.03.03-12 - - Rebuild for GLEW 2.1.0 rebuild - -2017-05-30 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-11 - - Rebuild for cgal 4.10 - -2017-05-22 Antonio Rojas <arojas@archlinux.org> - * 2015.03.03-10 - - Rebuild for boost 1.64 - -2017-02-25 Antonio Rojas <arojas@archlinux.org> - * 2015.03.03-9 - - Rebuild for qscintilla 2.10 - -2017-01-02 Antonio Rojas <arojas@archlinux.org> - * 2015.03.03-8 - - Rebuild for boost 1.63 - -2016-10-08 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-7 - - Rebuild for boost 1.62 - -2016-09-20 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-6 - - Rebuild for cgal 4.9 - -2016-08-24 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-5 - - Rebuild for boost 1.61 - -2016-08-01 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-4 - - Rebuild for glew - -2016-05-12 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-3 - - Rebuild for boost-1.60.0-5 - -2016-04-28 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-2 - - Rebuild for install hooks - -2015-04-18 Kyle Keen <keenerd@gmail.com> - * 2015.03.03-1 - - Update to latest release - - Rebuild for cgal-4.8 - -2015-11-16 Kyle Keen <keenerd@gmail.com> - * 2015.03.02-1 - - Bugfix release - -2015-10-19 Kyle Keen <keenerd@gmail.com> - * 2015.03.01-5 - - No changes - - Rebuild for cgal-4.7 - -2015-10-02 foutrelis - * 2015.03.01-4 - - No changes - -2015-04-29 Kyle Keen <keenerd@gmail.com> - * 2015.03.01-3 - - No changes - - Rebuild for qscintilla-2.9-1 - -2015-04-22 Kyle Keen <keenerd@gmail.com> - * 2015.03.01-2 - - No changes - - Rebuild for boost-1.58.0-1 - -2015-04-22 Kyle Keen <keenerd@gmail.com> - * 2015.03.01-1 - - Bugfix release - -2015-04-11 Kyle Keen <keenerd@gmail.com> - * 2015.03-2 - - No changes - - Rebuild for cgal-4.6-1 - -2015-03-10 Kyle Keen <keenerd@gmail.com> - * 2015.03-1 - - New release - - Now uses qscintilla for the editor - -2014-11-04 Kyle Keen <keenerd@gmail.com> - * 2014.03-5 - - No changes - - Rebuild for boost-1.57.0-1 - -2014-08-18 Kyle Keen <keenerd@gmail.com> - * 2014.03-4 - - No changes - - Rebuild for boost-1.56.0-1 - -2014-08-18 Kyle Keen <keenerd@gmail.com> - * 2014.03-3 - - No changes - - Rebuild for glew-1.11.0-1 - -2014-08-12 Kyle Keen <keenerd@gmail.com> - * 2014.03-2 - - No changes - - Rebuild for boost-1.56.0-1 - -2014-03-09 Kyle Keen <keenerd@gmail.com> - - * 2014.03-1 - - New release - - MIME associations - -2014-02-10 Kyle Keen <keenerd@gmail.com> - - * 2013.06-3 - - Moved package to [community] - - Explicit boost depends - - Use official resources - -2014-02-07 Chirantan Ekbote <chirantan.ekbote@gmail.com> - - * 2013.06-2 - - Update makedepends since eigen3 has now become eigen in [extra] - -2013-06-19 Chirantan Ekbote <chirantan.ekbote@gmail.com> - - * 2013.06-1 : - - Updated to version 2013.06 - -2013-03-01 Chirantan Ekbote <chirantan.ekbote@gmail.com> - - * 2013.01-2 : - Dependency qt replaced with qt4 - -2013-01-23 Chirantan Ekbote <chirantan.ekbote@gmail.com> - - * 2013.01-1 : - New upstream release. - Dependency eigen2 repaced by eigen3 diff --git a/PKGBUILD b/PKGBUILD index f37d9d6..a93bf47 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,83 +1,147 @@ -# Maintainer: Kyle Keen <keenerd@gmail.com> +# Maintainer: George Rawlinson <grawlinson@archlinux.org> +# Contributor: Kyle Keen <keenerd@gmail.com> # Contributor: Chirantan Ekbote <chirantan.ekbote at gmail.com> # Contributor: Eric Anderson <ejona86 at gmail.com> # Contributor: Pierre DOUCET <pierre at equinoxefr.org> + pkgname=openscad pkgver=2021.01 -pkgrel=7 -pkgdesc="The programmers solid 3D CAD modeller" -url="http://openscad.org/" +pkgrel=8 +pkgdesc='The programmers solid 3D CAD modeller' arch=('x86_64') +url='https://openscad.org' license=('GPL2') -changelog=CHANGELOG -depends=('qt5-base' 'qscintilla-qt5' 'opencsg' 'boost-libs' - 'shared-mime-info' 'libzip' 'qt5-multimedia' 'libspnav' - 'lib3mf-1' 'nettle' 'mpfr') -makedepends=('cgal' 'eigen' 'boost' 'imagemagick') +depends=( + 'glibc' + 'gcc-libs' + 'glib2' + 'freetype2' + 'fontconfig' + 'harfbuzz' + 'libx11' + 'libglvnd' + 'glu' + 'gmp' + 'double-conversion' + 'glew' + 'libxml2' + 'cairo' + 'qt5-base' + 'qscintilla-qt5' + 'opencsg' + 'boost-libs' + 'libzip' + 'qt5-multimedia' + 'libspnav' + 'lib3mf-1' + 'nettle' + 'mpfr' + 'hicolor-icon-theme' +) +makedepends=( + 'git' + '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} - ${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) -sha256sums=('d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359' - 'SKIP' - '0f5cc845bd1d5d9a5071790632e0c04443e88002226b83c293d3d7f8e4f5b41e' - '534090a54afbeaabd9ae3cce97104fc16533ef8aa5cf939a97a3825d7e01409a' - 'f087ff823b617a7e50efea7bfe3e8136eed5b435bcc53d7898af5ceae1f0dbf6' - 'ea38e409a8fff9582684e4ec4a5dab2cb5754a7ca4598155e1730620c9f6bafe' - '694464532310c16c7c29900ca369860a6e52ee81b1561fb83f745a5ef5f3486d' - '836626d08bd8dcce496bd2db0a73ae1911915388c412dc63d831d40ae1aa9206' - '583783a6ecb2fe7d23b37bc5e29c6c705065748a6993908ff28ad61b10190ce7') +checkdepends=( + 'cmake' + 'xorgproto' + 'xorg-server-xvfb' + 'python' +) +_commit='41f58fe57c03457a3a8b4dc541ef5654ec3e8c78' +source=( + "$pkgname::git+https://github.com/openscad/openscad#commit=$_commit" + "github.com-openscad-MCAD::git+https://github.com/openscad/MCAD" +) +b2sums=('SKIP' + 'SKIP') + +pkgver() { + cd "$pkgname" + + git describe --tags | sed 's/^openscad-//' +} 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 + cd "$pkgname" + + # CVE-2022-0496 + git cherry-pick --no-commit 00a4692989c4e2f191525f73f24ad8727bacdf41 + + # CVE-2022-0497 + git cherry-pick --no-commit 84addf3c1efbd51d8ff424b7da276400bbfa1a4b + + # undefine boost libintl + git cherry-pick --no-commit 4c5d19c302d7d440d1c11c3d02b3ce5eb2e548da + + # fix CGAL 5.3 + git cherry-pick --no-commit 9aa0d7e9f2914fe5f547bdde69202161d1c6064d + + # fix boost x32-x64 + git cherry-pick --no-commit c50837d597a17b5d4cd8c7ed8e09cb07edb98a6f + + # fix CGAL 5.4 + git cherry-pick --no-commit abfebc651343909b534ef337aacc7604c99cf0ea + + # fix boost join + git cherry-pick --no-commit 08bf69b4115c989fc5671254e0d05735d01bcca5 + + # prepare git submodule(s) - required for running tests + git submodule init libraries/MCAD + git config submodule.libraries/MCAD.url "$srcdir/github.com-openscad-MCAD" + git -c protocol.file.allow=always submodule update libraries/MCAD } build() { - cd "$srcdir/$pkgname-$pkgver" - qmake-qt5 PREFIX="/usr" - make - convert +set date:create +set date:modify "icons/$pkgname.png" -resize 128x128\> "icons/$pkgname-128.png" + cd "$pkgname" + + qmake-qt5 PREFIX="/usr" + + make } check() { - # see doc/testing.txt about enabling - # normally will display stuff, run image diffs - return 0 - cd "$srcdir/$pkgname-$pkgver/tests" - sed -i 's/exit 1/exit 0/' virtualfb.sh - cmake . - # pkgconfig weirdness - #sed -i 's/-lmpfr/& -lX11/' CMakeFiles/openscad_nogui.dir/link.txt - make - echo "Running headless tests..." - ctest -R 'dumptest|csgtexttest|csgtermtest|openscad-nonascii|openscad-override' - # echotest is buggy on i686, check again next release + cd "$pkgname/tests" + + cmake . + + make + + echo "Running headless tests…" + + xvfb-run ctest \ + -R 'dumptest|csgtexttest|csgtermtest|openscad-nonascii|openscad-override' \ + -E 'astdumptest_allexpressions' } package() { - cd "$srcdir/$pkgname-$pkgver" - make INSTALL_ROOT="$pkgdir" install - # can't remove earlier, py files needed for tests - rm "$pkgdir/usr/share/openscad/libraries/MCAD/"*.py - install -Dm644 "icons/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "icons/$pkgname-128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "icons/$pkgname.xml" "$pkgdir/usr/share/mime/packages/$pkgname.xml" + cd "$pkgname" + + make INSTALL_ROOT="$pkgdir" install + + # desktop file + install -Dm644 "icons/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + + # application icons + for i in 48 64 128 256 512; do + install -vDm644 "icons/$pkgname-${i}.png" "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" + done + + # add mime info (*.scad) + install -Dm644 "icons/$pkgname.xml" "$pkgdir/usr/share/mime/packages/$pkgname.xml" + + # remove unnecessary files + cd "$pkgdir/usr/share/$pkgname" + rm -rf libraries/MCAD/.git* + + # remove leftover files from tests (must be removed *after* tests are run) + rm -rf libraries/MCAD/*.py + + # remove bundled ttf-liberation + rm -rf fonts } diff --git a/keys/pgp/B3C94B4250DC097E9FFF81778AF822A975097442.asc b/keys/pgp/B3C94B4250DC097E9FFF81778AF822A975097442.asc deleted file mode 100644 index 6d40722..0000000 --- a/keys/pgp/B3C94B4250DC097E9FFF81778AF822A975097442.asc +++ /dev/null @@ -1,99 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -tqDN/MVll8qge5hPt7hTo80BdXhVQA== -=OpCd ------END PGP PUBLIC KEY BLOCK----- diff --git a/keys/pgp/E2EBDADD336FF516ADD51A78F3E12CCC22164A0F.asc b/keys/pgp/E2EBDADD336FF516ADD51A78F3E12CCC22164A0F.asc deleted file mode 100644 index 6770c32..0000000 --- a/keys/pgp/E2EBDADD336FF516ADD51A78F3E12CCC22164A0F.asc +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=LMs2 ------END PGP PUBLIC KEY BLOCK-----