From cc51ea0a0dd14075df0f9af09ed4e20cce7fcb4c Mon Sep 17 00:00:00 2001 From: Guenther Sohler Date: Thu, 22 Dec 2022 08:21:41 +0100 Subject: [PATCH 1/2] fixed small compiler warning --- src/core/SourceFile.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/SourceFile.cc b/src/core/SourceFile.cc index e6201722cb..3792356530 100644 --- a/src/core/SourceFile.cc +++ b/src/core/SourceFile.cc @@ -63,7 +63,7 @@ void SourceFile::registerUse(const std::string& path, const Location& loc) 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); From edd9f17fb126866771201c0fc7d3c9042b980c68 Mon Sep 17 00:00:00 2001 From: Guenther Sohler Date: Thu, 22 Dec 2022 08:24:54 +0100 Subject: [PATCH 2/2] Adapted build scripts to recent version . previous versions did not compile or were not available for download --- scripts/common-build-dependencies.sh | 16 +++++++++------- scripts/uni-build-dependencies.sh | 21 +++++++++++---------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/scripts/common-build-dependencies.sh b/scripts/common-build-dependencies.sh index 27c69ea8b7..ac8f38bd7b 100644 --- a/scripts/common-build-dependencies.sh +++ b/scripts/common-build-dependencies.sh @@ -142,10 +142,11 @@ build_glib2() cd "glib-$version" export PKG_CONFIG_PATH="$DEPLOYDIR/lib/pkgconfig" - ./configure --disable-gtk-doc --disable-man --prefix="$DEPLOYDIR" CFLAGS="-I$DEPLOYDIR/include" LDFLAGS="-L$DEPLOYDIR/lib" + meson -Dprefix="$DEPLOYDIR" _build + ninja -C _build + ninja -C _build install + # ./configure --disable-gtk-doc --disable-man --prefix="$DEPLOYDIR" CFLAGS="-I$DEPLOYDIR/include" LDFLAGS="-L$DEPLOYDIR/lib" unset PKG_CONFIG_PATH - make -j$NUMCPU - make install } build_ragel() @@ -184,15 +185,16 @@ build_harfbuzz() echo "Building harfbuzz $version..." cd "$BASEDIR"/src rm -rf "harfbuzz-$version" - if [ ! -f "harfbuzz-$version.tar.gz" ]; then - curl --insecure -LO "http://cgit.freedesktop.org/harfbuzz/snapshot/harfbuzz-$version.tar.gz" + if [ ! -f "harfbuzz-$version.zip" ]; then + curl --insecure -LO "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$version.zip" + mv $version.zip harfbuzz-$version.zip fi - tar xzf "harfbuzz-$version.tar.gz" + unzip "harfbuzz-$version.zip" cd "harfbuzz-$version" # we do not need gtkdocize sed -e "s/gtkdocize/echo/g" autogen.sh > autogen.sh.bak && mv autogen.sh.bak autogen.sh # disable doc directories as they make problems on Mac OS Build - sed -e "s/SUBDIRS = src util test docs/SUBDIRS = src util test/g" Makefile.am > Makefile.am.bak && mv Makefile.am.bak Makefile.am + sed -e "s/SUBDIRS = \(.*\) docs$/SUBDIRS = \1/g" Makefile.am > Makefile.am.bak && mv Makefile.am.bak Makefile.am sed -e "s/^docs.*$//" configure.ac > configure.ac.bak && mv configure.ac.bak configure.ac sh ./autogen.sh --prefix="$DEPLOYDIR" --with-freetype=yes --with-gobject=no --with-cairo=no --with-icu=no $extra_config_flags make -j$NUMCPU diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index e32f624c48..3333aa6311 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -371,6 +371,7 @@ build_cgal() echo "Building CGAL" $version "..." cd $BASEDIR/src rm -rf CGAL-$version + ver5_5_1="curl -L --insecure https://github.com/CGAL/cgal/releases/download/v5.5.1/CGAL-5.5.1-library.tar.xz --output CGAL-5.5.1.tar.xz" ver5_4="curl -L --insecure https://github.com/CGAL/cgal/releases/download/v5.4/CGAL-5.4-library.tar.xz --output CGAL-5.4.tar.xz" ver5_3="curl -L --insecure https://github.com/CGAL/cgal/releases/download/v5.3/CGAL-5.3-library.tar.xz --output CGAL-5.3.tar.xz" ver5_2="curl -L --insecure https://github.com/CGAL/cgal/releases/download/v5.2/CGAL-5.2-library.tar.xz --output CGAL-5.2.tar.xz" @@ -780,7 +781,7 @@ if [ $1 ]; then exit $? fi if [ $1 = "cgal" ]; then - build_cgal ${CGAL_VERSION:-5.3} use-sys-libs + build_cgal ${CGAL_VERSION:-5.5.1} use-sys-libs exit $? fi if [ $1 = "opencsg" ]; then @@ -808,7 +809,7 @@ if [ $1 ]; then fi if [ $1 = "harfbuzz" ]; then # debian 7 lacks only harfbuzz - build_harfbuzz 0.9.35 --with-glib=yes + build_harfbuzz 6.0.0 --with-glib=yes exit $? fi if [ $1 = "glib2" ]; then @@ -816,7 +817,7 @@ if [ $1 ]; then build_pkgconfig 0.28 build_libffi 3.0.13 #build_gettext 0.18.3.1 - build_glib2 2.38.2 + build_glib2 2.75.0 exit $? fi fi @@ -834,19 +835,19 @@ fi build_eigen 3.3.7 build_gmp 6.0.0 build_mpfr 3.1.1 -build_boost 1.56.0 +build_boost 1.81.0 # NB! For CGAL, also update the actual download URL in the function -build_cgal 5.3 +build_cgal 5.5.1 build_glew 1.9.0 build_opencsg 1.4.2 build_gettext 0.18.3.1 -build_glib2 2.38.2 +build_glib2 2.75.0 # the following are only needed for text() -build_freetype 2.6.1 --without-png +build_freetype 2.12.1 --without-png build_libxml2 2.9.1 -build_fontconfig 2.11.0 --with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts -build_ragel 6.9 -build_harfbuzz 0.9.35 --with-glib=yes +build_fontconfig 2.14.1 --with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts +build_ragel 6.10 +build_harfbuzz 6.0.0 --with-glib=yes echo "OpenSCAD dependencies built and installed to " $BASEDIR