Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d1fe051464c80dce5ad8f81b640bb1422d3c541d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d1fe051464c80dce5ad8f81b640bb1422d3c541d)
  • Date: Tue, 17 Jan 2023 15:57:44 +0000

GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:

graphics-libs/opencsg/DETAILS | 6 -
graphics-libs/opencsg/HISTORY | 3
libs/double-conversion/DETAILS | 4 -
libs/double-conversion/HISTORY | 3
science-libs/lib3mf/DETAILS | 4 -
science-libs/lib3mf/HISTORY | 3
science/cgal/DETAILS | 11 +--
science/cgal/HISTORY | 3
science/openscad/DETAILS | 2
science/openscad/HISTORY | 9 ++
science/openscad/PRE_BUILD | 6 +
science/openscad/patches/0000-CVE-2022-0497.patch | 27 +++++++
science/openscad/patches/0001-CVE-2022-0496.patch | 76
+++++++++++++++++++++
science/openscad/patches/0002-fix-cgal-5.3.patch | 47 ++++++++++++
science/openscad/patches/0003-fix-cgal-5.4.patch | 38 ++++++++++
science/openscad/patches/0004-fix-boost-join.patch | 62 +++++++++++++++++
utils/acpid2/HISTORY | 1
utils/fwupd/DETAILS | 4 -
utils/fwupd/HISTORY | 3
x11-toolkits/qscintilla/BUILD | 8 --
x11-toolkits/qscintilla/DETAILS | 8 +-
x11-toolkits/qscintilla/HISTORY | 4 +
x11-toolkits/qscintilla/PRE_SUB_DEPENDS | 4 -
x11-toolkits/qscintilla/SUB_DEPENDS | 6 -
24 files changed, 306 insertions(+), 36 deletions(-)

New commits:
commit d1fe051464c80dce5ad8f81b640bb1422d3c541d
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

x11-toolkits/qscintilla: version 2.13.3

commit ff4638b0388c44498934ecaaba51cfac17f7cd2d
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/acpid2: add missing HISTORY entry

commit 2cbee506a7f5da0754da5fcc697a0206358ed516
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

science/openscad: fix CVE-2022-049{6,7}

commit db301a7816737952a5cd84ce273cdaf0ac8fa46f
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

science-libs/lib3mf: version 2.2.0

commit d7e5668a2932272c41c445639989e45fef223189
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

libs/double-conversion: version 3.2.1

commit 83fe4501e1a9e6abd532dc85f523ac5d4e9ea200
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

graphics-libs/opencsg: version 1.5.1

commit 099ed1eb7b1db924eeca31bb5ca25c1aa08406d5
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

science/cgal: version 5.5.1

commit 606c8fb6b8140b8744631c93289187b59909b4f1
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/fwupd: version 1.8.9

