[arch-commits] Commit in openscad/repos/community-x86_64 (5 files)

Kyle Keen kkeen at archlinux.org
Wed Apr 14 09:57:44 UTC 2021


    Date: Wednesday, April 14, 2021 @ 09:57:43
  Author: kkeen
Revision: 918372

archrelease: copy trunk to community-x86_64

Added:
  openscad/repos/community-x86_64/CHANGELOG
    (from rev 918371, openscad/trunk/CHANGELOG)
  openscad/repos/community-x86_64/PKGBUILD
    (from rev 918371, openscad/trunk/PKGBUILD)
Deleted:
  openscad/repos/community-x86_64/CHANGELOG
  openscad/repos/community-x86_64/PKGBUILD
  openscad/repos/community-x86_64/openscad-boost-1.74.patch

---------------------------+
 CHANGELOG                 |  370 ++++++++++++++++++++++----------------------
 PKGBUILD                  |  124 +++++++-------
 openscad-boost-1.74.patch |   28 ---
 3 files changed, 247 insertions(+), 275 deletions(-)

Deleted: CHANGELOG
===================================================================
--- CHANGELOG	2021-04-14 09:57:27 UTC (rev 918371)
+++ CHANGELOG	2021-04-14 09:57:43 UTC (rev 918372)
@@ -1,183 +0,0 @@
-2020-05-14 Kyle Keen <keenerd at 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 at gmail.com>
-	* 2019.05-4
-	- build with lib3mf-1 (FS#64355)
-
-2019-10-22 Kyle Keen <keenerd at 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 at gmail.com>
-	* 2019.05-1
-	- New release!
-
-2018-02-07 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-15
-	- Switch to Qt5
-
-2017-12-27 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-14
-	- Rebuild for boost 1.66.0
-
-2017-09-10 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-13
-	- Rebuild for boost 1.65.1
-
-2017-08-03 felixonmars <felixonmars at gmail.com>
-	* 2015.03.03-12
-	- Rebuild for GLEW 2.1.0 rebuild
-
-2017-05-30 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-11
-	- Rebuild for cgal 4.10
-
-2017-05-22 Antonio Rojas <arojas at archlinux.org>
-	* 2015.03.03-10
-	- Rebuild for boost 1.64
-
-2017-02-25 Antonio Rojas <arojas at archlinux.org>
-	* 2015.03.03-9
-	- Rebuild for qscintilla 2.10
-
-2017-01-02 Antonio Rojas <arojas at archlinux.org>
-	* 2015.03.03-8
-	- Rebuild for boost 1.63
-
-2016-10-08 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-7
-	- Rebuild for boost 1.62
-
-2016-09-20 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-6
-	- Rebuild for cgal 4.9
-
-2016-08-24 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-5
-	- Rebuild for boost 1.61
-
-2016-08-01 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-4
-	- Rebuild for glew
-
-2016-05-12 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-3
-	- Rebuild for boost-1.60.0-5
-
-2016-04-28 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-2
-	- Rebuild for install hooks
-
-2015-04-18 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.03-1
-	- Update to latest release
-	- Rebuild for cgal-4.8
-
-2015-11-16 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.02-1
-	- Bugfix release
-
-2015-10-19 Kyle Keen <keenerd at 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 at gmail.com>
-	* 2015.03.01-3
-	- No changes
-	- Rebuild for qscintilla-2.9-1
-
-2015-04-22 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.01-2
-	- No changes
-	- Rebuild for boost-1.58.0-1
-
-2015-04-22 Kyle Keen <keenerd at gmail.com>
-	* 2015.03.01-1
-	- Bugfix release
-
-2015-04-11 Kyle Keen <keenerd at gmail.com>
-	* 2015.03-2
-	- No changes
-	- Rebuild for cgal-4.6-1
-
-2015-03-10 Kyle Keen <keenerd at gmail.com>
-	* 2015.03-1
-	- New release
-	- Now uses qscintilla for the editor
-
-2014-11-04 Kyle Keen <keenerd at gmail.com>
-	* 2014.03-5
-	- No changes
-	- Rebuild for boost-1.57.0-1
-
-2014-08-18 Kyle Keen <keenerd at gmail.com>
-	* 2014.03-4
-	- No changes
-	- Rebuild for boost-1.56.0-1
-
-2014-08-18 Kyle Keen <keenerd at gmail.com>
-	* 2014.03-3
-	- No changes
-	- Rebuild for glew-1.11.0-1
-
-2014-08-12 Kyle Keen <keenerd at gmail.com>
-	* 2014.03-2
-	- No changes
-	- Rebuild for boost-1.56.0-1
-
-2014-03-09 Kyle Keen <keenerd at gmail.com>
-
-	* 2014.03-1
-	- New release
-	- MIME associations
-
-2014-02-10 Kyle Keen <keenerd at gmail.com>
-
-	* 2013.06-3
-	- Moved package to [community]
-	- Explicit boost depends
-	- Use official resources
-
-2014-02-07 Chirantan Ekbote <chirantan.ekbote at gmail.com>
-
-	* 2013.06-2
-	- Update makedepends since eigen3 has now become eigen in [extra]
-
-2013-06-19 Chirantan Ekbote <chirantan.ekbote at gmail.com>
-
-	* 2013.06-1 :
-	- Updated to version 2013.06
-
-2013-03-01 Chirantan Ekbote <chirantan.ekbote at gmail.com>
-
-	* 2013.01-2 :
-	Dependency qt replaced with qt4
-
-2013-01-23 Chirantan Ekbote <chirantan.ekbote at gmail.com>
-
-	* 2013.01-1 :
-	New upstream release.
-	Dependency eigen2 repaced by eigen3

Copied: openscad/repos/community-x86_64/CHANGELOG (from rev 918371, openscad/trunk/CHANGELOG)
===================================================================
--- CHANGELOG	                        (rev 0)
+++ CHANGELOG	2021-04-14 09:57:43 UTC (rev 918372)
@@ -0,0 +1,187 @@
+2021-04-14 Kyle Keen <keenerd at gmail.com>
+	* 2021.01-1
+	- New release!
+
+2020-05-14 Kyle Keen <keenerd at 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 at gmail.com>
+	* 2019.05-4
+	- build with lib3mf-1 (FS#64355)
+
+2019-10-22 Kyle Keen <keenerd at 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 at gmail.com>
+	* 2019.05-1
+	- New release!
+
+2018-02-07 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-15
+	- Switch to Qt5
+
+2017-12-27 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-14
+	- Rebuild for boost 1.66.0
+
+2017-09-10 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-13
+	- Rebuild for boost 1.65.1
+
+2017-08-03 felixonmars <felixonmars at gmail.com>
+	* 2015.03.03-12
+	- Rebuild for GLEW 2.1.0 rebuild
+
+2017-05-30 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-11
+	- Rebuild for cgal 4.10
+
+2017-05-22 Antonio Rojas <arojas at archlinux.org>
+	* 2015.03.03-10
+	- Rebuild for boost 1.64
+
+2017-02-25 Antonio Rojas <arojas at archlinux.org>
+	* 2015.03.03-9
+	- Rebuild for qscintilla 2.10
+
+2017-01-02 Antonio Rojas <arojas at archlinux.org>
+	* 2015.03.03-8
+	- Rebuild for boost 1.63
+
+2016-10-08 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-7
+	- Rebuild for boost 1.62
+
+2016-09-20 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-6
+	- Rebuild for cgal 4.9
+
+2016-08-24 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-5
+	- Rebuild for boost 1.61
+
+2016-08-01 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-4
+	- Rebuild for glew
+
+2016-05-12 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-3
+	- Rebuild for boost-1.60.0-5
+
+2016-04-28 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-2
+	- Rebuild for install hooks
+
+2015-04-18 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.03-1
+	- Update to latest release
+	- Rebuild for cgal-4.8
+
+2015-11-16 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.02-1
+	- Bugfix release
+
+2015-10-19 Kyle Keen <keenerd at 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 at gmail.com>
+	* 2015.03.01-3
+	- No changes
+	- Rebuild for qscintilla-2.9-1
+
+2015-04-22 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.01-2
+	- No changes
+	- Rebuild for boost-1.58.0-1
+
+2015-04-22 Kyle Keen <keenerd at gmail.com>
+	* 2015.03.01-1
+	- Bugfix release
+
+2015-04-11 Kyle Keen <keenerd at gmail.com>
+	* 2015.03-2
+	- No changes
+	- Rebuild for cgal-4.6-1
+
+2015-03-10 Kyle Keen <keenerd at gmail.com>
+	* 2015.03-1
+	- New release
+	- Now uses qscintilla for the editor
+
+2014-11-04 Kyle Keen <keenerd at gmail.com>
+	* 2014.03-5
+	- No changes
+	- Rebuild for boost-1.57.0-1
+
+2014-08-18 Kyle Keen <keenerd at gmail.com>
+	* 2014.03-4
+	- No changes
+	- Rebuild for boost-1.56.0-1
+
+2014-08-18 Kyle Keen <keenerd at gmail.com>
+	* 2014.03-3
+	- No changes
+	- Rebuild for glew-1.11.0-1
+
+2014-08-12 Kyle Keen <keenerd at gmail.com>
+	* 2014.03-2
+	- No changes
+	- Rebuild for boost-1.56.0-1
+
+2014-03-09 Kyle Keen <keenerd at gmail.com>
+
+	* 2014.03-1
+	- New release
+	- MIME associations
+
+2014-02-10 Kyle Keen <keenerd at gmail.com>
+
+	* 2013.06-3
+	- Moved package to [community]
+	- Explicit boost depends
+	- Use official resources
+
+2014-02-07 Chirantan Ekbote <chirantan.ekbote at gmail.com>
+
+	* 2013.06-2
+	- Update makedepends since eigen3 has now become eigen in [extra]
+
+2013-06-19 Chirantan Ekbote <chirantan.ekbote at gmail.com>
+
+	* 2013.06-1 :
+	- Updated to version 2013.06
+
+2013-03-01 Chirantan Ekbote <chirantan.ekbote at gmail.com>
+
+	* 2013.01-2 :
+	Dependency qt replaced with qt4
+
+2013-01-23 Chirantan Ekbote <chirantan.ekbote at gmail.com>
+
+	* 2013.01-1 :
+	New upstream release.
+	Dependency eigen2 repaced by eigen3

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-14 09:57:27 UTC (rev 918371)
+++ PKGBUILD	2021-04-14 09:57:43 UTC (rev 918372)
@@ -1,64 +0,0 @@
-# Maintainer: Kyle Keen <keenerd at 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=2019.05
-pkgrel=9
-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'
-         'shared-mime-info' 'libzip' 'qt5-multimedia' 'libspnav'
-         'lib3mf-1' 'nettle')
-makedepends=('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')
-source=("https://files.openscad.org/openscad-$pkgver.src.tar.gz"{,.asc}
-        $pkgname-boost-1.72.patch::https://github.com/openscad/openscad/commit/b6c170cc5d.patch
-        openscad-boost-1.74.patch)
-md5sums=('2b63e249d56e2eba62ed5b042e1d82bc'
-         'SKIP'
-         '7a4a1eb8c5bf29448bc94c1d936c0ee8'
-         '6803146fcbd4405e1ee40258af1dccb7')
-
-prepare() {
-    cd "$srcdir/$pkgname-$pkgver"
-    patch -Np1 -i ../$pkgname-boost-1.72.patch
-    patch -Np1 -i ../$pkgname-boost-1.74.patch
-}
-
-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"
-}
-
-check() {
-    # see doc/testing.txt about enabling
-    # normally will display stuff, run image diffs
-    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
-}
-
-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"
-}

