Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (064c5e46e9b51a7253c8c498af1570a4ed74034a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (064c5e46e9b51a7253c8c498af1570a4ed74034a)
  • Date: Mon, 8 Mar 2021 08:12:21 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

audio-libs/libebur128/DETAILS | 4
audio-libs/libebur128/HISTORY | 3
kde5-extra/libalkimia/DETAILS | 2
kde5-extra/libalkimia/HISTORY | 3
libs/libodfgen/DETAILS | 4
libs/libodfgen/HISTORY | 3
smgl/fakeroot/BUILD | 3
smgl/fakeroot/HISTORY | 3
utils/installwatch/DETAILS | 2
utils/installwatch/HISTORY | 6
utils/installwatch/patches/0001-generalise-glibc-version-check.patch | 89
++++++++++
utils/installwatch/patches/0002-fix-glibc-2.33-compatability.patch | 32
+++
utils/installwatch/patches/0002-glibc-2.13.patch | 22
--
utils/schroot/DEPENDS | 2
utils/schroot/HISTORY | 3
video-libs/libebml/DETAILS | 4
video-libs/libebml/HISTORY | 6
video-libs/libmatroska/DETAILS | 4
video-libs/libmatroska/HISTORY | 3
19 files changed, 165 insertions(+), 33 deletions(-)

New commits:
commit 064c5e46e9b51a7253c8c498af1570a4ed74034a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

schroot - depends GETTEXT

commit 8c95745f143e87bf5c6b684d16192bf42798a2ca
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fakeroot - fix build with glibc-2.33

commit f8181498c5d4b2ea123effdb23068adba604ee72
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libebur128: => 1.2.6

commit 8e13dc5a22e0103d6079d24b17d78ea2a069dd2c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libodfgen: => 0.1.8

commit 48e56033bb2005ddfa7d32626a24abd210b38436
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libebml: => 1.4.2

commit 331fdb6f45526c23bbbb9fa78b19f1fd16f237ad
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libmatroska: => 1.6.3

commit 76612e1dc9b9c31ca786939c36379365f74c0855
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libebml: => 1.4.1

commit 3562a1e918017e3ca680ad604f6260d05e09572e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

installwatch - fix for glibc-2.33

commit aaed24b554583d1d3742ca8030efb3f9ee8b2768
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libalkimia: => 8.1.0

diff --git a/audio-libs/libebur128/DETAILS b/audio-libs/libebur128/DETAILS
index 823439b..3eda75b 100755
--- a/audio-libs/libebur128/DETAILS
+++ b/audio-libs/libebur128/DETAILS
@@ -1,6 +1,6 @@
SPELL=libebur128
- VERSION=1.2.4
-
SOURCE_HASH=sha512:d9aec133aca9240f7e859aae30cfcab07ba7aa20378187d53dfeec4cd3840d49bb117fa0698591bac04d95f9d8b5cd0b1fbe41c364694f2fa8267dd690b2dc02
+ VERSION=1.2.6
+
SOURCE_HASH=sha512:ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/jiixyj/$SPELL
diff --git a/audio-libs/libebur128/HISTORY b/audio-libs/libebur128/HISTORY
index d282602..2eec6c6 100644
--- a/audio-libs/libebur128/HISTORY
+++ b/audio-libs/libebur128/HISTORY
@@ -1,3 +1,6 @@
+2021-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.2.6
+
2018-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.2.4

diff --git a/kde5-extra/libalkimia/DETAILS b/kde5-extra/libalkimia/DETAILS
index 23e1e35..0e2952e 100755
--- a/kde5-extra/libalkimia/DETAILS
+++ b/kde5-extra/libalkimia/DETAILS
@@ -1,5 +1,5 @@
SPELL=libalkimia
- VERSION=8.0.4
+ VERSION=8.1.0
SOURCE=alkimia-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/alkimia/${VERSION}/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-extra/libalkimia/HISTORY b/kde5-extra/libalkimia/HISTORY
index def677f..f66dfa1 100644
--- a/kde5-extra/libalkimia/HISTORY
+++ b/kde5-extra/libalkimia/HISTORY
@@ -1,3 +1,6 @@
+2021-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.1.0
+
2020-10-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 8.0.4
use habacker.gpg
diff --git a/libs/libodfgen/DETAILS b/libs/libodfgen/DETAILS
index 92b3795..bd64def 100755
--- a/libs/libodfgen/DETAILS
+++ b/libs/libodfgen/DETAILS
@@ -1,6 +1,6 @@
SPELL=libodfgen
- VERSION=0.1.7
-
SOURCE_HASH=sha512:eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
+ VERSION=0.1.8
+
SOURCE_HASH=sha512:e4a15aa7f1db483cdbb9c531bfb234b4794890cc583c70e8aa3374771be8928e7917105d48dab80d1ab6d57e43fa78415097d9b897cb12fb2a609f4647ee99d6
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://dev-www.libreoffice.org/src/${SOURCE}
diff --git a/libs/libodfgen/HISTORY b/libs/libodfgen/HISTORY
index b8f7cdf..8cd7b9d 100644
--- a/libs/libodfgen/HISTORY
+++ b/libs/libodfgen/HISTORY
@@ -1,3 +1,6 @@
+2021-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.1.8
+
2018-08-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.1.7

diff --git a/smgl/fakeroot/BUILD b/smgl/fakeroot/BUILD
index 7b666a7..3ba091a 100755
--- a/smgl/fakeroot/BUILD
+++ b/smgl/fakeroot/BUILD
@@ -1,4 +1,7 @@
case "$HOST" in *-musl)
CFLAGS+=" -D_STAT_VER=0" ;;
esac &&
+if spell_ok glibc && installed_version glibc >= 2.33;then
+ CFLAGS+=" -D_STAT_VER=0"
+fi &&
default_build
diff --git a/smgl/fakeroot/HISTORY b/smgl/fakeroot/HISTORY
index 3e360e4..3f49c99 100644
--- a/smgl/fakeroot/HISTORY
+++ b/smgl/fakeroot/HISTORY
@@ -1,3 +1,6 @@
+2021-03-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: fix for glibc-2.33
+
2019-06-09 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.23
* BUILD: Fixed build against musl
diff --git a/utils/installwatch/DETAILS b/utils/installwatch/DETAILS
index 9ff2ae2..e80ea39 100755
--- a/utils/installwatch/DETAILS
+++ b/utils/installwatch/DETAILS
@@ -1,6 +1,6 @@
SPELL=installwatch
VERSION=2010-12-12
- PATCHLEVEL=3
+ PATCHLEVEL=4
SOURCE=$SPELL-$VERSION.tar.bz2

