sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Ismael Luceno (12aaa98e07fbcccbcb6bc05538bddce4ea3c02f9)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (12aaa98e07fbcccbcb6bc05538bddce4ea3c02f9)
- Date: Sun, 2 Apr 2023 12:03:33 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
ChangeLog
| 4
science-libs/opencascade/DETAILS
| 5 -
science-libs/opencascade/HISTORY
| 6 +
science-libs/opencascade/PRE_BUILD
| 3
science-libs/opencascade/patches/0001-Enable-building-without-mallinfo-on-Linux.patch
| 36 +++++++
science-libs/opencascade/patches/0002-Enable-compiling-without-fe-except.patch
| 48 ++++++++++
science-libs/opencascade/patches/0003-Replace-sys-signal.h-by-the-standard-signal.h.patch
| 27 +++++
science-libs/opencascade/patches/0004-Avoid-backtrace-in-non-glibc-Linux-systems.patch
| 40 ++++++++
science-libs/opencascade/patches/0005-Add-missing-include-of-limits.patch
| 26 +++++
utils/pmbootstrap/BUILD
| 1
utils/pmbootstrap/DEPENDS
| 1
utils/pmbootstrap/DETAILS
| 18 +++
utils/pmbootstrap/HISTORY
| 2
utils/pmbootstrap/INSTALL
| 1
14 files changed, 215 insertions(+), 3 deletions(-)
New commits:
commit 12aaa98e07fbcccbcb6bc05538bddce4ea3c02f9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
pmbootstrap: new spell, chroot/build/flash tool to develop and install
postmarketOS
commit 8b6e371e3281e460e8a81e05563137a072ea1391
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
opencascade 7.7.0
diff --git a/ChangeLog b/ChangeLog
index 3c76e5f..3504b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2023-04-02 Ismael Luceno <ismael AT sourcemage.org>
+ * utils/pmbootstrap: new spell, chroot/build/flash tool to develop
+ and install postmarketOS
+
2023-04-01 Conner Clere <xenanthropy AT sourcemage.org>
* rust-crates/sccache: new spell, ccache-like compiler caching tool
diff --git a/science-libs/opencascade/DETAILS
b/science-libs/opencascade/DETAILS
index 4942926..15b190b 100755
--- a/science-libs/opencascade/DETAILS
+++ b/science-libs/opencascade/DETAILS
@@ -1,9 +1,10 @@
# Watch: https://dev.opencascade.org/release
SPELL=opencascade
- VERSION=7.0.0
+ VERSION=7.7.0
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]=http://smgl.bandrate.org/${SOURCE}
-
SOURCE_HASH=sha512:0c8e1a6c4a589a28e5baef10ccff1d94ad76c9e7ac827881fc7265e6f6d44d4332820034efc1f348d67663f7f508c2edc265c5e01da062c6ca4f94b1c47c2753
+ SOURCE_URL[1]=http://dl.iodev.co.uk/sources/$SOURCE
+
SOURCE_HASH=sha512:91513f1c2e0712e5753cf45311fee722970352430dce7f9044c7b11088ad0b52bb617811837ed27f85f3aea4a0aa43be2f12f0a1bf4a3965c63110802c2c9d88
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://www.opencascade.com";
LICENSE[0]=LGPL
diff --git a/science-libs/opencascade/HISTORY
b/science-libs/opencascade/HISTORY
index 2b96f54..bfc74c1 100644
--- a/science-libs/opencascade/HISTORY
+++ b/science-libs/opencascade/HISTORY
@@ -1,3 +1,8 @@
+2023-04-02 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 7.7.0
+ * patches/0001-Enable-building-without-mallinfo-on-Linux.patch:
+ fixed build against musl
+
2020-03-16 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: tweak
@@ -7,4 +12,3 @@
2016-08-22 Florian Franzmann <bwlf AT bandrate.org>
* BUILD, DEPENDS, DETAILS: spell created
-
diff --git a/science-libs/opencascade/PRE_BUILD
b/science-libs/opencascade/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/science-libs/opencascade/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/science-libs/opencascade/patches/0001-Enable-building-without-mallinfo-on-Linux.patch
b/science-libs/opencascade/patches/0001-Enable-building-without-mallinfo-on-Linux.patch
new file mode 100644
index 0000000..c93d80f
--- /dev/null
+++
b/science-libs/opencascade/patches/0001-Enable-building-without-mallinfo-on-Linux.patch
@@ -0,0 +1,36 @@
+From e406bf5f44331476a556146140eaf0f02d08b7be Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Thu, 30 Mar 2023 17:49:38 +0200
+Subject: [PATCH 1/5] Enable building without mallinfo on Linux
+
+Upstream-Status: Inappropriate [CLA involved]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ src/OSD/OSD_MemInfo.cxx | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/OSD/OSD_MemInfo.cxx b/src/OSD/OSD_MemInfo.cxx
+index 8a9f10e09d48..6143c02427bf 100644
+--- a/src/OSD/OSD_MemInfo.cxx
++++ b/src/OSD/OSD_MemInfo.cxx
+@@ -182,12 +182,16 @@ void OSD_MemInfo::Update()
+ #if __GLIBC_PREREQ(2,33)
+ #define HAS_MALLINFO2
+ #endif
++ #elif defined(__GLIBC__) || defined(__UCLIBC__)
++ #define HAS_MALLINFO
+ #endif
+
+ #ifdef HAS_MALLINFO2
+ const struct mallinfo2 aMI = mallinfo2();
+- #else
++ #elif defined(HAS_MALLINFO)
+ const struct mallinfo aMI = mallinfo();
++ #else
++ const struct { size_t uordblks; } aMI = {0};
+ #endif
+ myCounters[MemHeapUsage] = aMI.uordblks;
+ }
+--
+2.40.0
+
diff --git
a/science-libs/opencascade/patches/0002-Enable-compiling-without-fe-except.patch
b/science-libs/opencascade/patches/0002-Enable-compiling-without-fe-except.patch
new file mode 100644
index 0000000..51607c7
--- /dev/null
+++
b/science-libs/opencascade/patches/0002-Enable-compiling-without-fe-except.patch
@@ -0,0 +1,48 @@
+From f5eb0a9f16cf7485b2bfbb6703bbe52c212053e0 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 31 Mar 2023 19:50:17 +0200
+Subject: [PATCH 2/5] Enable compiling without fe*except
+
+Upstream-Status: Inappropriate [CLA involved]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ src/OSD/OSD_signal.cxx | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx
+index 7da3f19004c1..e9cac5aea2dd 100644
+--- a/src/OSD/OSD_signal.cxx
++++ b/src/OSD/OSD_signal.cxx
+@@ -20,6 +20,11 @@
+
+ #include <Standard_WarningDisableFunctionCast.hxx>
+
++#if defined (__GLIBC__) || defined (__UCLIBC__)
++#define HAVE_FEENABLEEXCCEPT
++#define HAVE_FEGETEXCEPT
++#endif
++
+ static OSD_SignalMode OSD_WasSetSignal = OSD_SignalMode_AsIs;
+ static Standard_Integer OSD_SignalStackTraceLength = 0;
+
+@@ -974,7 +979,7 @@ static void SegvHandler(const int theSignal,
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#ifdef HAVE_FEENABLEEXCEPT
+ feclearexcept (FE_ALL_EXCEPT);
+ if (theFloatingSignal)
+ {
+@@ -1007,7 +1012,7 @@ void OSD::SetFloatingSignal (Standard_Boolean
theFloatingSignal)
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#ifdef HAVE_FEGETEXCEPT
+ return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+ return Standard_False;
+--
+2.40.0
+
diff --git
a/science-libs/opencascade/patches/0003-Replace-sys-signal.h-by-the-standard-signal.h.patch
b/science-libs/opencascade/patches/0003-Replace-sys-signal.h-by-the-standard-signal.h.patch
new file mode 100644
index 0000000..96f0297
--- /dev/null
+++
b/science-libs/opencascade/patches/0003-Replace-sys-signal.h-by-the-standard-signal.h.patch
@@ -0,0 +1,27 @@
+From 0a06c46c6e57ef507185a8b71f242069849fd4d5 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 31 Mar 2023 20:50:24 +0200
+Subject: [PATCH 3/5] Replace <sys/signal.h> by the standard <signal.h>
+
+Upstream-Status: Inappropriate [CLA involved]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ src/OSD/OSD_signal.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx
+index e9cac5aea2dd..7b03d6097bd3 100644
+--- a/src/OSD/OSD_signal.cxx
++++ b/src/OSD/OSD_signal.cxx
+@@ -764,7 +764,7 @@ typedef void (* SIG_PFV) (int);
+ #include <signal.h>
+
+ #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
+- #include <sys/signal.h>
++ #include <signal.h>
+ #endif
+
+ # define _OSD_FPX (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)
+--
+2.40.0
+
diff --git
a/science-libs/opencascade/patches/0004-Avoid-backtrace-in-non-glibc-Linux-systems.patch
b/science-libs/opencascade/patches/0004-Avoid-backtrace-in-non-glibc-Linux-systems.patch
new file mode 100644
index 0000000..81057d4
--- /dev/null
+++
b/science-libs/opencascade/patches/0004-Avoid-backtrace-in-non-glibc-Linux-systems.patch
@@ -0,0 +1,40 @@
+From 216b888cf09bef42b3afa32c62538bbed6dabb87 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sat, 1 Apr 2023 00:06:05 +0200
+Subject: [PATCH 4/5] Avoid backtrace in non-glibc Linux systems
+
+This is not part of the libc and requires linking against an external
+implementation.
+
+Upstream-Status: Inappropriate [CLA involved]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ src/Standard/Standard_StackTrace.cxx | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/Standard/Standard_StackTrace.cxx
b/src/Standard/Standard_StackTrace.cxx
+index 271c7e2b3b4e..23bb262b1491 100644
+--- a/src/Standard/Standard_StackTrace.cxx
++++ b/src/Standard/Standard_StackTrace.cxx
+@@ -29,6 +29,8 @@
+ //#include <unwind.h>
+ #elif defined(__QNX__)
+ //#include <backtrace.h> // requires linking to libbacktrace
++#elif defined(__linux__) && !(defined(__GLIBC__) || defined(__UCLIBC__))
++ // requires linking against libexecinfo
+ #elif !defined(_WIN32) && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
+ #include <execinfo.h>
+ #elif defined(_WIN32) && !defined(OCCT_UWP)
+@@ -203,6 +205,9 @@ Standard_Boolean Standard::StackTrace (char* theBuffer,
+ #elif defined(__ANDROID__)
+ Message::SendTrace ("Standard::StackTrace() is not implemented for this
platform");
+ return false;
++#elif defined(__linux__) && !(defined(__GLIBC__) || defined(__UCLIBC__))
++ Message::SendTrace ("Standard::StackTrace() is not implemented for this
platform");
++ return false;
+ #elif defined(__QNX__)
+ // bt_get_backtrace()
+ Message::SendTrace ("Standard::StackTrace() is not implemented for this
platform");
+--
+2.40.0
+
diff --git
a/science-libs/opencascade/patches/0005-Add-missing-include-of-limits.patch
b/science-libs/opencascade/patches/0005-Add-missing-include-of-limits.patch
new file mode 100644
index 0000000..51e5a46
--- /dev/null
+++
b/science-libs/opencascade/patches/0005-Add-missing-include-of-limits.patch
@@ -0,0 +1,26 @@
+From 75ff9dfa85b96bf5a364671ac3a279d85b46cc32 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Sat, 1 Apr 2023 20:27:07 +0200
+Subject: [PATCH 5/5] Add missing include of <limits>
+
+Upstream-Status: Inappropriate [CLA involved]
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ src/ViewerTest/ViewerTest_CmdParser.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ViewerTest/ViewerTest_CmdParser.cxx
b/src/ViewerTest/ViewerTest_CmdParser.cxx
+index 04cb7d4b1cf4..a8619da14425 100644
+--- a/src/ViewerTest/ViewerTest_CmdParser.cxx
++++ b/src/ViewerTest/ViewerTest_CmdParser.cxx
+@@ -21,6 +21,7 @@
+
+ #include <algorithm>
+ #include <iostream>
++#include <limits>
+
+ namespace
+ {
+--
+2.40.0
+
diff --git a/utils/pmbootstrap/BUILD b/utils/pmbootstrap/BUILD
new file mode 100755
index 0000000..78e28e3
--- /dev/null
+++ b/utils/pmbootstrap/BUILD
@@ -0,0 +1 @@
+default_build_python3
diff --git a/utils/pmbootstrap/DEPENDS b/utils/pmbootstrap/DEPENDS
new file mode 100755
index 0000000..8c09196
--- /dev/null
+++ b/utils/pmbootstrap/DEPENDS
@@ -0,0 +1 @@
+depends python3
diff --git a/utils/pmbootstrap/DETAILS b/utils/pmbootstrap/DETAILS
new file mode 100755
index 0000000..2ee685a
--- /dev/null
+++ b/utils/pmbootstrap/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=pmbootstrap
+ VERSION=1.51.0
+ SOURCE="$SPELL-$VERSION.tar.bz2"
+
SOURCE_URL[0]=https://gitlab.com/postmarketOS/$SPELL/-/archive/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:3949624ebab6af6b555357b1f5faf8c0f3b1643a4cf6bdaa1abcb0f3021244150d4d47cd786ff12371edab554d37053cfaa7fae173cadb4d6dd77fc1b25ef4be
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="https://postmarketos.org/";
+ LICENSE[0]="GPL-3.0-or-later"
+ ENTERED=20230401
+ KEYWORDS=""
+ SHORT="chroot/build/flash tool to develop and install
postmarketOS"
+cat << EOF
+pmbootstrap is the central command-line application for postmarketOS
+development. Among other things, it allows building packages, creating
+installation images and flashing them to your phone. If you only want to
+install postmarketOS, make sure to read the installation article first since
+you might not need to install pmbootstrap depending on the method.
+EOF
diff --git a/utils/pmbootstrap/HISTORY b/utils/pmbootstrap/HISTORY
new file mode 100644
index 0000000..b1c707e
--- /dev/null
+++ b/utils/pmbootstrap/HISTORY
@@ -0,0 +1,2 @@
+2023-04-01 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/utils/pmbootstrap/INSTALL b/utils/pmbootstrap/INSTALL
new file mode 100755
index 0000000..6a91b84
--- /dev/null
+++ b/utils/pmbootstrap/INSTALL
@@ -0,0 +1 @@
+default_install_python3
- [SM-Commit] GIT changes to master grimoire by Ismael Luceno (12aaa98e07fbcccbcb6bc05538bddce4ea3c02f9), Ismael Luceno, 04/02/2023
Archive powered by MHonArc 2.6.24.