Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c7e324c4f643d3922f0f59b59cd9818342fb9c09)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (c7e324c4f643d3922f0f59b59cd9818342fb9c09)

Chronological Thread  
    < Chronological >       < Thread >
  • 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 (c7e324c4f643d3922f0f59b59cd9818342fb9c09)
  • Date: Fri, 23 Apr 2021 17:42:33 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

dev/null |binary
disk/squashfs-tools/BUILD | 13 ++-----------
disk/squashfs-tools/CONFIGURE | 2 --
disk/squashfs-tools/DEPENDS | 12 ++++++------
disk/squashfs-tools/DETAILS | 4 ++--
disk/squashfs-tools/HISTORY | 7 +++++++
disk/squashfs-tools/PRE_BUILD | 5 -----
libs/asio/DETAILS | 4 ++--
libs/asio/HISTORY | 3 +++
science/calc/BUILD | 11 +++++++++--
science/calc/DEPENDS | 11 +++++++++--
science/calc/DETAILS | 5 ++---
science/calc/HISTORY | 6 ++++++
science/calc/PRE_BUILD | 10 ----------
14 files changed, 48 insertions(+), 45 deletions(-)

New commits:
commit c7e324c4f643d3922f0f59b59cd9818342fb9c09
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

calc: Fix build against musl

commit e421c9df735f15b5cb44161c57a011c7c9d648e1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

calc: Fix handling of flags and dependencies

commit cf079a63ceaf70fb7cc164aec4fa7ba29f55b476
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

calc 2.13.0.1

commit 3dd6f0747e5cd8704142bcb985e26cb053c6c90b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

squashfs-tools: Fix dependencies

commit f8e4ae97eb0f6b1ce7442d831bc01536960cace5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

squashfs-tools 4.4

commit d0778a2d41551443a671b140e3da16e0c2b02476
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

asio 1.18.1

