Skip to Content.
Sympa Menu

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

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 (ba34feed97546a98016d873dd67984f30ac9d9ba)
  • Date: Thu, 7 Jan 2016 20:15:04 +0000

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

database/firebird3/DEPENDS | 3
database/firebird3/HISTORY | 5
database/firebird3/PRE_BUILD | 3
database/firebird3/fb.diff | 138
+++++++++++++++++++++++
libs/ncurses/DETAILS | 2
libs/ncurses/HISTORY | 4
libs/ncurses/PRE_BUILD | 5
libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch | 39 ------
qt5/qtbase/HISTORY | 3
qt5/qtbase/firebird.patch | 13 +-
10 files changed, 163 insertions(+), 52 deletions(-)

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

firebird3 - use system libedit + libtommath

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

qtbase - update firebird patch

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

ncurses: => 6.0

diff --git a/database/firebird3/DEPENDS b/database/firebird3/DEPENDS
index f60f951..11043a7 100755
--- a/database/firebird3/DEPENDS
+++ b/database/firebird3/DEPENDS
@@ -1,6 +1,7 @@
depends cmake &&
depends icu &&
-#depends readline &&
+depends libedit &&
+depends libtommath &&
depends zlib &&
if [[ $CMAKE_GEN == Ninja ]];then
depends ninja-build-system
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index e293d33..dd7867f 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,4 +1,7 @@
-2016=-1-04 Treeve Jelbert <treeve AT sourcemage.org>
+2016-01-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD, fbdiff, DEPENDS: use system libedit, libtomath
+
+2016-01-04 Treeve Jelbert <treeve AT sourcemage.org>
* DEPNDS: BUILD: ninja support