diff --git a/graphics-libs/opencsg/DETAILS b/graphics-libs/opencsg/DETAILS
index 3a9a68e..586da6b 100755
--- a/graphics-libs/opencsg/DETAILS
+++ b/graphics-libs/opencsg/DETAILS
@@ -1,8 +1,8 @@
SPELL=opencsg
- VERSION=1.4.2
+ VERSION=1.5.1
SOURCE="OpenCSG-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.${SPELL}.org/${SOURCE}
-
SOURCE_HASH=sha512:fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
+ SOURCE_URL[0]=https://www.${SPELL}.org/${SOURCE}
+
SOURCE_HASH=sha512:aef3e785e730fd8f2ee06719d1c7a57c105e7432fb4dc6f4ad4305aabf1c7d4438ef869ae4eb840dc272b35f20c4ff296e6dd5418337230081e74ac4c91cd342
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/OpenCSG-${VERSION}"
WEB_SITE="http://www.opencsg.org";
LICENSE[0]=GPL
diff --git a/graphics-libs/opencsg/HISTORY b/graphics-libs/opencsg/HISTORY
index c1e4da1..0674a3c 100644
--- a/graphics-libs/opencsg/HISTORY
+++ b/graphics-libs/opencsg/HISTORY
@@ -1,3 +1,6 @@
+2023-01-14 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 1.5.1
+
2020-01-18 Florian Franzmann <bwlf AT bandrate.org>
* PRE_BUILD, 0001-do-not-build-examples.patch,
0001-install-to-usr.patch: do not build examples (which fail to
diff --git a/libs/double-conversion/DETAILS b/libs/double-conversion/DETAILS
index c261109..35e5ed4 100755
--- a/libs/double-conversion/DETAILS
+++ b/libs/double-conversion/DETAILS
@@ -1,6 +1,6 @@
SPELL=double-conversion
- VERSION=3.2.0
-
SOURCE_HASH=sha512:0670ee70ed2662c6795ec6cf144e0915d805940ea0f49633d17500c496fb241788a0de6f0a9f8eaed5cb74a376f64fe590fa0d883d0676dc2bd2dab288b85e00
+ VERSION=3.2.1
+
SOURCE_HASH=sha512:d2feb3098a1d4d6baab5f89bcc29ac2e06d314d552b8c747c6eb6dba5dd165a15dc71200191edb7f05d521c349e12d59cddba3c5db101e1623e0e76e19f21a49
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/google/$SPELL
diff --git a/libs/double-conversion/HISTORY b/libs/double-conversion/HISTORY
index 0411936..9b58fad 100644
--- a/libs/double-conversion/HISTORY
+++ b/libs/double-conversion/HISTORY
@@ -1,3 +1,6 @@
+2023-01-14 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 3.2.1
+
2022-01-29 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 3.2.0

diff --git a/science-libs/lib3mf/DETAILS b/science-libs/lib3mf/DETAILS
index 74ae0b7..fcce14a 100755
--- a/science-libs/lib3mf/DETAILS
+++ b/science-libs/lib3mf/DETAILS
@@ -1,9 +1,9 @@
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=lib3mf
- VERSION=2.1.0
+ VERSION=2.2.0
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/3MFConsortium/$SPELL/archive/v$VERSION.tar.gz
-
SOURCE_HASH=sha512:05f92da9cbbac279baf33fe3a7ce43ff7faad987c4ba08120094406e1a8f9bab2330b47822fa0a84d1558be9c829f3e805782a46ed85b706e7f85cb861d0d4f5
+
SOURCE_HASH=sha512:2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://3mf.io/";
LICENSE[0]="BSD-2-Clause"
diff --git a/science-libs/lib3mf/HISTORY b/science-libs/lib3mf/HISTORY
index 8593427..7211cd0 100644
--- a/science-libs/lib3mf/HISTORY
+++ b/science-libs/lib3mf/HISTORY
@@ -1,2 +1,5 @@
+2023-01-14 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 2.2.0
+
2021-01-20 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS: spell created
diff --git a/science/cgal/DETAILS b/science/cgal/DETAILS
index a2d44d3..990aeff 100755
--- a/science/cgal/DETAILS
+++ b/science/cgal/DETAILS
@@ -1,10 +1,11 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=cgal
- VERSION=4.14.3
- SOURCE="CGAL-${VERSION}.tar.gz"
-
SOURCE_URL[0]=https://codeload.github.com/CGAL/cgal/tar.gz/releases/CGAL-$VERSION
-
SOURCE_HASH=sha512:c245e81ca0e5db83686d6ee797accaef7ff4500c2d5e5a937fc9cf2e87049185f292126187632aa610c1b7a4542fb7bc38562d81f560e53045a364ac15f34d10
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/cgal-releases-CGAL-${VERSION}"
+ SPELLX=CGAL
+ VERSION=5.5.1
+ SOURCE="${SPELLX}-${VERSION}.tar.xz"
+
SOURCE_URL[0]=https://github.com/$SPELLX/cgal/releases/download/v${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:952ba892d5819b19c310b36ebb32d4f690eb8130bd3f1026b0114159191fc6ff0b88b96338e89319759bfddd4d9d711712a10ab81d4e29892889688fc7374f5e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="https://www.cgal.org";
LICENSE[0]=GPL
ENTERED=20190714
diff --git a/science/cgal/HISTORY b/science/cgal/HISTORY
index 32c8ce0..1703a8e 100644
--- a/science/cgal/HISTORY
+++ b/science/cgal/HISTORY
@@ -1,3 +1,6 @@
+2023-01-14 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 5.5.1
+
2020-02-26 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 4.14.3

diff --git a/science/openscad/DETAILS b/science/openscad/DETAILS
index 8d69a9b..8e09fa0 100755
--- a/science/openscad/DETAILS
+++ b/science/openscad/DETAILS
@@ -1,5 +1,7 @@
SPELL=openscad
VERSION=2021.01
+ PATCHLEVEL=1
+ SECURITY_PATCH=2
SOURCE="${SPELL}-${VERSION}.src.tar.gz"
SOURCE_URL[0]=https://files.${SPELL}.org/${SOURCE}

SOURCE_HASH=sha512:8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
diff --git a/science/openscad/HISTORY b/science/openscad/HISTORY
index 837084e..d09973c 100644
--- a/science/openscad/HISTORY
+++ b/science/openscad/HISTORY
@@ -1,3 +1,12 @@
+2023-01-14 Florian Franzmann <bwlf AT bandrate.org>
+ * PRE_BUILD, patches/{
+ 0000-CVE-2022-0497.patch,
+ 0001-CVE-2022-0496.patch,
+ 0002-fix-cgal-5.3.patch,
+ 0003-fix-cgal-5.4.patch,
+ 0004-fix-boost-join.patch}: fix incompatibilities with recent
libraries, fix CVE-2022-049{6,7}
+ * DETAILS: PATCHLEVEL++, SECURITY_PATCH++
+
2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)