diff --git a/disk/squashfs-tools/BUILD b/disk/squashfs-tools/BUILD
index 01ed7e3..81e429a 100755
--- a/disk/squashfs-tools/BUILD
+++ b/disk/squashfs-tools/BUILD
@@ -1,12 +1,3 @@
+CFLAGS+=' -fcommon' &&
cd squashfs-tools &&
-if [[ "$SQUASHFS_LZMA" == "y" ]]; then
- sedit "s/#XZ_SUPPORT/XZ_SUPPORT/" Makefile
-fi &&
-if [[ "$SQUASHFS_LZO" == "y" ]]; then
- sedit "s/#LZO_SUPPORT/LZO_SUPPORT/" Makefile &&
- sedit "s:#LZO_DIR = /usr/local:LZO_DIR = /usr:" Makefile
-fi &&
-
-make
-
-
+make $OPTS
diff --git a/disk/squashfs-tools/CONFIGURE b/disk/squashfs-tools/CONFIGURE
deleted file mode 100755
index 7082767..0000000
--- a/disk/squashfs-tools/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query SQUASHFS_LZMA "Do you want LZMA compression support? (will
depend on some LZMA)" n &&
-config_query SQUASHFS_LZO "Do you want lzo compression support? (will depend
on lzo)" n
diff --git a/disk/squashfs-tools/DEPENDS b/disk/squashfs-tools/DEPENDS
index 695ab9d..3a77c82 100755
--- a/disk/squashfs-tools/DEPENDS
+++ b/disk/squashfs-tools/DEPENDS
@@ -1,6 +1,6 @@
-if [[ "$SQUASHFS_LZMA" == "y" ]]; then
- depends LZMA
-fi &&
-if [[ "$SQUASHFS_LZO" == "y" ]]; then
- depends lzo
-fi
+# TODO zlib could be made optional too (GZIP_SUPPORT+COMP_DEFAULT)
+depends zlib &&
+optional_depends LZMA XZ_SUPPORT={1,} 'for LZMA/XZ compression support' &&
+optional_depends lz4 LZ4_SUPPORT={1,} 'for LZ4 compression support' &&
+optional_depends lzo LZO_SUPPORT={1,} 'for LZO compression support' &&
+optional_depends zstd ZSTD_SUPPORT={1,} 'for Zstandard compression support'
diff --git a/disk/squashfs-tools/DETAILS b/disk/squashfs-tools/DETAILS
index ab1af61..66f8229 100755
--- a/disk/squashfs-tools/DETAILS
+++ b/disk/squashfs-tools/DETAILS
@@ -1,9 +1,9 @@
SPELL=squashfs-tools
- VERSION=4.3
+ VERSION=4.4
SOURCE=squashfs${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/squashfs${VERSION}

SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/squashfs/${SOURCE}
-
SOURCE_HASH=sha512:854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
+
SOURCE_HASH=sha512:e7119f82cea0eda8dffcbf15c9ee511ad457e004bfc0c5a5685e84785e49cf34f3c053036449af6bba0012cef48426f65958c97b9958d58f1b31175cb0bbbe24
WEB_SITE=https://squashfs.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20050104
diff --git a/disk/squashfs-tools/HISTORY b/disk/squashfs-tools/HISTORY
index cdaf88e..e093daf 100644
--- a/disk/squashfs-tools/HISTORY
+++ b/disk/squashfs-tools/HISTORY
@@ -1,3 +1,10 @@
+2021-04-23 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS: updated spell to 4.4
+ * CONFIGURE, PRE_BUILD: removed, no longer needed
+ * BUILD: removed unnecessary edits to the Makefile
+ * DEPENDS: converted configs into optional dependencies
+ added missing dependencies
+
2019-02-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3
* PRE_BUILD: added, fix build
diff --git a/disk/squashfs-tools/PRE_BUILD b/disk/squashfs-tools/PRE_BUILD
deleted file mode 100755
index b4aa350..0000000
--- a/disk/squashfs-tools/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sed -i '/types.h/ a\
-#include <sys/sysmacros.h>
-' squashfs-tools/mksquashfs.c squashfs-tools/unsquashfs.c
diff --git a/libs/asio/DETAILS b/libs/asio/DETAILS
index 6e6bce2..691de00 100755
--- a/libs/asio/DETAILS
+++ b/libs/asio/DETAILS
@@ -1,8 +1,8 @@
SPELL=asio
- VERSION=1.12.2
+ VERSION=1.18.1
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_URL[0]="https://downloads.sourceforge.net/sourceforge/$SPELL/$SPELL/${VERSION}%20%28Stable%29/${SOURCE}";
-
SOURCE_HASH=sha512:7ce2c9e846059a2205eca6bde285eab81164fbe087d51d35a33a07be6208049fcf07fc1ac33934a758b6b5907e56f3377e20bff10ffc9268376f81c6fae4e34a
+
SOURCE_HASH=sha512:06b41869858b69bc523564d5b219f8ebc995ca862e989f65233778c7596143075662880b6c5dd2eb24c21ba6e68a450888ab07a6bc8585bb6ede9a738e1e27c0
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://think-async.com/Asio/
LICENSE[0]=https://www.boost.org/LICENSE_1_0.txt
diff --git a/libs/asio/HISTORY b/libs/asio/HISTORY
index 0466007..5fc0771 100644
--- a/libs/asio/HISTORY
+++ b/libs/asio/HISTORY
@@ -1,3 +1,6 @@
+2021-04-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.18.1
+
2020-01-27 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.12.2
fixed WEB_SITE
diff --git a/science/calc/BUILD b/science/calc/BUILD
index bf16c64..88ea4ef 100755
--- a/science/calc/BUILD
+++ b/science/calc/BUILD
@@ -1,2 +1,9 @@
-export PAGER=""
-make -j1
+case "$HOST" in
+ (*-musl)
+ OPTS+=' HAVE_FPOS=-DHAVE_NO_FPOS'
+ ;;
+esac &&
+make -j1 $OPTS \
+ DEBUG= \
+ EXTRA_CFLAGS="$CFLAGS" \
+ EXTRA_LDFLAGS="$LDFLAGS"
diff --git a/science/calc/DEPENDS b/science/calc/DEPENDS
index a4e768d..c2bd9d2 100755
--- a/science/calc/DEPENDS
+++ b/science/calc/DEPENDS
@@ -1,2 +1,9 @@
-optional_depends "readline" "--enable-readline" "--disable-readline" "for
readline support" &&
-optional_depends "less" "--enable-less" "--disable-less" "for enabline less
as the default pager (more otherwise)"
+optional_depends readline \
+ 'USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline
READLINE_EXTRAS=-lhistory READLINE_EXTRAS+=-lncurses' \
+ '' \
+ 'for line editing support' &&
+
+optional_depends less \
+ 'CALCPAGER=less' \
+ 'CALCPAGER=more' \
+ 'use "less" instead of "more" as the default pager'
diff --git a/science/calc/DETAILS b/science/calc/DETAILS
index 3dced3b..9202cbd 100755
--- a/science/calc/DETAILS
+++ b/science/calc/DETAILS
@@ -1,11 +1,10 @@
SPELL=calc
- VERSION=2.12.4.3
+ VERSION=2.13.0.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.isthe.com/chongo/src/calc/$SOURCE
SOURCE_URL[1]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
-#
SOURCE_HASH=sha512:701e8414366f112aa0aba2359a0d76037994fa647d14beb216a23a05e328665b2e0218b902b5e2a447ccf6277795baef4c68e278e12dfc40b1ee95f23858b9f4
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:7d7e07072779c97aaeb966f9282a6e4127c839ecadd0b7269d37d587949c47075d301c3420735f903ba179ae2bbbd309fd29e459fbf12b450e528aadc66537c4
LICENSE[0]=LGPL
WEB_SITE=http://www.sourceforge.net/projects/calc
KEYWORDS="calculator science"
diff --git a/science/calc/HISTORY b/science/calc/HISTORY
index 0ae2e10..0f6a3f0 100644
--- a/science/calc/HISTORY
+++ b/science/calc/HISTORY
@@ -1,3 +1,9 @@
+2021-04-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.13.0.1
+ * DEPENDS, BUILD: fixed handling of flags and dependencies
+ * PRE_BUILD: removed, no longer needed
+ * BUILD: fixed build against musl
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/science/calc/PRE_BUILD b/science/calc/PRE_BUILD
deleted file mode 100755
index 9d044a6..0000000
--- a/science/calc/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-sedit 's:^DEBUG:#&:' $SOURCE_DIRECTORY/Makefile &&
-sedit "s:EXTRA_CFLAGS=:&${CFLAGS}:" $SOURCE_DIRECTORY/Makefile &&
-sedit "s:EXTRA_LDFLAGS=:&${LDFLAGS}:" $SOURCE_DIRECTORY/Makefile &&
-
-if is_depends_enabled $SPELL readline; then
- sedit 's:^USE_READLINE=:&-DUSE_READLINE:' $SOURCE_DIRECTORY/Makefile &&
- sedit 's:^READLINE_LIB=:&-lreadline:' $SOURCE_DIRECTORY/Makefile &&
- sedit 's:^READLINE_EXTRAS=:&-lhistory -lncurses:'
$SOURCE_DIRECTORY/Makefile
-fi
diff --git a/science/calc/calc-2.12.4.3.tar.bz2.sig
b/science/calc/calc-2.12.4.3.tar.bz2.sig
deleted file mode 100644
index 71c3be6..0000000
Binary files a/science/calc/calc-2.12.4.3.tar.bz2.sig and /dev/null differ


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c7e324c4f643d3922f0f59b59cd9818342fb9c09), Ismael Luceno, 04/23/2021

Archive powered by MHonArc 2.6.24.

Top of Page