Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (0943471ab1471861bf9ce8f005f8194e56cec82a)

Chronological Thread  
    < 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 (0943471ab1471861bf9ce8f005f8194e56cec82a)
  • Date: Sun, 19 Jan 2020 00:10:34 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

graphics-libs/opencsg/0001-do-not-build-examples.patch | 20 ++
graphics-libs/opencsg/0001-install-to-usr.patch | 75
++++++++++
graphics-libs/opencsg/HISTORY | 5
graphics-libs/opencsg/PRE_BUILD | 4
science/cgal/BUILD | 2
science/cgal/DETAILS | 4
science/cgal/HISTORY | 4
science/openscad/HISTORY | 4
science/openscad/PRE_BUILD | 5
science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch | 27 +++
x11-libs/cairo/BUILD | 2
x11-libs/cairo/HISTORY | 3
x11-toolkits/gtkmm3/DETAILS | 4
x11-toolkits/gtkmm3/HISTORY | 3
14 files changed, 155 insertions(+), 7 deletions(-)

New commits:
commit 0943471ab1471861bf9ce8f005f8194e56cec82a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/openscad: fix build with boost 1.72.0

commit c7cbd894ea55f34272b11f16d0137a2d46f7fb00
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "science/cgal: version 5.0"

This reverts commit 65ba4b3f3063f799b344d1e1be941ff1a2a8741c.

Breaks openscad 2019.05.

commit c71307e166b01979e35d2b1999156ed1718d8e6d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/cgal: install libs to the right directory

commit 03ded4a643c4e723bae56074e70681b066ecd078
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics-libs/opencsg: fix build

commit 61e2bc25cd6a080189dcb12cac162dba8d99819f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/gtkmm3: version 3.24.2

commit 4c1f6088d482fe0682841521eb6fbff6d0a983c2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-libs/cairo: disable gc sections

