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

[Felix Yan]

    Date: Thursday, June 7, 2018 @ 15:00:36
  Author: felixonmars
Revision: 326423

upgpkg: libfbclient 2.5.8.27089-1

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

----------------------+
 PKGBUILD             |   20 +++++---------------
 firebird-c++11.patch |   16 ----------------
 firebird-c++14.patch |   30 ------------------------------
 3 files changed, 5 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-07 12:39:48 UTC (rev 326422)
+++ PKGBUILD	2018-06-07 15:00:36 UTC (rev 326423)
@@ -3,29 +3,19 @@
 # Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
 
 pkgname=libfbclient
-pkgver=2.5.7.27050
-pkgrel=5
-pkgdesc="Client library for Firebird."
+pkgver=2.5.8.27089
+pkgrel=1
+pkgdesc="Client library for Firebird"
 arch=('x86_64')
 url="http://www.firebirdsql.org/"
 license=('custom')
 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
+source=(https://github.com/FirebirdSQL/firebird/releases/download/R2_5_8/Firebird-$pkgver-0.tar.bz2
         LICENSE)
-md5sums=('fb34241e96f9707604bf6cd78357d5a2'
-         '5094347a8298143ca147edd49b552fe9'
-         'a02710203cee81b4f48b7bdca3b1b33f'
+md5sums=('38862a3da39cf91f4f2366fb510f18a6'
          '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
 

Deleted: firebird-c++11.patch
===================================================================
--- firebird-c++11.patch	2018-06-07 12:39:48 UTC (rev 326422)
+++ firebird-c++11.patch	2018-06-07 15:00:36 UTC (rev 326423)
@@ -1,16 +0,0 @@
-# -*- 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;

Deleted: firebird-c++14.patch
===================================================================
--- firebird-c++14.patch	2018-06-07 12:39:48 UTC (rev 326422)
+++ firebird-c++14.patch	2018-06-07 15:00:36 UTC (rev 326423)
@@ -1,30 +0,0 @@
---- 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)
- {