firebird2-git: More fixes

mingw-w64-firebird2-git/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=firebird
 pkgbase=mingw-w64-${_realname}2-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2-git"
-pkgver=2.5.8.27056.f21dcf3ec8
+pkgver=2.5.8.27063.a2575c3c96
 pkgrel=1
 pkgdesc="Cross-platform relational database offering many ANSI SQL standard features - version 2.x (mingw-w64)"
 url="http://www.firebirdsql.org/"
@@ -26,7 +26,7 @@ options=('!debug' 'strip')
 source=("${_realname}"::"git+https://github.com/FirebirdSQL/firebird.git#branch=B2_5_Release"
         mingw-w64-2_5.patch)
 sha256sums=('SKIP'
-            '8cd7e9be8297b1d996c3d81b6de4a0af9146f476f413709e1c1827dc6a887d47')
+            '22f5f762ef130dc619e9278861ffe87f75bc21b850ad6c9c035c12d01372cb93')
 
 
 pkgver() {
@@ -60,7 +60,6 @@ build() {
     --enable-static \
     --enable-shared \
     ${_debug_conf} \
-    --disable-rpath \
     --with-system-icu \
     --with-fbbin=${MINGW_PREFIX}/bin \
     --with-fbsbin=${MINGW_PREFIX}/bin \

mingw-w64-firebird2-git/mingw-w64-2_5.patch

@@ -93,15 +93,21 @@ diff --git a/src/common/classes/FpeControl.h b/src/common/classes/FpeControl.h
 index e0e36ac..363cad5 100644
 --- a/src/common/classes/FpeControl.h
 +++ b/src/common/classes/FpeControl.h
-@@ -217,7 +217,7 @@ private:
+@@ -217,6 +217,7 @@ private:
  
  
  // getting a portable isinf() is harder than you would expect
--#ifdef WIN_NT
-+#if defined(WIN_NT) && !defined(__MINGW32__)
++#if !defined(__MINGW32__)
+ #ifdef WIN_NT
  inline bool isinf(double x)
  {
- 	return (!_finite (x) && !isnan(x));
+@@ -231,5 +231,6 @@
+ }
+ #endif // isinf
+ #endif // WIN_NT
++#endif // __MINGW32__
+ 
+ #endif //CLASSES_FPE_CONTROL_H
 -- 
 2.6.3
 
@@ -3030,59 +3036,60 @@ diff --git a/src/common/classes/alloc.h b/src/common/classes/alloc.h
 index de6b2f8..aaf7f86 100644
 --- a/src/common/classes/alloc.h
 +++ b/src/common/classes/alloc.h
-@@ -499,29 +499,29 @@
+@@ -499,18 +499,18 @@
  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 new(std::size_t s) THROW_BAD_ALLOC;
-+void* operator new[](std::size_t s) THROW_BAD_ALLOC;
++void* operator new(size_t s);
++void* operator new[](size_t s);
  
- void operator delete(void* mem) throw();
- void operator delete[](void* mem) throw();
+-void operator delete(void* mem) throw();
+-void operator delete[](void* mem) throw();
++void operator delete(void* mem) noexcept;
++void operator delete[](void* mem) noexcept;
  
  #ifdef DEBUG_GDS_ALLOC
 -inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* file, int line)
-+inline void* operator new(std::size_t s, Firebird::MemoryPool& pool, const char* file, int line)
++inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* file, int line)
  {
  	return pool.allocate(s, file, line);
  }
 -inline void* operator new[](size_t s, Firebird::MemoryPool& pool, const char* file, int line)
-+inline void* operator new[](std::size_t s, Firebird::MemoryPool& pool, const char* file, int line)
++inline void* operator new[](size_t s, Firebird::MemoryPool& pool, const char* file, int line)
  {
  	return pool.allocate(s, file, line);
  }
- #define FB_NEW(pool) new(pool, __FILE__, __LINE__)
- #define FB_NEW_RPT(pool, count) new(pool, count, __FILE__, __LINE__)
- #else
--inline void* operator new(size_t s, Firebird::MemoryPool& pool)
-+inline void* operator new(std::size_t s, Firebird::MemoryPool& pool)
- {
- 	return pool.allocate(s);
- }
--inline void* operator new[](size_t s, Firebird::MemoryPool& pool)
-+inline void* operator new[](std::size_t s, Firebird::MemoryPool& pool)
- {
- 	return pool.allocate(s);
- }
 diff --git a/src/common/classes/alloc.cpp b/src/common/classes/alloc.cpp
 index de6b2f8..aaf7f86 100644
 --- a/src/common/classes/alloc.cpp
 +++ b/src/common/classes/alloc.cpp
-@@ -2124,11 +2124,11 @@
+@@ -2124,19 +2124,19 @@
  
  } // namespace Firebird
  
 -void* operator new(size_t s) THROW_BAD_ALLOC
-+void* operator new(std::size_t s) THROW_BAD_ALLOC
++void* operator new(size_t s)
  {
  	return Firebird::MemoryPool::globalAlloc(s);
  }
 -void* operator new[](size_t s) THROW_BAD_ALLOC
-+void* operator new[](std::size_t s) THROW_BAD_ALLOC
++void* operator new[](size_t s)
  {
  	return Firebird::MemoryPool::globalAlloc(s);
  }
+ 
+-void operator delete(void* mem) throw()
++void operator delete(void* mem) noexcept
+ {
+ 	Firebird::MemoryPool::globalFree(mem);
+ }
+-void operator delete[](void* mem) throw()
++void operator delete[](void* mem) noexcept
+ {
+ 	Firebird::MemoryPool::globalFree(mem);
+ }
 -- 
 2.6.3
+