diff --git a/graphics-libs/opencsg/0001-do-not-build-examples.patch
b/graphics-libs/opencsg/0001-do-not-build-examples.patch
new file mode 100644
index 0000000..0bf81c8
--- /dev/null
+++ b/graphics-libs/opencsg/0001-do-not-build-examples.patch
@@ -0,0 +1,20 @@
+From d1f5f2f2bccf0c6d1cf81ed47a3769c0ae98e757 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 18 Jan 2020 23:36:17 +0100
+Subject: [PATCH] do not build examples
+
+---
+ opencsg.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/opencsg.pro b/opencsg.pro
+index b56e622..5cf2d6d 100644
+--- a/opencsg.pro
++++ b/opencsg.pro
+@@ -1,2 +1,2 @@
+ TEMPLATE = subdirs
+-SUBDIRS = src example
++SUBDIRS = src
+--
+2.25.0
+
diff --git a/graphics-libs/opencsg/0001-install-to-usr.patch
b/graphics-libs/opencsg/0001-install-to-usr.patch
new file mode 100644
index 0000000..20bacd4
--- /dev/null
+++ b/graphics-libs/opencsg/0001-install-to-usr.patch
@@ -0,0 +1,75 @@
+From 47520a991d727f0ecf66d8f9cec65883e0bf4856 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 18 Jan 2020 23:40:13 +0100
+Subject: [PATCH] install to /usr
+
+---
+ src/Makefile | 30 +++++++++++++++---------------
+ src/src.pro | 2 +-
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index b70edb4..f93aefa 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -285,29 +285,29 @@ RenderTexture.o: ../RenderTexture/RenderTexture.cpp
../RenderTexture/RenderTextu
+ ####### Install
+
+ install_target: first FORCE
+- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/lib/ || $(MKDIR)
$(INSTALL_ROOT)/usr/local/lib/
+- -$(INSTALL_PROGRAM) "../lib/$(TARGET)"
"$(INSTALL_ROOT)/usr/local/lib/$(TARGET)"
+- -$(STRIP) --strip-unneeded "$(INSTALL_ROOT)/usr/local/lib/$(TARGET)"
+- -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/local/lib/$(TARGET0)"
+- -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/local/lib/$(TARGET1)"
+- -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/local/lib/$(TARGET2)"
++ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/lib/ || $(MKDIR)
$(INSTALL_ROOT)/usr/lib/
++ -$(INSTALL_PROGRAM) "../lib/$(TARGET)"
"$(INSTALL_ROOT)/usr/lib/$(TARGET)"
++ -$(STRIP) --strip-unneeded "$(INSTALL_ROOT)/usr/lib/$(TARGET)"
++ -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET0)"
++ -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET1)"
++ -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET2)"
+
+ uninstall_target: FORCE
+- -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/lib/$(TARGET)"
+- -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/lib/$(TARGET0)"
+- -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/lib/$(TARGET1)"
+- -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/lib/$(TARGET2)"
+- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/lib/
++ -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET)"
++ -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET0)"
++ -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET1)"
++ -$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET2)"
++ -$(DEL_DIR) $(INSTALL_ROOT)/usr/lib/
+
+
+ install_headers: first FORCE
+- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/include/ || $(MKDIR)
$(INSTALL_ROOT)/usr/local/include/
+- -$(INSTALL_FILE) ../include/opencsg.h
$(INSTALL_ROOT)/usr/local/include/
++ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/include/ || $(MKDIR)
$(INSTALL_ROOT)/usr/include/
++ -$(INSTALL_FILE) ../include/opencsg.h $(INSTALL_ROOT)/usr/include/
+
+
+ uninstall_headers: FORCE
+- -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/include/opencsg.h
+- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/include/
++ -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/include/opencsg.h
++ -$(DEL_DIR) $(INSTALL_ROOT)/usr/include/
+
+
+ install: install_target install_headers FORCE
+diff --git a/src/src.pro b/src/src.pro
+index a40b626..d654487 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -3,7 +3,7 @@ TARGET = opencsg
+ VERSION = 1.4.2
+
+ isEmpty(INSTALLDIR) {
+- INSTALLDIR = /usr/local
++ INSTALLDIR = /usr
+ }
+
+ CONFIG += opengl warn_on release
+--
+2.25.0
+
diff --git a/graphics-libs/opencsg/HISTORY b/graphics-libs/opencsg/HISTORY
index f2dc4d3..6c5136a 100644
--- a/graphics-libs/opencsg/HISTORY
+++ b/graphics-libs/opencsg/HISTORY
@@ -1,3 +1,8 @@
+2020-01-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-do-not-build-examples.patch,
+ 0001-install-to-usr.patch: do not build examples (which fail to
+ build), install to /usr instead of /usr/local
+
2019-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, opencsg-1.4.2-includepath.patch, PRE_BUILD:
spell created
diff --git a/graphics-libs/opencsg/PRE_BUILD b/graphics-libs/opencsg/PRE_BUILD
index 695dbe6..b80a672 100755
--- a/graphics-libs/opencsg/PRE_BUILD
+++ b/graphics-libs/opencsg/PRE_BUILD
@@ -2,5 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

rm -rf glew &&
-patch -p1 < "$SPELL_DIRECTORY/opencsg-1.4.2-includepath.patch"
+patch -p1 < "$SPELL_DIRECTORY/opencsg-1.4.2-includepath.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-do-not-build-examples.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-install-to-usr.patch"

diff --git a/science/cgal/BUILD b/science/cgal/BUILD
index 7a71929..f72de5c 100755
--- a/science/cgal/BUILD
+++ b/science/cgal/BUILD
@@ -1,3 +1,5 @@
OPTS="-DWITH_LEDA=OFF $OPTS" &&
+OPTS="-DCGAL_INSTALL_LIB_DIR=lib $OPTS" &&
+OPTS="-DCGAL_INSTALL_CMAKE_DIR=lib/cmake/CGAL $OPTS" &&

default_build
diff --git a/science/cgal/DETAILS b/science/cgal/DETAILS
index 47b690d..1ee7531 100755
--- a/science/cgal/DETAILS
+++ b/science/cgal/DETAILS
@@ -1,9 +1,9 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=cgal
- VERSION=5.0
+ VERSION=4.14.1
SOURCE="CGAL-${VERSION}.tar.gz"