SOURCE_HASH=sha512:eda74e4a8b1707b7b5992e222baa8873b6248c0c9ef4475c521bef4dc3ba5374713ba09fc0acdaa369c67930865924994f4c15deb7b6b0e39cce5eeb6d24e50f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
diff --git a/utils/installwatch/HISTORY b/utils/installwatch/HISTORY
index 7018964..77ef853 100644
--- a/utils/installwatch/HISTORY
+++ b/utils/installwatch/HISTORY
@@ -1,3 +1,9 @@
+2021-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS:++PATCHLEVEL
+ * patches/0002-glibc-2.13.patch: deleted
+ * patches/0001-generalise-glibc-version-check.patch: added
+ * patches/0002-fix-glibc-2.33-compatability.patch: added
+
2020-08-31 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, patches/: use apply_patch_dir
* patches/0005-result-unint.patch: Fix warning.
diff --git
a/utils/installwatch/patches/0001-generalise-glibc-version-check.patch
b/utils/installwatch/patches/0001-generalise-glibc-version-check.patch
new file mode 100644
index 0000000..862e766
--- /dev/null
+++ b/utils/installwatch/patches/0001-generalise-glibc-version-check.patch
@@ -0,0 +1,89 @@
+From bc8e31412f69594926ed909ce277687e28a332c5 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sun, 7 Mar 2021 13:09:34 +0100
+Subject: [PATCH 1/2] generalise glibc version check
+
+---
+ create-localdecls | 66 +++++++----------------------------------------
+ 1 file changed, 9 insertions(+), 57 deletions(-)
+
+diff --git a/create-localdecls b/create-localdecls
+index f7adf4d..336e242 100755
+--- a/create-localdecls
++++ b/create-localdecls
+@@ -55,63 +55,15 @@ if test "$VERSION" = 'libc.so.5' ; then
+ fi
+
+ if test "$VERSION" = 'libc.so.6' ; then
+- echo -n 'Checking glibc subversion... '
+- tmp="`ldd /bin/sh | grep libc.so 2> /dev/null`"
+- LibcPath=`expr "$tmp" : '[^/]*\(/[^ ]*\)'`
+- tmp="`strings $LibcPath | grep -i 'c library'`"
+- OsLibcMajor=`expr "$tmp" : '.* \([0-9][0-9]*\)'`
+- OsLibcMinor=`expr "$tmp" : '.* [0-9][0-9]*\.\([0-9][0-9]*\)'`
+- case "$OsLibcMajor" in
+- 2)
+- # 2 is the glibc version
+- echo "JH OsLibcMinor is $OsLibcMinor"
+- case "$OsLibcMinor" in
+- 0)
+- echo '#define GLIBC_MINOR 0' >> $OUTFILE
+- SUBVERSION='glibc-2.0' ;;
+- 1)
+- echo '#define GLIBC_MINOR 1' >> $OUTFILE
+- SUBVERSION='glibc-2.1' ;;
+- 2)
+- echo '#define GLIBC_MINOR 2' >> $OUTFILE
+- SUBVERSION='glibc-2.2' ;;
+- 3)
+- echo '#define GLIBC_MINOR 3' >> $OUTFILE
+- SUBVERSION='glibc-2.3' ;;
+- 4)
+- echo '#define GLIBC_MINOR 4' >> $OUTFILE
+- SUBVERSION='glibc-2.4' ;;
+- 5)
+- echo '#define GLIBC_MINOR 5' >> $OUTFILE
+- SUBVERSION='glibc-2.5' ;;
+- 6)
+- echo '#define GLIBC_MINOR 6' >> $OUTFILE
+- SUBVERSION='glibc-2.6' ;;
+- 7)
+- echo '#define GLIBC_MINOR 7' >> $OUTFILE
+- SUBVERSION='glibc-2.7' ;;
+- 8)
+- echo '#define GLIBC_MINOR 8' >> $OUTFILE
+- SUBVERSION='glibc-2.8' ;;
+- 9)
+- echo '#define GLIBC_MINOR 9' >> $OUTFILE
+- SUBVERSION='glibc-2.9' ;;
+- 10)
+- echo '#define GLIBC_MINOR 10' >> $OUTFILE
+- SUBVERSION='glibc-2.10' ;;
+- 11)
+- echo '#define GLIBC_MINOR 11' >> $OUTFILE
+- SUBVERSION='glibc-2.11' ;;
+- 12)
+- echo '#define GLIBC_MINOR 12' >> $OUTFILE
+- SUBVERSION='glibc-2.12' ;;
+- *)
+- echo 'Treated as glibc >= 2.1 (finger crossed)'
+- echo '#define GLIBC_MINOR 1' >> $OUTFILE
+- SUBVERSION='glibc-2.1' ;;
+- esac
+- ;;
+- esac
++ echo 'Checking glibc subversion... '
++
++ tmp=`ls /lib | grep libc- |sed -e 's/.so//' | cut -d- -f2`
++
++ echo 'glibc version: ' $tmp
++
++ OsLibcMajor=${tmp%.??}
++ OsLibcMinor=${tmp//?.}
++ echo '#define GLIBC_MINOR ' $OsLibcMinor >> $OUTFILE
+ fi
+
+ echo >> $OUTFILE
+--
+2.30.1
+
diff --git
a/utils/installwatch/patches/0002-fix-glibc-2.33-compatability.patch
b/utils/installwatch/patches/0002-fix-glibc-2.33-compatability.patch
new file mode 100644
index 0000000..de407fd
--- /dev/null
+++ b/utils/installwatch/patches/0002-fix-glibc-2.33-compatability.patch
@@ -0,0 +1,32 @@
+From 56aa92974c8f88935b5d64b75ec59b3ac92c3653 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sun, 7 Mar 2021 16:21:42 +0100
+Subject: [PATCH 2/2] fix glibc-2.33 compatability
+
+---
+ installwatch.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/installwatch.c b/installwatch.c
+index 610a824..cbea001 100644
+--- a/installwatch.c
++++ b/installwatch.c
+@@ -48,6 +48,15 @@
+ #include <dlfcn.h>
+ #include <dirent.h>
+
++/* glibc-2.33 removed these defs */
++#ifndef _STAT_VER
++#define _STAT_VER 0
++#endif
++#ifndef _MKNOD_VER
++#define _MKNOD_VER 0
++#endif
++
++
+ /* There's no d_off on GNU/kFreeBSD */
+ #if defined(__FreeBSD_kernel__)
+ #define D_OFF(X) (-1)
+--
+2.30.1
+
diff --git a/utils/installwatch/patches/0002-glibc-2.13.patch
b/utils/installwatch/patches/0002-glibc-2.13.patch
deleted file mode 100644
index 68c2e9c..0000000
--- a/utils/installwatch/patches/0002-glibc-2.13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur installwatch.ori//create-localdecls installwatch/create-localdecls
---- installwatch.ori//create-localdecls 2011-02-05 12:46:19.000000000
+0100
-+++ installwatch/create-localdecls 2011-02-05 12:50:10.000000000 +0100
-@@ -105,6 +105,18 @@
- 12)
- echo '#define GLIBC_MINOR 12' >> $OUTFILE
- SUBVERSION='glibc-2.12' ;;
-+ 13)
-+ echo '#define GLIBC_MINOR 13' >> $OUTFILE
-+ SUBVERSION='glibc-2.13' ;;
-+ 14)
-+ echo '#define GLIBC_MINOR 14' >> $OUTFILE
-+ SUBVERSION='glibc-2.14' ;;
-+ 15)
-+ echo '#define GLIBC_MINOR 15' >> $OUTFILE
-+ SUBVERSION='glibc-2.15' ;;
-+ 16)
-+ echo '#define GLIBC_MINOR 16' >> $OUTFILE
-+ SUBVERSION='glibc-2.16' ;;
- *)
- echo 'Treated as glibc >= 2.1 (finger crossed)'
- echo '#define GLIBC_MINOR 1' >> $OUTFILE
diff --git a/utils/schroot/DEPENDS b/utils/schroot/DEPENDS
index dcd2160..f198d75 100755
--- a/utils/schroot/DEPENDS
+++ b/utils/schroot/DEPENDS
@@ -15,4 +15,4 @@ optional_depends linux-pam \
'PAM support' &&

