pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Revert "(cad/openscad) trying newly added"
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By: mef
Date: Sun Feb 2 08:59:19 2025 +0900
Changeset: 15281de3e7221fb8301d3e6db065f88b4edca6e4
Modified Files:
openscad/Makefile
openscad/distinfo
Added Files:
openscad/patches/patch-features_qscintilla2-priv.prf
openscad/patches/patch-openscad.pro
openscad/patches/patch-scripts_translation-update.sh
openscad/patches/patch-src_FileModule.cc
openscad/patches/patch-src_cgalutils-polyhedron.cc
openscad/patches/patch-src_cgalutils-tess.cc
openscad/patches/patch-src_colormap.h
openscad/patches/patch-src_openscad.cc
openscad/patches/patch-src_scintillaeditor.h
Log Message:
Revert "(cad/openscad) trying newly added"
This reverts commit 82a60406c16c8e0c6feedb5b47539ddc04ff207e.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=15281de3e7221fb8301d3e6db065f88b4edca6e4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openscad/Makefile | 9 ++--
openscad/distinfo | 18 +++++--
.../patches/patch-features_qscintilla2-priv.prf | 19 ++++++++
openscad/patches/patch-openscad.pro | 15 ++++++
.../patches/patch-scripts_translation-update.sh | 15 ++++++
openscad/patches/patch-src_FileModule.cc | 15 ++++++
openscad/patches/patch-src_cgalutils-polyhedron.cc | 27 +++++++++++
openscad/patches/patch-src_cgalutils-tess.cc | 30 ++++++++++++
openscad/patches/patch-src_colormap.h | 19 ++++++++
openscad/patches/patch-src_openscad.cc | 56 ++++++++++++++++++++++
openscad/patches/patch-src_scintillaeditor.h | 18 +++++++
11 files changed, 232 insertions(+), 9 deletions(-)
diffs:
diff --git a/openscad/Makefile b/openscad/Makefile
index 06fe0bfad5..0b993ca380 100644
--- a/openscad/Makefile
+++ b/openscad/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.113 2024/12/29 15:09:40 adam Exp $
+# $NetBSD: Makefile,v 1.103 2023/11/12 13:20:48 wiz Exp $
-VERSION= 2021.02 #just greater than 2021.01
+VERSION= 2021.01
DISTNAME= openscad-${VERSION}
+PKGREVISION= 27
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=openscad/}
-GITHUB_TAG= 0c8ac0e6c5c84ab21b6392f1e82458cd03b62966
+GITHUB_TAG= openscad-${VERSION}
MAINTAINER= reinoud%NetBSD.org@localhost
HOMEPAGE= https://www.openscad.org/
@@ -15,7 +16,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= bison gettext pkg-config itstool
USE_LIBTOOL= yes
-WRKSRC= ${WRKDIR}/${PKGBASE}-${GITHUB_TAG}
+WRKSRC= ${WRKDIR}/${PKGBASE}-${DISTNAME}
CHECK_PORTABILITY_SKIP+= tests/compare-bitmaps.sh
diff --git a/openscad/distinfo b/openscad/distinfo
index b9b8948711..95aa29b4d4 100644
--- a/openscad/distinfo
+++ b/openscad/distinfo
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.15 2024/04/28 08:09:07 mef Exp $
+$NetBSD: distinfo,v 1.14 2021/10/26 10:04:14 nia Exp $
-BLAKE2s (openscad-2021.02-0c8ac0e6c5c84ab21b6392f1e82458cd03b62966.tar.gz) = f0c778a8cd1b7f71a736407815913eae94fa5dc15e21899a1cd62c49d79a30d3
-SHA512 (openscad-2021.02-0c8ac0e6c5c84ab21b6392f1e82458cd03b62966.tar.gz) = 0ff87f01e7c254ae1bd09ce1f7a36f1cda72b6f7b7f2575279ae70b3d8ff2908c03d8d12da991fd8a6075cd6495b6f0edee7126ae5ba729cf24b58cee51172d1
-Size (openscad-2021.02-0c8ac0e6c5c84ab21b6392f1e82458cd03b62966.tar.gz) = 25552205 bytes
-SHA1 (patch-src_geometry_cgal_cgalutils-project.c) = f13ced93f5766e61f237f3d32531f0b434468c87
+BLAKE2s (openscad-2021.01.tar.gz) = dc3d5a762d8b334fcdefc41d3c15a3b01023ce93ed4b2bae2f9d13c5100c7918
+SHA512 (openscad-2021.01.tar.gz) = 2dac2d9c2fdbb720bc2e56f66849a75abe10ee646f918c53dadf33d57a30f3c605a536483bd97410d715309064ac99330ce15657440e4d66b426635dfab6a32b
+Size (openscad-2021.01.tar.gz) = 15656800 bytes
+SHA1 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c
+SHA1 (patch-openscad.pro) = 55e97368d2fdd77c8a4773699cfffdaccd65d63f
+SHA1 (patch-scripts_translation-update.sh) = 24929df617e450558934e46b1711f241945da7eb
+SHA1 (patch-src_FileModule.cc) = cfaedae9342de7ce70888f6d8c224e6cd774cdc1
+SHA1 (patch-src_cgalutils-polyhedron.cc) = b775822c0cb921a196a7dd4356f19e8f30631bbf
+SHA1 (patch-src_cgalutils-tess.cc) = b6571d63159e222fbcbfc89bc05984264304bfb7
+SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038
+SHA1 (patch-src_openscad.cc) = ec2898bf5236ee5be2150cc74f1615c4dd0c2ae0
+SHA1 (patch-src_scintillaeditor.h) = 47d2cde8d7349a23770c549e5df9b219678825e9
diff --git a/openscad/patches/patch-features_qscintilla2-priv.prf b/openscad/patches/patch-features_qscintilla2-priv.prf
new file mode 100644
index 0000000000..5a8060e3b1
--- /dev/null
+++ b/openscad/patches/patch-features_qscintilla2-priv.prf
@@ -0,0 +1,19 @@
+$NetBSD: patch-features_qscintilla2-priv.prf,v 1.1 2019/06/22 12:57:50 mef Exp $
+
+To avoid following problem
+-------
+ ....
+QtMultimedia -lQtOpenGL -lQtGui -lQtNetwork -lQtCore -lGLU -lGL -lXmu -lX11
+ld: cannot find -lqscintilla2_qt4
+*** [openscad] Error code 1
+-------
+
+--- features/qscintilla2-priv.prf.orig 2019-05-10 14:03:44.000000000 +0900
++++ features/qscintilla2-priv.prf 2019-05-28 21:34:58.087656036 +0900
+@@ -23,5 +23,5 @@ CONFIG(debug, debug|release) {
+ }
+ }
+ } else {
+- LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}
++ LIBS += -lqscintilla2
+ }
diff --git a/openscad/patches/patch-openscad.pro b/openscad/patches/patch-openscad.pro
new file mode 100644
index 0000000000..47cabc07c8
--- /dev/null
+++ b/openscad/patches/patch-openscad.pro
@@ -0,0 +1,15 @@
+$NetBSD: patch-openscad.pro,v 1.3 2021/04/08 10:26:08 bouyer Exp $
+
+install manpage to correct location
+
+--- openscad.pro.orig 2021-01-31 18:41:09.000000000 +0100
++++ openscad.pro 2021-04-04 20:58:11.094361964 +0200
+@@ -757,7 +757,7 @@
+ icon512.extra = test -f icons/$${FULLNAME}-512.png && cp -f icons/$${FULLNAME}-512.png \"\$(INSTALL_ROOT)$${icon512.path}/$${FULLNAME}.png\" || cp -f icons/openscad-512.png \"\$(INSTALL_ROOT)$${icon512.path}/$${FULLNAME}.png\"
+ INSTALLS += icon48 icon64 icon128 icon256 icon512
+
+-man.path = $$PREFIX/share/man/man1
++man.path = $$PREFIX/man/man1
+ man.extra = cp -f doc/openscad.1 \"\$(INSTALL_ROOT)$${man.path}/$${FULLNAME}.1\"
+ INSTALLS += man
+
diff --git a/openscad/patches/patch-scripts_translation-update.sh b/openscad/patches/patch-scripts_translation-update.sh
new file mode 100644
index 0000000000..77b7061ceb
--- /dev/null
+++ b/openscad/patches/patch-scripts_translation-update.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_translation-update.sh,v 1.1 2021/09/23 18:38:35 nia Exp $
+
+Use unlink instead of rm - more likely to be available in $PATH...
+
+--- scripts/translation-update.sh.orig 2021-01-31 17:41:09.000000000 +0000
++++ scripts/translation-update.sh
+@@ -100,7 +100,7 @@ updatemo()
+
+ # clean the mess
+ for LANGCODE in `cat locale/LINGUAS | grep -v "#"`; do
+- unlink ./locale/$LANGCODE/LC_MESSAGES/$LANGCODE.mo
++ rm -f ./locale/$LANGCODE/LC_MESSAGES/$LANGCODE.mo
+ done
+ else
+ if [ x"$(uname -s)" = x"Linux" ]; then
diff --git a/openscad/patches/patch-src_FileModule.cc b/openscad/patches/patch-src_FileModule.cc
new file mode 100644
index 0000000000..99786ab76f
--- /dev/null
+++ b/openscad/patches/patch-src_FileModule.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix for new boost version.
+
+--- src/FileModule.cc.orig 2024-07-04 04:00:45.934748369 +0000
++++ src/FileModule.cc
+@@ -65,7 +65,7 @@ void FileModule::registerUse(const std::
+ auto ext = fs::path(path).extension().generic_string();
+
+ if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
+- if (fs::is_regular(path)) {
++ if (fs::is_regular_file(path)) {
+ FontCache::instance()->register_font_file(path);
+ } else {
+ LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path);
diff --git a/openscad/patches/patch-src_cgalutils-polyhedron.cc b/openscad/patches/patch-src_cgalutils-polyhedron.cc
new file mode 100644
index 0000000000..66d44133c3
--- /dev/null
+++ b/openscad/patches/patch-src_cgalutils-polyhedron.cc
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Upstream patch for cgal 5.3
+https://github.com/openscad/openscad/commit/71f2831c0484c3f35cbf44e1d1dc2c857384100b
+
+--- src/cgalutils-polyhedron.cc.orig 2021-01-31 17:41:09.000000000 +0000
++++ 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/openscad/patches/patch-src_cgalutils-tess.cc b/openscad/patches/patch-src_cgalutils-tess.cc
new file mode 100644
index 0000000000..fed6115564
--- /dev/null
+++ b/openscad/patches/patch-src_cgalutils-tess.cc
@@ -0,0 +1,30 @@
+$NetBSD$
+
+Upstream patch for cgal 5.4
+https://github.com/openscad/openscad/commit/71f2831c0484c3f35cbf44e1d1dc2c857384100b
+
+--- src/cgalutils-tess.cc.orig 2021-01-31 17:41:09.000000000 +0000
++++ 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)
++#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/openscad/patches/patch-src_colormap.h b/openscad/patches/patch-src_colormap.h
new file mode 100644
index 0000000000..a1e803df86
--- /dev/null
+++ b/openscad/patches/patch-src_colormap.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_colormap.h,v 1.2 2019/06/22 12:57:50 mef Exp $
+
+the Qt4 moc has some difficulty parsing in the boost headers. Apply
+the workaround from https://bugreports.qt.io/browse/QTBUG-22829
+
+--- src/colormap.h.orig 2018-03-13 12:12:43.000000000 +0000
++++ src/colormap.h
+@@ -6,9 +6,10 @@
+ #include "linalg.h"
+
+ #include "memory.h"
++#ifndef Q_MOC_RUN
+ #include <boost/filesystem.hpp>
+ #include <boost/property_tree/ptree.hpp>
+-
++#endif
+ namespace fs = boost::filesystem;
+
+ enum class RenderColor {
diff --git a/openscad/patches/patch-src_openscad.cc b/openscad/patches/patch-src_openscad.cc
new file mode 100644
index 0000000000..c4748cc52c
--- /dev/null
+++ b/openscad/patches/patch-src_openscad.cc
@@ -0,0 +1,56 @@
+$NetBSD$
+
+Compile fix from upstream, fixing ::join ambiguity
+https://github.com/openscad/openscad/commit/9b79576c1ee9d57d0f4a5de5c1365bb87c548f36
+
+--- src/openscad.cc.orig 2021-01-31 17:41:09.000000000 +0000
++++ 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::
+ }
+
+ 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/openscad/patches/patch-src_scintillaeditor.h b/openscad/patches/patch-src_scintillaeditor.h
new file mode 100644
index 0000000000..aed82bfa01
--- /dev/null
+++ b/openscad/patches/patch-src_scintillaeditor.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_scintillaeditor.h,v 1.3 2021/04/08 10:26:08 bouyer Exp $
+
+the Qt4 moc has some difficulty parsing in the boost headers. Apply
+the workaround from https://bugreports.qt.io/browse/QTBUG-22829
+
+--- src/scintillaeditor.h.orig 2021-01-31 18:41:09.000000000 +0100
++++ src/scintillaeditor.h 2021-04-04 21:01:50.732077378 +0200
+@@ -1,8 +1,10 @@
+ #pragma once
+
+ #include <functional>
++#ifndef Q_MOC_RUN
+ #include <boost/property_tree/ptree.hpp>
+ #include <boost/property_tree/json_parser.hpp>
++#endif
+
+ #include <QMap>
+ #include <QObject>
Home |
Main Index |
Thread Index |
Old Index