diff --git a/programming/misc/libedit/actions.py b/programming/misc/libedit/actions.py index deb466e3f9..a80eceb81d 100644 --- a/programming/misc/libedit/actions.py +++ b/programming/misc/libedit/actions.py @@ -22,3 +22,4 @@ def install(): pisitools.dodoc("ChangeLog", "COPYING", "THANKS") pisitools.remove("/usr/lib/libedit.la") + pisitools.remove("/usr/share/man/man3/history.3") diff --git a/programming/misc/libedit/pspec.xml b/programming/misc/libedit/pspec.xml index f25823fd4f..e138d59b5a 100644 --- a/programming/misc/libedit/pspec.xml +++ b/programming/misc/libedit/pspec.xml @@ -45,7 +45,7 @@ - 2017-02-02 + 2017-02-18 3.1_20160903 Version Bump Pisi Linux Community diff --git a/server/database/firebird/actions.py b/server/database/firebird/actions.py index 675877ee6c..0ca7a25008 100644 --- a/server/database/firebird/actions.py +++ b/server/database/firebird/actions.py @@ -13,6 +13,8 @@ from pisi.actionsapi import get WorkDir="Firebird-%s-0" % get.srcVERSION() def setup(): + shelltools.export("CFLAGS", "%s -fno-strict-aliasing" % get.CFLAGS()) + shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS()) pisitools.dosed("src/isql/isql.epp", '"isql\s', '"fbsql ') pisitools.dosed("src/msgs/history2.sql", 'isql\s', 'fbsql ') pisitools.dosed("src/msgs/messages2.sql", 'isql\s', 'fbsql ') @@ -32,6 +34,7 @@ def setup(): def build(): #Parallel build is broken + shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS()) autotools.make("-j1") shelltools.cd("gen") pisitools.dosed("install/makeInstallImage.sh", "exit 1", "# exit 1") diff --git a/server/database/firebird/files/Firebird-gcc-icu.patch b/server/database/firebird/files/Firebird-gcc-icu.patch new file mode 100644 index 0000000000..42f9f39b3b --- /dev/null +++ b/server/database/firebird/files/Firebird-gcc-icu.patch @@ -0,0 +1,16 @@ +# Author: Adriano dos Santos Fernandes +#Index: src/common/classes/alloc.h +#=================================================================== +#RCS file: /cvsroot/firebird/firebird2/src/common/classes/alloc.h,v +#retrieving revision 1.71 +diff -u -p -r1.71 alloc.h +--- Firebird-2.5.6.27020-0/src/common/classes/alloc.h.orig 26 Sep 2007 17:48:20 -0000 1.71 ++++ Firebird-2.5.6.27020-0/src/common/classes/alloc.h 20 May 2009 02:20:08 -0000 +@@ -48,6 +48,7 @@ + #include /* XPG: prototypes for malloc/free have to be in + stdlib.h (EKU) */ + #endif ++#include + + // MSVC does not support exception specification, so it's unknown if that will be correct or not + // from its POV. For now, use it and disable the C4290 warning. diff --git a/server/database/firebird/files/Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch b/server/database/firebird/files/Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch new file mode 100644 index 0000000000..558b7514e6 --- /dev/null +++ b/server/database/firebird/files/Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch @@ -0,0 +1,27 @@ +From: asfernandes +Date: Sat, 5 Mar 2016 03:39:36 +0000 +Subject: Make the generated code compatible with gcc 6 in C++-14 mode. + (cherry picked from commit 3618aa2171674babf79ef935aa049c40a3db1321) +Patch-mainline: +Git-commit: 3618aa2171674babf79ef935aa049c40a3db1321 +References: bsc#964466 CORE-5099 + +--- + src/gpre/c_cxx.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp +index df175dca9465..bafce8f282bf 100644 +--- a/src/gpre/c_cxx.cpp ++++ b/src/gpre/c_cxx.cpp +@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request) + printa(0, "static %sshort\n isc_%dl = %d;", + (request->req_flags & REQ_extend_dpb) ? "" : CONST_STR, + request->req_ident, request->req_length); +- printa(0, "static %schar\n isc_%d [] = {", CONST_STR, request->req_ident); ++ printa(0, "static %sunsigned char\n isc_%d [] = {", CONST_STR, request->req_ident); + + const TEXT* string_type = "blr"; + if (gpreGlob.sw_raw) +-- +2.8.2 diff --git a/server/database/firebird/files/Provide-sized-global-delete-operators-when-compiled.patch b/server/database/firebird/files/Provide-sized-global-delete-operators-when-compiled.patch new file mode 100644 index 0000000000..9dbbe0e396 --- /dev/null +++ b/server/database/firebird/files/Provide-sized-global-delete-operators-when-compiled.patch @@ -0,0 +1,35 @@ +From: Michal Kubecek +Date: Mon, 25 Apr 2016 08:55:36 +0200 +Subject: Provide sized global delete operators when compiled in C++14 mode +Patch-mainline: submitted +Git-commit: 038f9fbf559e56032e4cb49eb7ce4c3ead23fda9 +References: bsc#964466 CORE-5099 + +--- + src/common/classes/alloc.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/common/classes/alloc.h b/src/common/classes/alloc.h +index b1026ce2aac4..fda5bfebb0cc 100644 +--- a/src/common/classes/alloc.h ++++ b/src/common/classes/alloc.h +@@ -331,6 +331,16 @@ inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS + MemoryPool::globalFree(mem); + } + ++#if __cplusplus >= 201402L ++inline void operator delete(void* mem, std::size_t s ALLOC_PARAMS) throw() ++{ ++ MemoryPool::globalFree(mem); ++} ++inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) throw() ++{ ++ MemoryPool::globalFree(mem); ++} ++#endif + #ifdef DEBUG_GDS_ALLOC + + #ifdef __clang__ +-- +2.8.2 + diff --git a/server/database/firebird/pspec.xml b/server/database/firebird/pspec.xml index bdfd2d1899..bcad0c8574 100644 --- a/server/database/firebird/pspec.xml +++ b/server/database/firebird/pspec.xml @@ -15,7 +15,7 @@ library A relational database offering many ANSI SQL-99 features Firebird is an open source relational database management system offering many ANSI SQL-99 features. - http://sourceforge.net/projects/firebird/files/firebird/2.5.4-Release/Firebird-2.5.4.26856-0.tar.bz2 + http://sourceforge.net/projects/firebird/files/firebird/2.5.6-Release/Firebird-2.5.6.27020-0.tar.bz2 icu4c-devel btyacc @@ -29,6 +29,9 @@ firebird-2.5.1-svn-CORE-3610.patch--> editline-dumb-tr.patch firebird-2.5.1.26351.0-deps-flags.patch + Provide-sized-global-delete-operators-when-compiled.patch + Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch + Firebird-gcc-icu.patch @@ -103,9 +106,9 @@ - 2017-02-15 - 2.5.4.26856 - Release Bump + 2017-02-18 + 2.5.6.27020 + Version Bump Pisi Linux Community admin@pisilinux.org