# XXX fails to build without gettext
-depends gettext --enable-nls
+depends GETTEXT --enable-nls
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index 9634c3d..854f21a 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,6 @@
+2021-03-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: use GETTEXT
+
2021-02-18 Ismael Luceno <ismael AT iodev.co.uk>
* patches/0002-getmntent.patch: added patch to fix getmntent usage
* patches/0003-getent.patch: added patch to make it work without
getent
diff --git a/video-libs/libebml/DETAILS b/video-libs/libebml/DETAILS
index a2021b5..7404a0b 100755
--- a/video-libs/libebml/DETAILS
+++ b/video-libs/libebml/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=libebml
- VERSION=1.3.9
-
SOURCE_HASH=sha512:a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e
+ VERSION=1.4.2
+
SOURCE_HASH=sha512:b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://dl.matroska.org/downloads/$SPELL/$SOURCE
diff --git a/video-libs/libebml/HISTORY b/video-libs/libebml/HISTORY
index 334dd5e..35ca6d6 100644
--- a/video-libs/libebml/HISTORY
+++ b/video-libs/libebml/HISTORY
@@ -1,3 +1,9 @@
+2021-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.2
+
+2021-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.1
+
2019-09-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.9

diff --git a/video-libs/libmatroska/DETAILS b/video-libs/libmatroska/DETAILS
index e6e897e..842ae5b 100755
--- a/video-libs/libmatroska/DETAILS
+++ b/video-libs/libmatroska/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=libmatroska
- VERSION=1.5.2
-
SOURCE_HASH=sha512:122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2
+ VERSION=1.6.3
+
SOURCE_HASH=sha512:271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://dl.matroska.org/downloads/$SPELL/$SOURCE
diff --git a/video-libs/libmatroska/HISTORY b/video-libs/libmatroska/HISTORY
index 196768f..916e07b 100644
--- a/video-libs/libmatroska/HISTORY
+++ b/video-libs/libmatroska/HISTORY
@@ -1,3 +1,6 @@
+2021-03-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.6.3
+
2019-09-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.2




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (064c5e46e9b51a7253c8c498af1570a4ed74034a), Treeve Jelbert, 03/08/2021

Archive powered by MHonArc 2.6.24.

Top of Page