Copied: openscad/repos/community-x86_64/PKGBUILD (from rev 918371, openscad/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-04-14 09:57:43 UTC (rev 918372)
@@ -0,0 +1,60 @@
+# Maintainer: Kyle Keen <keenerd at 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=1
+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'
+         'shared-mime-info' 'libzip' 'qt5-multimedia' 'libspnav'
+         'lib3mf-1' 'nettle')
+makedepends=('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})
+md5sums=('79f8e3a42bcfeeb3ddde9e5bc2311f76'
+         'SKIP')
+
+prepare() {
+    cd "$srcdir/$pkgname-$pkgver"
+}
+
+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"
+}
+
+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
+}
+
+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"
+}

Deleted: openscad-boost-1.74.patch
===================================================================
--- openscad-boost-1.74.patch	2021-04-14 09:57:27 UTC (rev 918371)
+++ openscad-boost-1.74.patch	2021-04-14 09:57:43 UTC (rev 918372)
@@ -1,28 +0,0 @@
-From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl at gmail.com>
-Date: Fri, 15 May 2020 19:09:10 +0200
-Subject: [PATCH] Fix build with boost-1.73
-
-Thanks to William T Wilson for reporting and providing the patch.
-
-Signed-off-by: Bernd Waibel <waebbl at gmail.com>
----
- src/import.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/import.cc b/src/import.cc
-index eef1323..08e46ff 100644
---- a/src/import.cc
-+++ b/src/import.cc
-@@ -50,7 +50,7 @@ namespace fs = boost::filesystem;
- #include <boost/assign/std/vector.hpp>
- using namespace boost::assign; // bring 'operator+=()' into scope
- 
--#include <boost/detail/endian.hpp>
-+#include <boost/endian/arithmetic.hpp>
- #include <cstdint>
- 
- extern PolySet * import_amf(std::string, const Location &loc);
--- 
-2.26.2
-



More information about the arch-commits mailing list