Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8954ad470419843b6d05bf8892b81eb4f8c1179d)

Chronological Thread  
    < 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 (8954ad470419843b6d05bf8892b81eb4f8c1179d)
  • Date: Thu, 5 Nov 2020 07:59:59 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/icu/DETAILS | 2 -
libs/icu/HISTORY | 4 ++
libs/icu/icu.gpg |binary
libs/libical/HISTORY | 3 +
libs/libical/PRE_BUILD | 3 +
libs/libical/patches/bool.patch | 61
++++++++++++++++++++++++++++++++++++++++
libs/libxml2/HISTORY | 3 +
libs/libxml2/PRE_BUILD | 3 +
libs/libxml2/patches/ggc.patch | 15 +++++++++
libs/re2/DETAILS | 4 +-
libs/re2/HISTORY | 3 +
python-pypi/pyicu/DETAILS | 6 +--
python-pypi/pyicu/HISTORY | 3 +
xorg-app/xkbcomp/DETAILS | 2 -
xorg-app/xkbcomp/HISTORY | 3 +
15 files changed, 108 insertions(+), 7 deletions(-)

New commits:
commit 8954ad470419843b6d05bf8892b81eb4f8c1179d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

xkbcomp: => 1.4.4

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

libical - fix for icu-68

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

libxml2 - fix for gcc-10.2

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

pyicu: => 2.6

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

icu: => 68.1

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

re2: => 2020-11-01

diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index 47c91e3..aa3abb8 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,6 +1,6 @@
SPELL=icu
if [[ "$ICU_DEV" == 'y' ]]; then
- VERSION=67.1
+ VERSION=68.1
else
VERSION=64.2
fi
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index d72580c..843c1d2 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,7 @@
+2020-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 68.1
+ * icu.gpg: add Craig Cornelius
+
2020-05-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 67.1

diff --git a/libs/icu/icu.gpg b/libs/icu/icu.gpg
index 15a472d..948cdd7 100644
Binary files a/libs/icu/icu.gpg and b/libs/icu/icu.gpg differ
diff --git a/libs/libical/HISTORY b/libs/libical/HISTORY
index 37dabac..5af6365 100644
--- a/libs/libical/HISTORY
+++ b/libs/libical/HISTORY
@@ -1,3 +1,6 @@
+2020-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches/bool.patch: added, fix for latest icu
+
2020-03-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.0.8