2015-12-09 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/database/firebird3/PRE_BUILD b/database/firebird3/PRE_BUILD
index f2eb322..e3a9782 100755
--- a/database/firebird3/PRE_BUILD
+++ b/database/firebird3/PRE_BUILD
@@ -5,3 +5,6 @@ mkdir build &&
BLD=$SOURCE_DIRECTORY/build &&
# add missing cmake files
tar xzf $SPELL_DIRECTORY/cmake.diff.gz
+cd $SOURCE_DIRECTORY &&
+# use ssytem libed + libtommath
+patch -p1 < $SPELL_DIRECTORY/fb.diff
diff --git a/database/firebird3/fb.diff b/database/firebird3/fb.diff
new file mode 100644
index 0000000..4c62404
--- /dev/null
+++ b/database/firebird3/fb.diff
@@ -0,0 +1,138 @@
+From 82b95ca7cfaec0962f02c4bebd55bf64047684c7 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/2] use system libedit
+
+---
+ CMakeLists.txt | 2 +-
+ builds/cmake/Configure.cmake | 2 +-
+ src/include/gen/autoconfig.h.in | 4 ++--
+ src/isql/isql.epp | 10 ++++------
+ 4 files changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d23b260..0423ca7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -215,7 +215,7 @@ if (UNIX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+
+ if (NOT CMAKE_CROSSCOMPILING)
+- set(LIB_readline readline)
++ set(LIB_readline edit)
+ endif()
+ if (NOT FREEBSD)
+ set(LIB_dl dl)
+diff --git a/builds/cmake/Configure.cmake b/builds/cmake/Configure.cmake
+index 1e1e9a1..006f9a3 100644
+--- a/builds/cmake/Configure.cmake
++++ b/builds/cmake/Configure.cmake
+@@ -124,7 +124,7 @@ set(include_files_list
+ ctype.h
+ dirent.h
+ dlfcn.h
+- editline.h
++ editline/readline.h
+ errno.h
+ fcntl.h
+ float.h
+diff --git a/src/include/gen/autoconfig.h.in
b/src/include/gen/autoconfig.h.in
+index 997589e..4a04c7a 100644
+--- a/src/include/gen/autoconfig.h.in
++++ b/src/include/gen/autoconfig.h.in
+@@ -195,8 +195,8 @@
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #cmakedefine HAVE_DLFCN_H 1
+
+-/* Define to 1 if you have the <editline.h> header file. */
+-#cmakedefine HAVE_EDITLINE_H 1
++/* Define to 1 if you have the <editline/readline.h> header file. */
++#cmakedefine HAVE_EDITLINE_READLINE_H 1
+
+ /* 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 d313c0d..48a8255 100644
+--- a/src/isql/isql.epp
++++ b/src/isql/isql.epp
+@@ -83,10 +83,8 @@
+ //#include <io.h> // mktemp
+ //#endif
+
+-#ifdef HAVE_EDITLINE_H
+-// This is a local file included in our distribution - but not always
+-// compiled into the system
+-#include "editline.h"
++#ifdef HAVE_EDITLINE_READLINE_H
++#include <editline/readline.h>
+ #endif
+
+ enum literal_string_type
+@@ -627,7 +625,7 @@ int ISQL_main(int argc, char* argv[])
+ *
+ **************************************/
+
+-#if defined(HAVE_EDITLINE_H) && defined(HAVE_LOCALE_H)
++#if defined(HAVE_EDITLINE_READLINE_H) && defined(HAVE_LOCALE_H)
+ setlocale(LC_CTYPE, "");
+ #endif
+ atexit(&atexit_fb_shutdown);
+@@ -856,7 +854,7 @@ static void readNextInputLine(const char* prompt)
+
+ getColumn = 0;
+
+-#ifdef HAVE_EDITLINE_H
++#ifdef HAVE_EDITLINE_READLINE_H
+ if (Filelist->readingStdin())
+ {
+ // CVC: On 2005-04-02, use an empty prompt when not working in
+--
+2.7.0
+
+From 2e2b3191bfe752f3330128448c4951677ed882c2 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/2] use system libtommath
+
+---
+ CMakeLists.txt | 1 -
+ src/CMakeLists.txt | 4 ++--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0423ca7..51f02be 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -321,7 +321,6 @@ endif() # if (NOT CMAKE_CROSSCOMPILING)
+
+ crosscompile_prebuild_steps()
+
+-include_directories("extern/libtommath")
+ include_directories("extern/icu/include")
+ include_directories("extern/zlib")
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9ca8421..583c4c8 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -413,7 +413,7 @@ add_library (boot_yvalve SHARED
$<TARGET_OBJECTS:yvalve_common>
+ target_link_libraries (boot_yvalve
+ PRIVATE remote
+ PRIVATE common
+- PUBLIC libtommath
++ PUBLIC tommath
+ PUBLIC ${LIB_Ws2_32}
+ PUBLIC ${LIB_readline}
+ PUBLIC ${LIB_dl}
+@@ -436,7 +436,7 @@ add_library (yvalve SHARED
$<TARGET_OBJECTS:yvalve_common> ${yva
+ target_link_libraries (yvalve
+ PRIVATE remote
+ PRIVATE common
+- PUBLIC libtommath
++ PUBLIC tommath
+ PUBLIC ${LIB_Ws2_32}
+ PUBLIC ${LIB_readline}
+ PUBLIC ${LIB_dl}
+--
+2.7.0
+
diff --git a/libs/ncurses/DETAILS b/libs/ncurses/DETAILS
index c689dc9..559b1f6 100755
--- a/libs/ncurses/DETAILS
+++ b/libs/ncurses/DETAILS
@@ -1,5 +1,5 @@
SPELL=ncurses
- VERSION=5.9
+ VERSION=6.0
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 2ed4e4a..1d14cee 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,7 @@
+2016-01-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 6.0
+ * PRE_BUILD, ncurses-5.9-gcc5_buildfixes-1.patch:: patch not needed
+
2015-04-25 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, ncurses-5.9-gcc5_buildfixes-1.patch: added a patch
from LFS project to fix building with gcc 5.1
diff --git a/libs/ncurses/PRE_BUILD b/libs/ncurses/PRE_BUILD
index ac464c4..fcd278e 100755
--- a/libs/ncurses/PRE_BUILD
+++ b/libs/ncurses/PRE_BUILD
@@ -3,7 +3,4 @@ cd "$SOURCE_DIRECTORY" &&

# don't nuke the terminfo database #13731
sed -i '/rm -rf $(DESTDIR)$(ticdir)/d' "$SOURCE_DIRECTORY/misc/Makefile.in"
&&
-sed -i '/rm -fr ?/d' "$SOURCE_DIRECTORY/misc/run_tic.in" &&
-
-# gcc 5.1 fix
-patch -p1 < $SCRIPT_DIRECTORY/ncurses-5.9-gcc5_buildfixes-1.patch
+sed -i '/rm -fr ?/d' "$SOURCE_DIRECTORY/misc/run_tic.in"
diff --git a/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
b/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
deleted file mode 100644
index be64931..0000000
--- a/libs/ncurses/ncurses-5.9-gcc5_buildfixes-1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Submitted By: Douglas R. Reno <renodr2002 AT gmail.com>
-Date: 2015-04-15
-Initial Package Version: 5.9
-Upstream Status: Unknown
-Origin:
ftp://invisible-island.net/ncurses/5.9/ncurses-5.9-20141206.patch.gz
-Description: Fixes a compilation issue with GCC 5.1. Note
that this patch was trimmed from the above patch.
-
-Index: ncurses-5.9/ncurses/base/MKlib_gen.sh
-===========================================================================================
-
---- ncurses-5.9-20141129+/ncurses/base/MKlib_gen.sh 2011-06-04
19:14:08.000000000 +0000
-+++ ncurses-5.9-20141206/ncurses/base/MKlib_gen.sh 2014-12-06
18:56:25.000000000 +0000
-@@ -474,11 +474,22 @@
- -e 's/gen_$//' \
- -e 's/ / /g' >>$TMP
-
-+cat >$ED1 <<EOF
-+s/ / /g
-+s/^ //
-+s/ $//
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g
-+EOF
-+
-+# A patch discussed here:
-+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+# introduces spurious #line markers. Work around that by ignoring the
system's
-+# attempt to define "bool" and using our own symbol here.
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-+cat $ED2 >$TMP
-+
- $preprocessor $TMP 2>/dev/null \
--| sed \
-- -e 's/ / /g' \
-- -e 's/^ //' \
-- -e 's/_Bool/NCURSES_BOOL/g' \
-+| sed -f $ED1 \
- | $AWK -f $AW2 \
- | sed -f $ED3 \
- | sed \
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 0c3308e..e2ce8c0 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2016-01-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * firebird.patch: updated
+
2015-10-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.5.1

diff --git a/qt5/qtbase/firebird.patch b/qt5/qtbase/firebird.patch
index 64500b1..0bda461 100644
--- a/qt5/qtbase/firebird.patch
+++ b/qt5/qtbase/firebird.patch
@@ -1,25 +1,26 @@
-From c784aba62c64b7966c4365e7537daf6bddee0f2e Mon Sep 17 00:00:00 2001
+From 75ee27814e3ad2ae22ce91cc4990312bef2f4526 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Mon, 9 May 2011 21:06:05 +0200
Subject: [PATCH] fix config tests for firebird fix linking with firebird it
also use -lpthread now

+firebird uses libtommath
---
config.tests/unix/ibase/ibase.pro | 2 +-
src/sql/drivers/ibase/qsql_ibase.pri | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config.tests/unix/ibase/ibase.pro
b/config.tests/unix/ibase/ibase.pro
-index 5878785..2e2128e 100644
+index 5878785..2c165a2 100644
--- a/config.tests/unix/ibase/ibase.pro
+++ b/config.tests/unix/ibase/ibase.pro
@@ -1,3 +1,3 @@
SOURCES = ibase.cpp
CONFIG -= qt dylib
-LIBS += -lgds
-+LIBS += -lfbclient -lpthread
++LIBS += -lfbclient -ltommath -lpthread
diff --git a/src/sql/drivers/ibase/qsql_ibase.pri
b/src/sql/drivers/ibase/qsql_ibase.pri
-index ef3b68d..5cb9169 100644
+index ef3b68d..dfedbd1 100644
--- a/src/sql/drivers/ibase/qsql_ibase.pri
+++ b/src/sql/drivers/ibase/qsql_ibase.pri
@@ -2,7 +2,8 @@ HEADERS += $$PWD/qsql_ibase_p.h
@@ -28,10 +29,10 @@ index ef3b68d..5cb9169 100644
unix {
- !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
+ !contains(LIBS, .*gds.*):!contains(LIBS, .*fb.*):LIBS += -lfbclient
-+ LIBS += -lpthread
++ LIBS += -ltommath -lpthread
} else {
!contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
LIBS += -lgds32_ms
--
-2.4.1
+2.7.0





Archive powered by MHonArc 2.6.24.

Top of Page