[arch-commits] Commit in libfbclient/trunk (3 files)

[Evangelos Foutras]

    Date: Tuesday, April 25, 2017 @ 03:40:58
  Author: foutrelis
Revision: 294586

Add a couple patches to fix building in C++11 mode

Patches come from LibreOffice.

Added:
  libfbclient/trunk/firebird-c++11.patch
  libfbclient/trunk/firebird-c++14.patch
Modified:
  libfbclient/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 +++++++++++-
 firebird-c++11.patch |   16 ++++++++++++++++
 firebird-c++14.patch |   30 ++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-25 02:34:30 UTC (rev 294585)
+++ PKGBUILD	2017-04-25 03:40:58 UTC (rev 294586)
@@ -12,10 +12,20 @@
 depends=('gcc-libs' 'icu')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2
+        firebird-c++11.patch
+        firebird-c++14.patch
         LICENSE)
 md5sums=('fb34241e96f9707604bf6cd78357d5a2'
+         '5094347a8298143ca147edd49b552fe9'
+         'a02710203cee81b4f48b7bdca3b1b33f'
          '0d61798861e159c85dbdf0f30fe2f2ce')
 
+prepare() {
+  cd $srcdir/Firebird-$pkgver-0
+  patch -Np1 -i ../firebird-c++11.patch
+  patch -Np0 -i ../firebird-c++14.patch
+}
+
 build() {
   cd $srcdir/Firebird-$pkgver-0
 
@@ -25,7 +35,7 @@
     --without-fbsecure-db --with-fbmsg=/usr/share/firebird --without-fblog \
     --without-fbglock --without-fbplugins
 
-  CXXFLAGS+=" -std=gnu++98 -fno-lifetime-dse" make
+  CXXFLAGS+=' -fno-lifetime-dse' make
 }
 
 package() {

Added: firebird-c++11.patch
===================================================================
--- firebird-c++11.patch	                        (rev 0)
+++ firebird-c++11.patch	2017-04-25 03:40:58 UTC (rev 294586)
@@ -0,0 +1,16 @@
+# -*- Mode: Diff -*-
+--- firebird/src/dudley/exe.epp
++++ firebird/src/dudley/exe.epp
+@@ -2884,9 +2884,9 @@
+ 		blr_parameter, 0, 0, 0,
+ 		blr_parameter, 0, 1, 0,
+ 		blr_parameter, 1, 0, 0,
+-		blr_end,
+-		blr_end,
+-		blr_end,
++		SCHAR(blr_end),
++		SCHAR(blr_end),
++		SCHAR(blr_end),
+ 		blr_eoc
+ 	};
+ 	static FB_API_HANDLE req_handle;

Added: firebird-c++14.patch
===================================================================
--- firebird-c++14.patch	                        (rev 0)
+++ firebird-c++14.patch	2017-04-25 03:40:58 UTC (rev 294586)
@@ -0,0 +1,30 @@
+--- src/common/classes/alloc.cpp
++++ src/common/classes/alloc.cpp
+@@ -2121,3 +2121,11 @@
+ {
+ 	Firebird::MemoryPool::globalFree(mem);
+ }
++void operator delete(void* mem, size_t) throw()
++{
++	Firebird::MemoryPool::globalFree(mem);
++}
++void operator delete[](void* mem, size_t) throw()
++{
++	Firebird::MemoryPool::globalFree(mem);
++}
+--- src/common/classes/alloc.h
++++ src/common/classes/alloc.h
+@@ -491,13 +491,6 @@
+ 
+ inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; }
+ 
+-// Global versions of operators new and delete
+-void* operator new(size_t s) THROW_BAD_ALLOC;
+-void* operator new[](size_t s) THROW_BAD_ALLOC;
+-
+-void operator delete(void* mem) throw();
+-void operator delete[](void* mem) throw();
+-
+ #ifdef DEBUG_GDS_ALLOC
+ inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* file, int line)
+ {