diff --git a/libs/libical/PRE_BUILD b/libs/libical/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/libs/libical/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/libs/libical/patches/bool.patch b/libs/libical/patches/bool.patch
new file mode 100644
index 0000000..7491245
--- /dev/null
+++ b/libs/libical/patches/bool.patch
@@ -0,0 +1,61 @@
+diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
+index e4d0e2ec..bba33fa9 100644
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
+@@ -10,6 +10,7 @@ check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
+ check_include_files(fcntl.h HAVE_FCNTL_H)
+ check_include_files(unistd.h HAVE_UNISTD_H)
+ check_include_files(wctype.h HAVE_WCTYPE_H)
++check_include_files(stdbool.h HAVE_STDBOOL_H)
+
+ include(CheckFunctionExists)
+ if(WIN32 AND MSVC)
+diff --git a/config.h.cmake b/config.h.cmake
+index 8fd3421b..c8008692 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -39,6 +39,9 @@
+ /* Define to 1 if you have the <dirent.h> header file. */
+ #cmakedefine HAVE_DIRENT_H 1
+
++/* Define to 1 if you have the <stdbool.h> header file. */
++#cmakedefine HAVE_STDBOOL_H 1
++
+ /* Define if we have pthread. */
+ #cmakedefine HAVE_PTHREAD_ATTR_GET_NP 1
+ #cmakedefine HAVE_PTHREAD_GETATTR_NP 1
+diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
+index 38ee2bb3..64ec9732 100644
+--- a/src/libical/icalrecur.c
++++ b/src/libical/icalrecur.c
+@@ -145,6 +145,12 @@
+ #if defined(HAVE_LIBICU)
+ #include <unicode/ucal.h>
+ #include <unicode/ustring.h>
++#if defined(HAVE_STDBOOL_H)
++#include <stdbool.h>
++#else
++#define false 0
++#define true 1
++#endif
+ #define RSCALE_IS_SUPPORTED 1
+ #else
+ #define RSCALE_IS_SUPPORTED 0
+@@ -1018,7 +1024,7 @@ icalarray
*icalrecurrencetype_rscale_supported_calendars(void)
+
+ calendars = icalarray_new(sizeof(const char **), 20);
+
+- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE, &status);
++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false, &status);
+ while ((cal = uenum_next(en, NULL, &status))) {
+ cal = icalmemory_tmp_copy(cal);
+ icalarray_append(calendars, &cal);
+@@ -1411,7 +1417,7 @@ static int initialize_rscale(icalrecur_iterator *impl)
+ }
+
+ /* Check if specified calendar is supported */
+- en = ucal_getKeywordValuesForLocale("calendar", NULL, FALSE,
&status);
++ en = ucal_getKeywordValuesForLocale("calendar", NULL, false,
&status);
+ while ((cal = uenum_next(en, NULL, &status))) {
+ if (!strcmp(cal, rule.rscale)) {
+ is_hebrew = !strcmp(rule.rscale, "hebrew");
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index ea39dff..01dea3b 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2020-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD patches/gcc,patch: added, fix for gcc-10.2
+
2020-06-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, BUILD: depend on python3

diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/libs/libxml2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/libs/libxml2/patches/ggc.patch b/libs/libxml2/patches/ggc.patch
new file mode 100644
index 0000000..eacc4f2
--- /dev/null
+++ b/libs/libxml2/patches/ggc.patch
@@ -0,0 +1,15 @@
+diff -uNr libxml2-2.9.10.orig/encoding.c libxml2-2.9.10/encoding.c
+--- libxml2-2.9.10.orig/encoding.c 2019-10-22 20:46:01.000000000 +0200
++++ libxml2-2.9.10/encoding.c 2020-11-04 13:20:06.944305628 +0100
+@@ -44,6 +44,11 @@
+ #endif
+ #include <libxml/globals.h>
+ #include <libxml/xmlerror.h>
++#ifndef FALSE
++# define FALSE (1 == 0)
++# define TRUE (! FALSE)
++#endif
++
+
+ #include "buf.h"
+ #include "enc.h"
diff --git a/libs/re2/DETAILS b/libs/re2/DETAILS
index 43625ac..62f756c 100755
--- a/libs/re2/DETAILS
+++ b/libs/re2/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=re2
- VERSION=2020-10-01
-
SOURCE_HASH=sha512:cd620878ffa6d4e47f1583f27a179f6520fc1226554bd7c0e104d3d45b2bee70873c0d661e87eb4a9d912b58f86f115766c35d08e124f5f67ddcc3b50535f726
+ VERSION=2020-11-01
+
SOURCE_HASH=sha512:167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
SOURCE=$SPELL-v$VERSION.tar.gz
SOURCE_URL=https://github.com/google/re2/archive/$VERSION.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/libs/re2/HISTORY b/libs/re2/HISTORY
index e56bf48..cafcb50 100644
--- a/libs/re2/HISTORY
+++ b/libs/re2/HISTORY
@@ -1,3 +1,6 @@
+2020-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2020-11-01
+
2020-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2020-10-01

diff --git a/python-pypi/pyicu/DETAILS b/python-pypi/pyicu/DETAILS
index 270c9cb..7378954 100755
--- a/python-pypi/pyicu/DETAILS
+++ b/python-pypi/pyicu/DETAILS
@@ -1,8 +1,8 @@
SPELL=pyicu
SPELLX=PyICU
- VERSION=2.5
-
VX=5a/99/c48c816095208bf3f4936ff67e571621fbddef461303a35a076f234e31f6
-
SOURCE_HASH=sha512:b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
+ VERSION=2.6
+
VX=31/46/fa08c8efae2951e67681ec24319f789fc1a74e2096dd74373e34c79319de
+
SOURCE_HASH=sha512:ab4c167cbeb80a23904476e51a3c16aa4721e26840b1d4c2f44b5a610e5467a6880c45f27636efb9e44e8e4302a095d437f4868409103270d79ecd56a3d90c9c
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=https://files.pythonhosted.org/packages/$VX/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/python-pypi/pyicu/HISTORY b/python-pypi/pyicu/HISTORY
index 442e3c1..5812ed7 100644
--- a/python-pypi/pyicu/HISTORY
+++ b/python-pypi/pyicu/HISTORY
@@ -1,3 +1,6 @@
+2020-11-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.6
+
2020-10-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.5
* DEPENDS: only python3
diff --git a/xorg-app/xkbcomp/DETAILS b/xorg-app/xkbcomp/DETAILS
index 329387c..2b01ea8 100755
--- a/xorg-app/xkbcomp/DETAILS
+++ b/xorg-app/xkbcomp/DETAILS
@@ -1,6 +1,6 @@
SPELL=xkbcomp
PKG=xkbcomp
- VERSION=1.4.3
+ VERSION=1.4.4
SOURCE=${PKG}-${VERSION}.tar.bz2

SOURCE_URL[0]=https://xorg.freedesktop.org/releases/individual/app/${SOURCE}
SOURCE2=$SOURCE.sig
diff --git a/xorg-app/xkbcomp/HISTORY b/xorg-app/xkbcomp/HISTORY
index d2a1e1b..e11f6c9 100644
--- a/xorg-app/xkbcomp/HISTORY
+++ b/xorg-app/xkbcomp/HISTORY
@@ -1,3 +1,6 @@
+2020-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.4.4
+
2020-02-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.3



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8954ad470419843b6d05bf8892b81eb4f8c1179d), Treeve Jelbert, 11/05/2020

Archive powered by MHonArc 2.6.24.

Top of Page