Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (30132636284d544cede032889bc314761b1ab60e)

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 (30132636284d544cede032889bc314761b1ab60e)
  • Date: Tue, 14 Nov 2023 19:13:21 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird4/0001-btyacc-fix-mktemp-usage.patch | 35
----------
database/firebird4/HISTORY | 5 +
database/firebird4/patches/0001-btyacc-fix-mktemp-usage.patch | 35
++++++++++
database/firebird4/patches/0002-use-system-re2.patch | 26 +++++++
libs/abseil-cpp/DETAILS | 4 -
libs/abseil-cpp/HISTORY | 3
libs/libedit/DETAILS | 4 -
libs/libedit/HISTORY | 3
8 files changed, 75 insertions(+), 40 deletions(-)

New commits:
commit 30132636284d544cede032889bc314761b1ab60e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libedit: => 20230828-3.1

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

firebird4 - pathc for re2

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

abseil-cpp: => 20230802.1

diff --git a/database/firebird4/0001-btyacc-fix-mktemp-usage.patch
b/database/firebird4/0001-btyacc-fix-mktemp-usage.patch
deleted file mode 100644
index e4d551a..0000000
--- a/database/firebird4/0001-btyacc-fix-mktemp-usage.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a8efd16d36a0f2ccf727d6a697ea7ca949d633fc Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Fri, 7 Aug 2020 12:25:06 +0200
-Subject: [PATCH 1/3] btyacc - fix mktemp usage
-
----
- extern/btyacc/main.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/extern/btyacc/main.c b/extern/btyacc/main.c
-index 6ac4cbd850..240520cdfd 100644
---- a/extern/btyacc/main.c
-+++ b/extern/btyacc/main.c
-@@ -341,15 +341,15 @@ void create_file_names()
- text_file_name[len + 5] = 't';
- union_file_name[len + 5] = 'u';
-
-- if(mktemp(action_file_name) == NULL) {
-+ if(mkstemp(action_file_name) == -1) {
- fprintf(stderr, "btyacc: Cannot create temporary file\n");
- exit(1);
- }
-- if(mktemp(text_file_name) == NULL) {
-+ if(mkstemp(text_file_name) == -1) {
- fprintf(stderr, "btyacc: Cannot create temporary file\n");
- exit(1);
- }
-- if(mktemp(union_file_name) == NULL) {
-+ if(mkstemp(union_file_name) == -1) {
- fprintf(stderr, "btyacc: Cannot create temporary file\n");
- exit(1);
- }
---
-2.39.1
-
diff --git a/database/firebird4/HISTORY b/database/firebird4/HISTORY
index e1662a5..10cb2f8 100644
--- a/database/firebird4/HISTORY
+++ b/database/firebird4/HISTORY
@@ -1,4 +1,7 @@
-x2023-11-09 Treeve Jelbert <treeve AT sourcemage.org>
+2023-11-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/0002-use-system-re2.patch: added
+
+2023-11-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.4.3010-0

2023-08-19 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/database/firebird4/patches/0001-btyacc-fix-mktemp-usage.patch
b/database/firebird4/patches/0001-btyacc-fix-mktemp-usage.patch
new file mode 100644
index 0000000..4c1b72c
--- /dev/null
+++ b/database/firebird4/patches/0001-btyacc-fix-mktemp-usage.patch
@@ -0,0 +1,35 @@
+From d3a1b90eb987e25741a7b750a91afc55dc3a1070 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Fri, 7 Aug 2020 12:25:06 +0200
+Subject: [PATCH 1/2] btyacc - fix mktemp usage
+
+---
+ extern/btyacc/main.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/extern/btyacc/main.c b/extern/btyacc/main.c
+index 6ac4cbd850..240520cdfd 100644
+--- a/extern/btyacc/main.c
++++ b/extern/btyacc/main.c
+@@ -341,15 +341,15 @@ void create_file_names()
+ text_file_name[len + 5] = 't';
+ union_file_name[len + 5] = 'u';
+
+- if(mktemp(action_file_name) == NULL) {
++ if(mkstemp(action_file_name) == -1) {
+ fprintf(stderr, "btyacc: Cannot create temporary file\n");
+ exit(1);
+ }
+- if(mktemp(text_file_name) == NULL) {
++ if(mkstemp(text_file_name) == -1) {
+ fprintf(stderr, "btyacc: Cannot create temporary file\n");
+ exit(1);
+ }
+- if(mktemp(union_file_name) == NULL) {
++ if(mkstemp(union_file_name) == -1) {
+ fprintf(stderr, "btyacc: Cannot create temporary file\n");
+ exit(1);
+ }
+--
+2.42.1
+
diff --git a/database/firebird4/patches/0002-use-system-re2.patch
b/database/firebird4/patches/0002-use-system-re2.patch
new file mode 100644
index 0000000..9c3dbf4
--- /dev/null
+++ b/database/firebird4/patches/0002-use-system-re2.patch
@@ -0,0 +1,26 @@
+From dd053574821f3749148046eb2c0e14a8c5ff7430 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 14 Nov 2023 14:41:26 +0100
+Subject: [PATCH 2/2] use system re2
+
+---
+ src/common/SimilarToRegex.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/SimilarToRegex.h b/src/common/SimilarToRegex.h
+index 89b8121a1a..3ebcf36641 100644
+--- a/src/common/SimilarToRegex.h
++++ b/src/common/SimilarToRegex.h
+@@ -22,7 +22,8 @@
+ #define FB_COMMON_SIMILAR_TO_REGEX_H
+
+ #include "firebird.h"
+-#include "re2/re2.h"
++#include <re2/re2.h>
++#include <re2/stringpiece.h>
+ #include "../common/classes/auto.h"
+ #include "../common/classes/array.h"
+ #include "../common/classes/fb_string.h"
+--
+2.42.1
+
diff --git a/libs/abseil-cpp/DETAILS b/libs/abseil-cpp/DETAILS
index acfc29b..be56a72 100755
--- a/libs/abseil-cpp/DETAILS
+++ b/libs/abseil-cpp/DETAILS
@@ -1,7 +1,7 @@
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=abseil-cpp
- VERSION=20230125.3
-
SOURCE_HASH=sha512:50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70
+ VERSION=20230802.1
+
SOURCE_HASH=sha512:14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/abseil/$SPELL/archive/refs/tags/$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/abseil-cpp/HISTORY b/libs/abseil-cpp/HISTORY
index b305c66..51f9b6b 100644
--- a/libs/abseil-cpp/HISTORY
+++ b/libs/abseil-cpp/HISTORY
@@ -1,3 +1,6 @@
+2023-11-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20230802.1
+
2023-07-16 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD, patches/0001-Fix-build-against-musl-libc.patch:
fixed build against musl
diff --git a/libs/libedit/DETAILS b/libs/libedit/DETAILS
index 030060e..6847390 100755
--- a/libs/libedit/DETAILS
+++ b/libs/libedit/DETAILS
@@ -1,6 +1,6 @@
SPELL=libedit
- VERSION=20221030-3.1
-
SOURCE_HASH=sha512:41eb46feaffa909e8790b9a9e304d5246e82ab366721196126a923d68b4d4964d0a433fe238f9d5e0a00aefb5c8cb66132150792929a793785ad091d91016f97
+ VERSION=20230828-3.1
+
SOURCE_HASH=sha512:c7232376ef1bc128ed79f950a5f1f207f874011218682d7e6186f76443927df5483b46c4daa8cf02e327079259aee1a56e2b791aa682491eb802d90ff8940cca
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://www.thrysoee.dk/editline/
diff --git a/libs/libedit/HISTORY b/libs/libedit/HISTORY
index b6e75ba..4ef7321 100644
--- a/libs/libedit/HISTORY
+++ b/libs/libedit/HISTORY
@@ -1,3 +1,6 @@
+2023-11-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 20230828-3.1
+
2023-01-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20221030-3.1



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (30132636284d544cede032889bc314761b1ab60e), Treeve Jelbert, 11/14/2023

Archive powered by MHonArc 2.6.24.

Top of Page