SOURCE_URL[0]=https://codeload.github.com/CGAL/cgal/tar.gz/releases/CGAL-$VERSION
-
SOURCE_HASH=sha512:c7462f1f5ca1ef154a3a20ce4c1b63e544ad7e62ea0afb9aee99872402362fa2001a52740d62ac779e75f1354ad9c955a895f3cad12186e3b75d91f0f3452847
+
SOURCE_HASH=sha512:ee645c452c2f7405e1059dfbbca0e0c1ef4b06e4547dce570f6b106f86d68c82b4ca7ebcfe527941875f788e53a7ba0f7439167ff6db331761999ab2c8145b63
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/cgal-releases-CGAL-${VERSION}"
WEB_SITE="https://www.cgal.org";
LICENSE[0]=GPL
diff --git a/science/cgal/HISTORY b/science/cgal/HISTORY
index b469d60..f77db67 100644
--- a/science/cgal/HISTORY
+++ b/science/cgal/HISTORY
@@ -1,5 +1,5 @@
-2019-11-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 5.0
+2020-01-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: install libs to the right directory

2019-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*
diff --git a/science/openscad/HISTORY b/science/openscad/HISTORY
index 4618823..fac7bbf 100644
--- a/science/openscad/HISTORY
+++ b/science/openscad/HISTORY
@@ -1,3 +1,7 @@
+2020-01-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, openscad-2019.05_fix-boost-1.72.0-build.patch: add patch
+ from gentoo to fix build with boost 1.72.0
+
2019-10-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: remove bogus dependency on cmake

diff --git a/science/openscad/PRE_BUILD b/science/openscad/PRE_BUILD
new file mode 100755
index 0000000..cdec0b7
--- /dev/null
+++ b/science/openscad/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05_fix-boost-1.72.0-build.patch"
+
diff --git a/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch
b/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch
new file mode 100644
index 0000000..28d3285
--- /dev/null
+++ b/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch
@@ -0,0 +1,27 @@
+From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich AT FreeBSD.org>
+Date: Fri, 25 Oct 2019 15:10:26 +0000
+Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
+
+src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
+std::stack<LocalScope *> scope_stack;
+~~~~~^
+---
+ src/parser.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parser.y b/src/parser.y
+index 7f4fd56c..4c77c989 100644
+--- a/src/parser.y
++++ b/src/parser.y
+@@ -46,6 +46,7 @@
+ #include "printutils.h"
+ #include "memory.h"
+ #include <sstream>
++#include <stack>
+ #include <boost/filesystem.hpp>
+ #include "boost-utils.h"
+ #include "feature.h"
+--
+2.24.1
+
diff --git a/x11-libs/cairo/BUILD b/x11-libs/cairo/BUILD
index bad1ab6..3ee3022 100755
--- a/x11-libs/cairo/BUILD
+++ b/x11-libs/cairo/BUILD
@@ -1,3 +1,5 @@
OPTS="$CAIRO_OPTS $OPTS" &&

+disable_gc_sections &&
+
default_build
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index fc0df2d..de75dab 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2020-01-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: disable gc sections
+
2019-03-10 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: scm branch is now at freedesktop GitLab url

diff --git a/x11-toolkits/gtkmm3/DETAILS b/x11-toolkits/gtkmm3/DETAILS
index 86e8843..a830729 100755
--- a/x11-toolkits/gtkmm3/DETAILS
+++ b/x11-toolkits/gtkmm3/DETAILS
@@ -1,10 +1,10 @@
SPELL=gtkmm3
- VERSION=3.24.1
+ VERSION=3.24.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL%?}-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%?}-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/${SPELL%?}/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
+
SOURCE_HASH=sha512:c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
LICENSE[0]=LGPL
WEB_SITE=http://www.gtkmm.org/
ENTERED=20110411
diff --git a/x11-toolkits/gtkmm3/HISTORY b/x11-toolkits/gtkmm3/HISTORY
index 4046616..c4316fb 100644
--- a/x11-toolkits/gtkmm3/HISTORY
+++ b/x11-toolkits/gtkmm3/HISTORY
@@ -1,3 +1,6 @@
+2020-01-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.24.2
+
2019-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.24.1



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (0943471ab1471861bf9ce8f005f8194e56cec82a), Florian Franzmann, 01/18/2020

Archive powered by MHonArc 2.6.24.

Top of Page