Skip to Content.
Sympa Menu

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

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 (dba05b886d18acd9ba50973106c0a7b87fb44369)
  • Date: Thu, 15 Oct 2020 11:57:11 +0000

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

database/firebird3/HISTORY |
4 +
database/firebird3/INSTALL |
18 +++--
database/firebird3/patches/0001-use-system-libedit.patch |
8 +-
database/firebird3/patches/0002-use-system-libtommath.patch |
6 -
database/firebird3/patches/0003-suppress-some-includes.patch |
6 -
database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch |
6 -
database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch |
6 -
database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch |
6 -
database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch |
6 -
database/firebird3/patches/0008-tweak-libedit-usage.patch |
6 -
database/firebird3/patches/0009-btyacc-fix-mktemp-usage.patch |
35 ++++++++++
kde5-apps/krita/DEPENDS |
1
kde5-apps/krita/DETAILS |
4 -
kde5-apps/krita/HISTORY |
5 +
video/pipewire/DETAILS |
4 -
video/pipewire/HISTORY |
3
16 files changed, 89 insertions(+), 35 deletions(-)

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

pipewire: => 0.3.13

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

firebird3 - fix install

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

firebird3 - update patches

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

krita: => 4.4.0

diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index 2bfd51c..dd39b5c 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,7 @@
+2020-10-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/*: update
+ * INSTALL: fix
+
2020-06-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.6-33328

diff --git a/database/firebird3/INSTALL b/database/firebird3/INSTALL
index 9f04178..227cd58 100755
--- a/database/firebird3/INSTALL
+++ b/database/firebird3/INSTALL
@@ -1,4 +1,7 @@
-cd $SOURCE_DIRECTORY/build/firebird &&
+BLD=$SOURCE_DIRECTORY/builddir &&
+SRC=$SOURCE_DIRECTORY &&
+cd $BLD/firebird &&
+
# config files
DEST=$INSTALL_ROOT/etc/firebird3 &&
mkdir -p $DEST &&
@@ -6,20 +9,23 @@ chown firebird:firebird $DEST &&
# treate the security db as a config file
install_config_file security3.fdb $DEST/security3.fdb &&
chown firebird:firebird $DEST/security3.fdb &&
-cp -a *.conf $DEST &&
+for FF in firebird databases plugins fbtrace; do
+ install_config_file $FF.conf $DEST/$FF.conf &&
+ chown firebird:firebird $DEST/$FF.conf
+done &&

-DEST=$INSTALL_ROOT/$FB_PREFIX/firebird &&
+DEST=$FB_PREFIX/firebird &&
mkdir -p $DEST &&
# install the built tree
cp -a * $DEST &&

-cd $SOURCE_DIRECTORY/build/src &&
+cd $BLD/src &&
cp msg.fdb help.fdb $DEST &&

-DEST=$FB_PREFIX/firebird/include/firebird &&
+DEST=$FB_PREFIX/firebird/include/firebird &&
mkdir -p $DEST &&
# need the impl/boost files; copy them as well
-cp -a $SOURCE_DIRECTORY/src/include/firebird/impl $DEST &&
+cp -a $SRC/src/include/firebird/impl $DEST &&

# need some symlinks

diff --git a/database/firebird3/patches/0001-use-system-libedit.patch
b/database/firebird3/patches/0001-use-system-libedit.patch
index 2cb0a81..c65dd0b 100644
--- a/database/firebird3/patches/0001-use-system-libedit.patch
+++ b/database/firebird3/patches/0001-use-system-libedit.patch
@@ -1,7 +1,7 @@
-From 480099803708167a8d26bc126ce412459f00641c Mon Sep 17 00:00:00 2001
+From 168a8eb936003cdff5e1c502bbd14688019da4d0 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Thu, 7 Jan 2016 15:59:12 +0100
-Subject: [PATCH 1/8] use system libedit
+Subject: [PATCH 1/9] use system libedit

---
CMakeLists.txt | 2 +-
@@ -52,7 +52,7 @@ index 0229681a40..3e4b331266 100644
/* Define to 1 if you have the <errno.h> header file. */
#cmakedefine HAVE_ERRNO_H 1
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
-index 3cb40b5b8a..c607ded862 100644
+index 4b4db43596..007b2e23b0 100644
--- a/src/isql/isql.epp
+++ b/src/isql/isql.epp
@@ -77,10 +77,8 @@
@@ -87,5 +87,5 @@ index 3cb40b5b8a..c607ded862 100644
{
// CVC: On 2005-04-02, use an empty prompt when not working in
--
-2.25.2
+2.28.0

diff --git a/database/firebird3/patches/0002-use-system-libtommath.patch
b/database/firebird3/patches/0002-use-system-libtommath.patch
index 9e83030..0703b14 100644
--- a/database/firebird3/patches/0002-use-system-libtommath.patch
+++ b/database/firebird3/patches/0002-use-system-libtommath.patch
@@ -1,7 +1,7 @@
-From 462ee2b6bd77163404c5afc28e268b183a604756 Mon Sep 17 00:00:00 2001
+From e80813a01ead4c6ab196f149308a60042da0cbad Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sat, 24 Jan 2015 12:48:36 +0100
-Subject: [PATCH 2/8] use system libtommath
+Subject: [PATCH 2/9] use system libtommath

---
CMakeLists.txt | 5 -----
@@ -54,5 +54,5 @@ index 395965a69d..71ae606704 100644
PUBLIC ${LIB_readline}
PUBLIC ${LIB_dl}
--
-2.25.2
+2.28.0

diff --git a/database/firebird3/patches/0003-suppress-some-includes.patch
b/database/firebird3/patches/0003-suppress-some-includes.patch
index 925e37b..506d4d6 100644
--- a/database/firebird3/patches/0003-suppress-some-includes.patch
+++ b/database/firebird3/patches/0003-suppress-some-includes.patch
@@ -1,7 +1,7 @@
-From e63d11d398c27b5a38016e7295de0ad23bde88a3 Mon Sep 17 00:00:00 2001
+From b2c773371ed786dd7ce8b3ed3ba2d30252b10305 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sat, 11 Feb 2017 14:56:02 +0100
-Subject: [PATCH 3/8] suppress some includes
+Subject: [PATCH 3/9] suppress some includes

---
CMakeLists.txt | 9 ++-------
@@ -36,5 +36,5 @@ index 1e25ff673b..0cdc0d10ab 100644

########################################
--
-2.25.2
+2.28.0

diff --git
a/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
b/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
index 96a253e..1270b4e 100644
--- a/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
+++ b/database/firebird3/patches/0004-cmake-fix-for-non-sse4.2-machine.patch
@@ -1,7 +1,7 @@
-From 9dc161a68891671d52fc8aa3d13cf4334a4665d5 Mon Sep 17 00:00:00 2001
+From 959b28aae85367b3a0c1f6a4a60186a422e50dcd Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sat, 1 Apr 2017 13:11:35 +0200
-Subject: [PATCH 4/8] cmake fix for non sse4.2 machine
+Subject: [PATCH 4/9] cmake fix for non sse4.2 machine

---
CMakeLists.txt | 3 +--
@@ -42,5 +42,5 @@ index 71ae606704..144f6003d2 100644
add_dependencies_cc (common UpdateCloopInterfaces)

--
-2.25.2
+2.28.0

diff --git a/database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch
b/database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch
index c442078..070cf56 100644
--- a/database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch
+++ b/database/firebird3/patches/0005-fix-build-with-cmake-3.16.patch
@@ -1,7 +1,7 @@
-From 0192ecf2d8d09517036bcf024c95477039d70e65 Mon Sep 17 00:00:00 2001
+From f94fe8ad25a4d98ab33d88bb64ad39355f676b6e Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Tue, 3 Dec 2019 10:29:55 +0100
-Subject: [PATCH 5/8] fix build with cmake-3.16
+Subject: [PATCH 5/9] fix build with cmake-3.16

---
src/CMakeLists.txt | 6 +++---
@@ -39,5 +39,5 @@ index 144f6003d2..3c8641b743 100644


################################################################################
--
-2.25.2
+2.28.0

diff --git a/database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch
b/database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch
index 758d973..679a441 100644
--- a/database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch
+++ b/database/firebird3/patches/0006-cmake-fix-for-SecDbCache.patch
@@ -1,7 +1,7 @@
-From 7d52f78631fe46cf36e64b2a055ca22e0a75b733 Mon Sep 17 00:00:00 2001
+From fc270c5957f580d828a726cf07eb1d56023afa2c Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Tue, 11 Feb 2020 16:06:07 +0100
-Subject: [PATCH 6/8] cmake fix for SecDbCache
+Subject: [PATCH 6/9] cmake fix for SecDbCache

---
src/CMakeLists.txt | 1 +
@@ -33,5 +33,5 @@ index 5926008cc8..3d8ff54aad 100644
add_src_win32(remote_src
os/win32/wnet.cpp
--
-2.25.2
+2.28.0

diff --git a/database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch
b/database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch
index 102b383..b47cf36 100644
--- a/database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch
+++ b/database/firebird3/patches/0007-cmake-fix-for-glibc-2.31.patch
@@ -1,7 +1,7 @@
-From 7ef12b8a80cfd6e28ed20d7d59344716a8bd9b56 Mon Sep 17 00:00:00 2001
+From 3d8984e5a90098bca674d3620fbd73664310d246 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Tue, 11 Feb 2020 16:06:58 +0100
-Subject: [PATCH 7/8] cmake fix for glibc-2.31
+Subject: [PATCH 7/9] cmake fix for glibc-2.31

---
builds/cmake/Configure.cmake | 7 ++++---
@@ -27,5 +27,5 @@ index 81a057583f..02e8e501a1 100644
gettimeofday
"int gettimeofday(struct timeval *tv, ${TIMEZONE_TYPE} *tz)"
--
-2.25.2
+2.28.0

diff --git a/database/firebird3/patches/0008-tweak-libedit-usage.patch
b/database/firebird3/patches/0008-tweak-libedit-usage.patch
index e74591b..0ca6b8b 100644
--- a/database/firebird3/patches/0008-tweak-libedit-usage.patch
+++ b/database/firebird3/patches/0008-tweak-libedit-usage.patch
@@ -1,7 +1,7 @@
-From 2698ac9ad9f669dbf18cd64c04a08a8018d34477 Mon Sep 17 00:00:00 2001
+From f6f107ada3e92ae5164a6022e2a2a6c147efbf9c Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sun, 22 Mar 2020 12:03:18 +0100
-Subject: [PATCH 8/8] tweak libedit usage
+Subject: [PATCH 8/9] tweak libedit usage

---
src/CMakeLists.txt | 6 ++----
@@ -46,5 +46,5 @@ index d289e37ef9..5aa5514e07 100644

########################################
--
-2.25.2
+2.28.0

diff --git a/database/firebird3/patches/0009-btyacc-fix-mktemp-usage.patch
b/database/firebird3/patches/0009-btyacc-fix-mktemp-usage.patch
new file mode 100644
index 0000000..0d52073
--- /dev/null
+++ b/database/firebird3/patches/0009-btyacc-fix-mktemp-usage.patch
@@ -0,0 +1,35 @@
+From 54b256aad5b6f7f16407e68f0d9c621b557bc0a4 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 9/9] 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 c87c030b52..8d1b22d2b3 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.28.0
+
diff --git a/kde5-apps/krita/DEPENDS b/kde5-apps/krita/DEPENDS
index da2a1d5..09943d7 100755
--- a/kde5-apps/krita/DEPENDS
+++ b/kde5-apps/krita/DEPENDS
@@ -11,6 +11,7 @@ depends lcms2 &&
depends libx11 &&
depends libxcb &&
depends JPEG &&
+depends seexpr &&
depends shared-mime-info &&

depends karchive &&
diff --git a/kde5-apps/krita/DETAILS b/kde5-apps/krita/DETAILS
index 1bbb66c..7bf293b 100755
--- a/kde5-apps/krita/DETAILS
+++ b/kde5-apps/krita/DETAILS
@@ -1,6 +1,6 @@
SPELL=krita
- VERSION=4.3.0
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=4.4.0
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/krita/${VERSION}/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/kde5-apps/krita/HISTORY b/kde5-apps/krita/HISTORY
index d34787e..8e9965c 100644
--- a/kde5-apps/krita/HISTORY
+++ b/kde5-apps/krita/HISTORY
@@ -1,3 +1,8 @@
+2020-10-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.4.0
+
+ * DEPENDS: add seexpr
+
2020-06-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.3.0

diff --git a/video/pipewire/DETAILS b/video/pipewire/DETAILS
index 1ff4ec1..f528442 100755
--- a/video/pipewire/DETAILS
+++ b/video/pipewire/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=pipewire
- VERSION=0.3.12
-
SOURCE_HASH=sha512:60790e524628c1aab9381f4cc1bf9edf97156593c53deccd6358f3121604137c6f21a9bf0820b8ce805aa75bbf936ddce54f94012e9394479e3c4c9d988d1bf8
+ VERSION=0.3.13
+
SOURCE_HASH=sha512:38ce7d8808e69935db0148c077340cfbc1b85f5a016a0a57eff2c076560c42f0695cfe681c9f16ebf15796d773dd113c9a84631eb50ac44dfb09f91ed3fc61f0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://pipewire.org
diff --git a/video/pipewire/HISTORY b/video/pipewire/HISTORY
index 7f5df32..da3f3f2 100644
--- a/video/pipewire/HISTORY
+++ b/video/pipewire/HISTORY
@@ -1,3 +1,6 @@
+2020-10-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.13
+
2020-09-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.12




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dba05b886d18acd9ba50973106c0a7b87fb44369), Treeve Jelbert, 10/15/2020

Archive powered by MHonArc 2.6.24.

Top of Page