From 6cd38fbc724dfed7d82a21823f29002c49f31305 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Thu, 16 Jan 2020 23:13:26 +0300
Subject: [PATCH] firefird:ver. bump

---
 server/database/firebird/actions.py | 14 +++++---------
 server/database/firebird/pspec.xml  | 23 +++++++++++++++++------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/server/database/firebird/actions.py b/server/database/firebird/actions.py
index b04538a95e..eb133de5d8 100644
--- a/server/database/firebird/actions.py
+++ b/server/database/firebird/actions.py
@@ -15,31 +15,27 @@ 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())
-    shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse" % get.CXXFLAGS())
+    shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse -Wno-error=narrowing" % 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 ')
     pisitools.dosed("src/msgs/messages2.sql", 'ISQL\s', 'FBSQL ')
-    
-    #pisitools.dosed("src/jrd/perf.h", '#include <libio.h>', '')
-    
     shelltools.system("find ./ -name \*.sh -print0 | xargs -0 chmod +x")
-    for d in ("btyacc", "editline", "icu"):
-        shelltools.unlinkDir("extern/%s" % d)
+    #for d in ("btyacc", "editline", "icu"):
+        #shelltools.unlinkDir("extern/%s" % d)
+    shelltools.system("sh autogen.sh")
     autotools.autoreconf("-fi")
     autotools.configure("--prefix=/opt/firebird \
                          --disable-static \
-                         --enable-superserver \
                          --with-editline \
                          --with-gnu-ld \
                          --with-system-editline \
-                         --with-system-icu \
                          ")
 
 def build():
     #Parallel build is broken
     #shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS())
-    shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse" % get.CXXFLAGS())
+    shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse -Wno-error=narrowing" % get.CXXFLAGS())
     autotools.make("-j1")
     shelltools.cd("gen")
     pisitools.dosed("install/makeInstallImage.sh", "exit 1", "# exit 1")
diff --git a/server/database/firebird/pspec.xml b/server/database/firebird/pspec.xml
index 28a907ba3d..8e9f18410f 100644
--- a/server/database/firebird/pspec.xml
+++ b/server/database/firebird/pspec.xml
@@ -15,7 +15,7 @@
         <IsA>library</IsA>
         <Summary>A relational database offering many ANSI SQL-99 features</Summary>
         <Description>Firebird is an open source relational database management system offering many ANSI SQL-99 features.</Description>
-        <Archive sha1sum="39ed55321ea1a18c525e3100301ac57a53c59423" type="tarbz2">http://sourceforge.net/projects/firebird/files/firebird/2.5.7-Release/Firebird-2.5.7.27050-0.tar.bz2</Archive>
+        <Archive sha1sum="715845c29e391c4f75d090d400f9550095411404" type="targz">https://github.com/FirebirdSQL/firebird/archive/R2_5_9.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>icu4c-devel</Dependency>
             <Dependency>btyacc</Dependency>
@@ -28,14 +28,14 @@
             <Patch level="1">fix-lib64-dir.diff</Patch>
             <Patch level="1">firebird-2.5.1-svn-CORE-3610.patch</Patch>-->
             <!--Patch level="1">editline-dumb-tr.patch</Patch-->
-            <Patch level="1">firebird-c++11.patch</Patch>
-            <Patch level="1">firebird-c++14.patch</Patch>
-            <Patch level="1">firebird-2.5.1.26351.0-deps-flags.patch</Patch>
+<!--             <Patch level="1">firebird-c++11.patch</Patch> -->
+<!--             <Patch level="1">firebird-c++14.patch</Patch> -->
+<!--             <Patch level="1">firebird-2.5.1.26351.0-deps-flags.patch</Patch> -->
             <!--Patch level="1">Provide-sized-global-delete-operators-when-compiled.patch</Patch>
             <Patch level="1">Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch</Patch>
             <Patch level="1">Firebird-gcc-icu.patch</Patch-->
-            <Patch>006-musl-glibc.patch</Patch>
-            <Patch>007-libio.patch</Patch>
+<!--             <Patch>006-musl-glibc.patch</Patch> -->
+<!--             <Patch>007-libio.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -55,6 +55,10 @@
             <Path fileType="library">/opt/firebird/lib/libgds.*</Path>
             <Path fileType="library">/opt/firebird/lib/libib_util.*</Path>
             <Path fileType="library">/opt/firebird/plugins/libfbtrace.so</Path>
+            <Path fileType="library">/usr/lib/libicuuc.so*</Path>
+            <Path fileType="library">/usr/lib/libicudata.so*</Path>
+            <Path fileType="library">/usr/lib/libicui18n.so*</Path>
+            <Path fileType="library">/usr/lib/libfbembed.so*</Path>
         </Files>
     </Package>
 
@@ -109,6 +113,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2020-01-16</Date>
+            <Version>2.5.9.27139</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="6">
             <Date>2020-01-16</Date>
             <Version>2.5.7.27050</Version>