diff --git a/science/openscad/PRE_BUILD b/science/openscad/PRE_BUILD
index b7453ba..27d4c80 100755
--- a/science/openscad/PRE_BUILD
+++ b/science/openscad/PRE_BUILD
@@ -1,5 +1,7 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+apply_patch_dir patches &&

# Fix .pc name for lib3mf
sedit '/^ *find_package/s/Lib3MF/lib3mf/' CMakeLists.txt
diff --git a/science/openscad/patches/0000-CVE-2022-0497.patch
b/science/openscad/patches/0000-CVE-2022-0497.patch
new file mode 100644
index 0000000..fac3024
--- /dev/null
+++ b/science/openscad/patches/0000-CVE-2022-0497.patch
@@ -0,0 +1,27 @@
+From 84addf3c1efbd51d8ff424b7da276400bbfa1a4b Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul AT gmx.de>
+Date: Sat, 5 Feb 2022 18:45:29 +0100
+Subject: [PATCH] CVE-2022-0497 Out-of-bounds memory access in comment parser.
+
+Public issue:
+https://github.com/openscad/openscad/issues/4043
+
+Fix in master branch:
+https://github.com/openscad/openscad/pull/4044
+---
+ src/comment.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/comment.cpp b/src/comment.cpp
+index f02ad2c5f6..1ce3ab547b 100644
+--- a/src/comment.cpp
++++ b/src/comment.cpp
+@@ -92,7 +92,7 @@ static std::string getComment(const std::string &fulltext,
int line)
+ }
+
+ int end = start + 1;
+- while (fulltext[end] != '\n') end++;
++ while (end < fulltext.size() && fulltext[end] != '\n') end++;
+
+ std::string comment = fulltext.substr(start, end - start);
+
diff --git a/science/openscad/patches/0001-CVE-2022-0496.patch
b/science/openscad/patches/0001-CVE-2022-0496.patch
new file mode 100644
index 0000000..8f8a1e8
--- /dev/null
+++ b/science/openscad/patches/0001-CVE-2022-0496.patch
@@ -0,0 +1,76 @@
+From 00a4692989c4e2f191525f73f24ad8727bacdf41 Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul AT gmx.de>
+Date: Sat, 5 Feb 2022 18:38:31 +0100
+Subject: [PATCH] CVE-2022-0496 Out-of-bounds memory access in DXF loader.
+
+Public issue:
+https://github.com/openscad/openscad/issues/4037
+
+Fix in master branch:
+https://github.com/openscad/openscad/pull/4090
+---
+ src/dxfdata.cc | 27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/src/dxfdata.cc b/src/dxfdata.cc
+index 2bb7236746..aa6b6f3976 100644
+--- a/src/dxfdata.cc
++++ b/src/dxfdata.cc
+@@ -441,6 +441,11 @@ DxfData::DxfData(double fn, double fs, double fa,
+ auto lv =
grid.data(this->points[lines[idx].idx[j]][0],
this->points[lines[idx].idx[j]][1]);
+ for (size_t ki = 0; ki < lv.size(); ++ki) {
+ int k = lv.at(ki);
++ if (k < 0 || k >= lines.size()) {
++ LOG(message_group::Warning,Location::NONE,"",
++ "Bad DXF line index in
%1$s.",QuotedString(boostfs_uncomplete(filename,
fs::current_path()).generic_string()));
++ continue;
++ }
+ if (k == idx || lines[k].disabled)
continue;
+ goto next_open_path_j;
+ }
+@@ -466,13 +471,20 @@ DxfData::DxfData(double fn, double fs, double fa,
+ auto lv = grid.data(ref_point[0], ref_point[1]);
+ for (size_t ki = 0; ki < lv.size(); ++ki) {
+ int k = lv.at(ki);
++ if (k < 0 || k >= lines.size()) {
++ LOG(message_group::Warning,Location::NONE,"",
++ "Bad DXF line index in
%1$s.",QuotedString(boostfs_uncomplete(filename,
fs::current_path()).generic_string()));
++ continue;
++ }
+ if (lines[k].disabled) continue;
+- if (grid.eq(ref_point[0], ref_point[1],
this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
++ auto idk0 = lines[k].idx[0]; // make it easier to read
and debug
++ auto idk1 = lines[k].idx[1];
++ if (grid.eq(ref_point[0], ref_point[1],
this->points[idk0][0], this->points[idk0][1])) {
+ current_line = k;
+ current_point = 0;
+ goto found_next_line_in_open_path;
+ }
+- if (grid.eq(ref_point[0], ref_point[1],
this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
++ if (grid.eq(ref_point[0], ref_point[1],
this->points[idk1][0], this->points[idk1][1])) {
+ current_line = k;
+ current_point = 1;
+ goto found_next_line_in_open_path;
+@@ -501,13 +513,20 @@ DxfData::DxfData(double fn, double fs, double fa,
+ auto lv = grid.data(ref_point[0], ref_point[1]);
+ for (size_t ki = 0; ki < lv.size(); ++ki) {
+ int k = lv.at(ki);
++ if (k < 0 || k >= lines.size()) {
++ LOG(message_group::Warning,Location::NONE,"",
++ "Bad DXF line index in
%1$s.",QuotedString(boostfs_uncomplete(filename,
fs::current_path()).generic_string()));
++ continue;
++ }
+ if (lines[k].disabled) continue;
+- if (grid.eq(ref_point[0], ref_point[1],
this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
++ auto idk0 = lines[k].idx[0]; // make it easier to read
and debug
++ auto idk1 = lines[k].idx[1];
++ if (grid.eq(ref_point[0], ref_point[1],
this->points[idk0][0], this->points[idk0][1])) {
+ current_line = k;
+ current_point = 0;
+ goto found_next_line_in_closed_path;
+ }
+- if (grid.eq(ref_point[0],
ref_point[1], this->points[lines[k].idx[1]][0],
this->points[lines[k].idx[1]][1])) {
++ if (grid.eq(ref_point[0], ref_point[1],
this->points[idk1][0], this->points[idk1][1])) {
+ current_line = k;
+ current_point = 1;
+ goto found_next_line_in_closed_path;
diff --git a/science/openscad/patches/0002-fix-cgal-5.3.patch
b/science/openscad/patches/0002-fix-cgal-5.3.patch
new file mode 100644
index 0000000..dc3c1ca
--- /dev/null
+++ b/science/openscad/patches/0002-fix-cgal-5.3.patch
@@ -0,0 +1,47 @@
+From 9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001
+From: Jordan Brown <github AT jordan.maileater.net>
+Date: Sun, 18 Jul 2021 21:01:46 -0700
+Subject: [PATCH] Fix build failure with "generic_print_polyhedron" on
+ CGAL-5.3.
+
+---
+ src/cgalutils-polyhedron.cc | 13 -------------
+ src/cgalutils.h | 1 -
+ 2 files changed, 14 deletions(-)
+
+diff --git a/src/cgalutils-polyhedron.cc b/src/cgalutils-polyhedron.cc
+index 9f4f98f623..41cca4b3f2 100644
+--- a/src/cgalutils-polyhedron.cc
++++ b/src/cgalutils-polyhedron.cc
+@@ -337,19 +337,6 @@ namespace CGALUtils {
+ }
+ };
+
+- template <typename Polyhedron>
+- std::string printPolyhedron(const Polyhedron &p) {
+- std::ostringstream sstream;
+- sstream.precision(20);
+-
+- Polyhedron_writer writer;
+- generic_print_polyhedron(sstream, p, writer);
+-
+- return sstream.str();
+- }
+-
+- template std::string printPolyhedron(const CGAL_Polyhedron &p);
+-
+ }; // namespace CGALUtils
+
+ #endif /* ENABLE_CGAL */
+diff --git a/src/cgalutils.h b/src/cgalutils.h
+index 21a01cdba6..c08a3aa7df 100644
+--- a/src/cgalutils.h
++++ b/src/cgalutils.h
+@@ -45,7 +45,6 @@ namespace CGALUtils {
+ bool is_approximately_convex(const PolySet &ps);
+ Geometry const* applyMinkowski(const Geometry::Geometries &children);
+
+- template <typename Polyhedron> std::string printPolyhedron(const
Polyhedron &p);
+ template <typename Polyhedron> bool createPolySetFromPolyhedron(const
Polyhedron &p, PolySet &ps);
+ template <typename Polyhedron> bool createPolyhedronFromPolySet(const
PolySet &ps, Polyhedron &p);
+ template <class Polyhedron_A, class Polyhedron_B>
diff --git a/science/openscad/patches/0003-fix-cgal-5.4.patch
b/science/openscad/patches/0003-fix-cgal-5.4.patch
new file mode 100644
index 0000000..f1fedc2
--- /dev/null
+++ b/science/openscad/patches/0003-fix-cgal-5.4.patch
@@ -0,0 +1,38 @@
+From abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul AT gmx.de>
+Date: Wed, 2 Feb 2022 02:30:59 +0100
+Subject: [PATCH] CGAL build fix, v5.4 renames projection traits header files
+ and classes.
+
+---
+ src/cgalutils-tess.cc | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/cgalutils-tess.cc b/src/cgalutils-tess.cc
+index ec1cc1eeb3..37f8cf08b1 100644
+--- a/src/cgalutils-tess.cc
++++ b/src/cgalutils-tess.cc
+@@ -6,10 +6,12 @@
+ #pragma push_macro("NDEBUG")
+ #undef NDEBUG
+ #include <CGAL/Constrained_Delaunay_triangulation_2.h>
+-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
+- #include <CGAL/Triangulation_2_projection_traits_3.h>
++#if CGAL_VERSION_NR < 1050401000
++#include <CGAL/Triangulation_2_projection_traits_3.h>
++typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
+ #else
+- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
++#include <CGAL/Projection_traits_3.h>
++typedef CGAL::Filtered_projection_traits_3<K> Projection;
+ #endif
+ #include <CGAL/Triangulation_face_base_with_info_2.h>
+ #pragma pop_macro("NDEBUG")
+@@ -19,7 +21,6 @@ struct FaceInfo {
+ bool in_domain() { return nesting_level%2 == 1; }
+ };
+
+-typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
+ typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
+ typedef CGAL::Triangulation_data_structure_2<
+ CGAL::Triangulation_vertex_base_2<Projection>,
diff --git a/science/openscad/patches/0004-fix-boost-join.patch
b/science/openscad/patches/0004-fix-boost-join.patch
new file mode 100644
index 0000000..1347c27
--- /dev/null
+++ b/science/openscad/patches/0004-fix-boost-join.patch
@@ -0,0 +1,62 @@
+From 08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001
+From: Torsten Paul <Torsten.Paul AT gmx.de>
+Date: Wed, 2 Feb 2022 00:50:43 +0100
+Subject: [PATCH] Fix build issue with overloaded join().
+
+---
+ src/openscad.cc | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/openscad.cc b/src/openscad.cc
+index a6f648d2a2..3c46cda2af 100644
+--- a/src/openscad.cc
++++ b/src/openscad.cc
+@@ -65,7 +65,6 @@
+ #include <chrono>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/algorithm/string/split.hpp>
+-#include <boost/algorithm/string/join.hpp>
+ #include <boost/range/adaptor/transformed.hpp>
+ #include <boost/program_options.hpp>
+ #include <boost/filesystem.hpp>
+@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string
color_scheme, const bool exit_if_
+ }
+
+ if (exit_if_not_found) {
+-
LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(),
"\n")));
++
LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(),
"\n")));
+
+ exit(1);
+ } else {
+@@ -885,7 +884,7 @@ struct CommaSeparatedVector
+ };
+
+ template <class Seq, typename ToString>
+-std::string join(const Seq &seq, const std::string &sep, const ToString
&toString)
++std::string str_join(const Seq &seq, const std::string &sep, const ToString
&toString)
+ {
+ return boost::algorithm::join(boost::adaptors::transform(seq,
toString), sep);
+ }
+@@ -947,7 +946,7 @@ int main(int argc, char **argv)
+ ("P,P", po::value<string>(), "customizer parameter set")
+ #ifdef ENABLE_EXPERIMENTAL
+ ("enable", po::value<vector<string>>(), ("enable experimental
features: " +
+-
join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
++
str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
+ [](const
Feature *feature) {
+ return
feature->get_name();
+ }) +
+@@ -964,11 +963,11 @@ int main(int argc, char **argv)
+ ("render", po::value<string>()->implicit_value(""), "for full
geometry evaluation when exporting png")
+ ("preview", po::value<string>()->implicit_value(""),
"[=throwntogether] -for ThrownTogether preview png")
+ ("animate", po::value<unsigned>(), "export N animated frames")
+- ("view", po::value<CommaSeparatedVector>(), ("=view options:
" + boost::join(viewOptions.names(), " | ")).c_str())
++ ("view", po::value<CommaSeparatedVector>(), ("=view options:
" + boost::algorithm::join(viewOptions.names(), " | ")).c_str())
+ ("projection", po::value<string>(), "=(o)rtho or
(p)erspective when exporting png")
+ ("csglimit", po::value<unsigned int>(), "=n -stop rendering
at n CSG elements when exporting png")
+ ("colorscheme", po::value<string>(), ("=colorscheme: " +
+-
join(ColorMap::inst()->colorSchemeNames(), " | ",
++
str_join(ColorMap::inst()->colorSchemeNames(), " | ",
+ [](const
std::string& colorScheme) {
+ return
(colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") +
colorScheme;
+ }) +
diff --git a/utils/acpid2/HISTORY b/utils/acpid2/HISTORY
index aa87b77..45684e2 100644
--- a/utils/acpid2/HISTORY
+++ b/utils/acpid2/HISTORY
@@ -1,5 +1,6 @@
2023-01-03 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.0.34
+ * DEPENDS, INSTALL, systemd/acpid.service: add systemd service

2020-06-28 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.0.32
diff --git a/utils/fwupd/DETAILS b/utils/fwupd/DETAILS
index b23e044..b40c374 100755
--- a/utils/fwupd/DETAILS
+++ b/utils/fwupd/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=fwupd
- VERSION=1.8.8
-
SOURCE_HASH=sha512:293a4a9e6841fe4f48682e04af91bf654f20ab91383c80440dcb4bcbba1c77bccedcbbdb348d301d20fdd3cdad3b7627ea4be68d7dc32db8e3569f7c0f926cc0
+ VERSION=1.8.9
+
SOURCE_HASH=sha512:a608cfbf9dd89d851cb7e8433e88f0362b3d31518fdbaddb3f0b6d9ace753eef66a3f3e0dc603b17822a17cc750af65fb458f03a9b15fc6c99c75419f8a3d2ff
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/hughsie/$SPELL
diff --git a/utils/fwupd/HISTORY b/utils/fwupd/HISTORY
index 6a64577..9f98e64 100644
--- a/utils/fwupd/HISTORY
+++ b/utils/fwupd/HISTORY
@@ -1,3 +1,6 @@
+2023-01-08 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 1.8.9
+
2022-12-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.8.8

diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index 54982b4..57b5967 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -1,6 +1,2 @@
-cd $SOURCE_DIRECTORY/Qt4Qt5 &&
-if is_depends_enabled $SPELL qt4; then
- qt4_build
-else
- qt5_build
-fi
+cd $SOURCE_DIRECTORY/src &&
+qt5_build
diff --git a/x11-toolkits/qscintilla/DETAILS b/x11-toolkits/qscintilla/DETAILS
index ed920d4..aca481c 100755
--- a/x11-toolkits/qscintilla/DETAILS
+++ b/x11-toolkits/qscintilla/DETAILS
@@ -1,11 +1,11 @@
SPELL=qscintilla
- SPELLX=QScintilla
- VERSION=2.11.5
-
SOURCE_HASH=sha512:46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
+ SPELLX=QScintilla_src
+ VERSION=2.13.3
+
SOURCE_HASH=sha512:be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION

WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
-
SOURCE_URL[0]=https://www.riverbankcomputing.com/static/Downloads/QScintilla/$VERSION/$SOURCE
+
SOURCE_URL[0]=https://www.riverbankcomputing.com/static/Downloads/QScintilla/$VERSION/${SOURCE}
LICENSE[0]=GPL
ENTERED=20060206
KEYWORDS="qt editors x11 libs"
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index 46172b4..ff98293 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,7 @@
+2023-01-14 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 2.13.3
+ * BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: remove support for qt4
+
2020-10-31 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.11.5

diff --git a/x11-toolkits/qscintilla/PRE_SUB_DEPENDS
b/x11-toolkits/qscintilla/PRE_SUB_DEPENDS
deleted file mode 100755
index e896844..0000000
--- a/x11-toolkits/qscintilla/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-case $THIS_SUB_DEPENDS in
- QT4) is_depends_enabled $SPELL qt4 && return 0;;
-esac
-return 1
diff --git a/x11-toolkits/qscintilla/SUB_DEPENDS
b/x11-toolkits/qscintilla/SUB_DEPENDS
deleted file mode 100755
index ba81bf0..0000000
--- a/x11-toolkits/qscintilla/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
-QT4) echo "QT4 support requested, forcing QT4 dependency." &&
- depends qt4
- ;;
-*) echo unknown sub-depends!!! ; return 1 ;;
-esac



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d1fe051464c80dce5ad8f81b640bb1422d3c541d), Florian Franzmann, 01/17/2023

Archive powered by MHonArc 2.6.24.

Top of Page