[arch-commits] Commit in libfbclient/repos (16 files)
Antonio Rojas
arojas at archlinux.org
Wed Jul 12 13:27:49 UTC 2017
Date: Wednesday, July 12, 2017 @ 13:27:48
Author: arojas
Revision: 300141
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libfbclient/repos/extra-i686/LICENSE
(from rev 300140, libfbclient/trunk/LICENSE)
libfbclient/repos/extra-i686/PKGBUILD
(from rev 300140, libfbclient/trunk/PKGBUILD)
libfbclient/repos/extra-i686/firebird-c++11.patch
(from rev 300140, libfbclient/trunk/firebird-c++11.patch)
libfbclient/repos/extra-i686/firebird-c++14.patch
(from rev 300140, libfbclient/trunk/firebird-c++14.patch)
libfbclient/repos/extra-x86_64/LICENSE
(from rev 300140, libfbclient/trunk/LICENSE)
libfbclient/repos/extra-x86_64/PKGBUILD
(from rev 300140, libfbclient/trunk/PKGBUILD)
libfbclient/repos/extra-x86_64/firebird-c++11.patch
(from rev 300140, libfbclient/trunk/firebird-c++11.patch)
libfbclient/repos/extra-x86_64/firebird-c++14.patch
(from rev 300140, libfbclient/trunk/firebird-c++14.patch)
Deleted:
libfbclient/repos/extra-i686/LICENSE
libfbclient/repos/extra-i686/PKGBUILD
libfbclient/repos/extra-i686/firebird-c++11.patch
libfbclient/repos/extra-i686/firebird-c++14.patch
libfbclient/repos/extra-x86_64/LICENSE
libfbclient/repos/extra-x86_64/PKGBUILD
libfbclient/repos/extra-x86_64/firebird-c++11.patch
libfbclient/repos/extra-x86_64/firebird-c++14.patch
-----------------------------------+
/LICENSE | 88 +++++++++++++++++++++++++++
/PKGBUILD | 114 ++++++++++++++++++++++++++++++++++++
/firebird-c++11.patch | 32 ++++++++++
/firebird-c++14.patch | 60 ++++++++++++++++++
extra-i686/LICENSE | 44 -------------
extra-i686/PKGBUILD | 57 ------------------
extra-i686/firebird-c++11.patch | 16 -----
extra-i686/firebird-c++14.patch | 30 ---------
extra-x86_64/LICENSE | 44 -------------
extra-x86_64/PKGBUILD | 57 ------------------
extra-x86_64/firebird-c++11.patch | 16 -----
extra-x86_64/firebird-c++14.patch | 30 ---------
12 files changed, 294 insertions(+), 294 deletions(-)
Deleted: extra-i686/LICENSE
===================================================================
--- extra-i686/LICENSE 2017-07-12 13:27:17 UTC (rev 300140)
+++ extra-i686/LICENSE 2017-07-12 13:27:48 UTC (rev 300141)
@@ -1,44 +0,0 @@
-
-LICENSES
---------
-
-The applicable and approved licenses for the source files
-of the Firebird RDBMS project are:
-
- 1) InterBase Public License (IPL), version 1.0
- http://bdn.borland.com/article/0,1410,30198,00.html
-
- 2) Initial Developer's Public License (IDPL), version 1.0
- http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl
-
-The IPL is copyright of Borland Corp., the other licenses are copyright
-by the source code authors and contributors.
-
-
-USAGE RULES
------------
-
-1) The source code which was released under the IPL must keep this license.
- All modifications / adaptations of this code are still subjects of the IPL.
-
-2) The files that are derived from the IPL covered code, must also keep
- this license. It means that if any new file contains some code covered by
- the IPL, then this file should be released under the IPL too.
-
-3) The new files developed by the members of the Firebird project should
- be released under the IDPL.
-
-4) The new files contributed by people who are not members of the Firebird
- project should follow the rule #3. If an author (initial developer) doesn't
- specify the license to be used, the person who applies the contributed code
- to the CVS tree (a committer) becomes responsible for the license assigned
- to the contributed code.
-
-5) Every non-binary file that exists in the CVS tree, should have a header
- section which describes the license this code is released under. If a file
- contains no header, it means that this code is freeware and nobody owns the
- appropriate copyrights.
-
-
-You may find the exhibits for the approved licenses in /doc/license directory
-of the CVS tree.
Copied: libfbclient/repos/extra-i686/LICENSE (from rev 300140, libfbclient/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE (rev 0)
+++ extra-i686/LICENSE 2017-07-12 13:27:48 UTC (rev 300141)
@@ -0,0 +1,44 @@
+
+LICENSES
+--------
+
+The applicable and approved licenses for the source files
+of the Firebird RDBMS project are:
+
+ 1) InterBase Public License (IPL), version 1.0
+ http://bdn.borland.com/article/0,1410,30198,00.html
+
+ 2) Initial Developer's Public License (IDPL), version 1.0
+ http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl
+
+The IPL is copyright of Borland Corp., the other licenses are copyright
+by the source code authors and contributors.
+
+
+USAGE RULES
+-----------
+
+1) The source code which was released under the IPL must keep this license.
+ All modifications / adaptations of this code are still subjects of the IPL.
+
+2) The files that are derived from the IPL covered code, must also keep
+ this license. It means that if any new file contains some code covered by
+ the IPL, then this file should be released under the IPL too.
+
+3) The new files developed by the members of the Firebird project should
+ be released under the IDPL.
+
+4) The new files contributed by people who are not members of the Firebird
+ project should follow the rule #3. If an author (initial developer) doesn't
+ specify the license to be used, the person who applies the contributed code
+ to the CVS tree (a committer) becomes responsible for the license assigned
+ to the contributed code.
+
+5) Every non-binary file that exists in the CVS tree, should have a header
+ section which describes the license this code is released under. If a file
+ contains no header, it means that this code is freeware and nobody owns the
+ appropriate copyrights.
+
+
+You may find the exhibits for the approved licenses in /doc/license directory
+of the CVS tree.
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-07-12 13:27:17 UTC (rev 300140)
+++ extra-i686/PKGBUILD 2017-07-12 13:27:48 UTC (rev 300141)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Carlier Laurent <lordheavym at gmail.com>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgname=libfbclient
-pkgver=2.5.7.27050
-pkgrel=2
-pkgdesc="Client library for Firebird."
-arch=('i686' '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
- 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
-
- ./configure --prefix=/usr --with-system-icu --without-fbudf \
- --without-fbsbin --without-fbconf --without-fbdoc --without-fbsample \
- --without-fbsample-db --without-fbintl --without-fbmisc --without-fbhelp \
- --without-fbsecure-db --with-fbmsg=/usr/share/firebird --without-fblog \
- --without-fbglock --without-fbplugins
-
- CXXFLAGS+=' -fno-lifetime-dse' make
-}
-
-package() {
- cd $srcdir/Firebird-$pkgver-0
-
- mkdir -p $pkgdir/usr/{bin,share/{firebird,licenses/$pkgname}}
-
- cp -R gen/firebird/{lib,include} $pkgdir/usr
- rm -f $pkgdir/usr/lib/libedit.a
-
- install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird
- install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin
- install -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
- # Add libgds support FS#30062 FS#30282
- cd $pkgdir/usr/lib
- ln -s libfbclient.so libgds.so.0
- ln -s libfbclient.so libgds.so
-}
Copied: libfbclient/repos/extra-i686/PKGBUILD (from rev 300140, libfbclient/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-07-12 13:27:48 UTC (rev 300141)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Carlier Laurent <lordheavym at gmail.com>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgname=libfbclient
+pkgver=2.5.7.27050
+pkgrel=3
+pkgdesc="Client library for Firebird."
+arch=('i686' '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
+ 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
+
+ ./configure --prefix=/usr --with-system-icu --without-fbudf \
+ --without-fbsbin --without-fbconf --without-fbdoc --without-fbsample \
+ --without-fbsample-db --without-fbintl --without-fbmisc --without-fbhelp \
+ --without-fbsecure-db --with-fbmsg=/usr/share/firebird --without-fblog \
+ --without-fbglock --without-fbplugins
+
+ CXXFLAGS+=' -fno-lifetime-dse' make
+}
+
+package() {
+ cd $srcdir/Firebird-$pkgver-0
+
+ mkdir -p $pkgdir/usr/{bin,share/{firebird,licenses/$pkgname}}
+
+ cp -R gen/firebird/{lib,include} $pkgdir/usr
+ rm -f $pkgdir/usr/lib/libedit.a
+
+ install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird
+ install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin
+ install -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+ # Add libgds support FS#30062 FS#30282
+ cd $pkgdir/usr/lib
+ ln -s libfbclient.so libgds.so.0
+ ln -s libfbclient.so libgds.so
+}
Deleted: extra-i686/firebird-c++11.patch
===================================================================
--- extra-i686/firebird-c++11.patch 2017-07-12 13:27:17 UTC (rev 300140)
+++ extra-i686/firebird-c++11.patch 2017-07-12 13:27:48 UTC (rev 300141)
@@ -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;
Copied: libfbclient/repos/extra-i686/firebird-c++11.patch (from rev 300140, libfbclient/trunk/firebird-c++11.patch)
===================================================================
--- extra-i686/firebird-c++11.patch (rev 0)
+++ extra-i686/firebird-c++11.patch 2017-07-12 13:27:48 UTC (rev 300141)
@@ -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;
Deleted: extra-i686/firebird-c++14.patch
===================================================================
--- extra-i686/firebird-c++14.patch 2017-07-12 13:27:17 UTC (rev 300140)
+++ extra-i686/firebird-c++14.patch 2017-07-12 13:27:48 UTC (rev 300141)
@@ -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)
- {
Copied: libfbclient/repos/extra-i686/firebird-c++14.patch (from rev 300140, libfbclient/trunk/firebird-c++14.patch)
===================================================================
--- extra-i686/firebird-c++14.patch (rev 0)
+++ extra-i686/firebird-c++14.patch 2017-07-12 13:27:48 UTC (rev 300141)
@@ -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)
+ {
Deleted: extra-x86_64/LICENSE
===================================================================
--- extra-x86_64/LICENSE 2017-07-12 13:27:17 UTC (rev 300140)
+++ extra-x86_64/LICENSE 2017-07-12 13:27:48 UTC (rev 300141)
@@ -1,44 +0,0 @@
-
-LICENSES
---------
-
-The applicable and approved licenses for the source files
-of the Firebird RDBMS project are:
-
- 1) InterBase Public License (IPL), version 1.0
- http://bdn.borland.com/article/0,1410,30198,00.html
-
- 2) Initial Developer's Public License (IDPL), version 1.0
- http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl
-
-The IPL is copyright of Borland Corp., the other licenses are copyright
-by the source code authors and contributors.
-
-
-USAGE RULES
------------
-
-1) The source code which was released under the IPL must keep this license.
- All modifications / adaptations of this code are still subjects of the IPL.
-
-2) The files that are derived from the IPL covered code, must also keep
- this license. It means that if any new file contains some code covered by
- the IPL, then this file should be released under the IPL too.
-
-3) The new files developed by the members of the Firebird project should
- be released under the IDPL.
-
-4) The new files contributed by people who are not members of the Firebird
- project should follow the rule #3. If an author (initial developer) doesn't
- specify the license to be used, the person who applies the contributed code
- to the CVS tree (a committer) becomes responsible for the license assigned
- to the contributed code.
-
-5) Every non-binary file that exists in the CVS tree, should have a header
- section which describes the license this code is released under. If a file
- contains no header, it means that this code is freeware and nobody owns the
- appropriate copyrights.
-
-
-You may find the exhibits for the approved licenses in /doc/license directory
-of the CVS tree.
Copied: libfbclient/repos/extra-x86_64/LICENSE (from rev 300140, libfbclient/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE (rev 0)
+++ extra-x86_64/LICENSE 2017-07-12 13:27:48 UTC (rev 300141)
@@ -0,0 +1,44 @@
+
+LICENSES
+--------
+
+The applicable and approved licenses for the source files
+of the Firebird RDBMS project are:
+
+ 1) InterBase Public License (IPL), version 1.0
+ http://bdn.borland.com/article/0,1410,30198,00.html
+
+ 2) Initial Developer's Public License (IDPL), version 1.0
+ http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl
+
+The IPL is copyright of Borland Corp., the other licenses are copyright
+by the source code authors and contributors.
+
+
+USAGE RULES
+-----------
+
+1) The source code which was released under the IPL must keep this license.
+ All modifications / adaptations of this code are still subjects of the IPL.
+
+2) The files that are derived from the IPL covered code, must also keep
+ this license. It means that if any new file contains some code covered by
+ the IPL, then this file should be released under the IPL too.
+
+3) The new files developed by the members of the Firebird project should
+ be released under the IDPL.
+
+4) The new files contributed by people who are not members of the Firebird
+ project should follow the rule #3. If an author (initial developer) doesn't
+ specify the license to be used, the person who applies the contributed code
+ to the CVS tree (a committer) becomes responsible for the license assigned
+ to the contributed code.
+
+5) Every non-binary file that exists in the CVS tree, should have a header
+ section which describes the license this code is released under. If a file
+ contains no header, it means that this code is freeware and nobody owns the
+ appropriate copyrights.
+
+
+You may find the exhibits for the approved licenses in /doc/license directory
+of the CVS tree.
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-07-12 13:27:17 UTC (rev 300140)
+++ extra-x86_64/PKGBUILD 2017-07-12 13:27:48 UTC (rev 300141)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Carlier Laurent <lordheavym at gmail.com>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgname=libfbclient
-pkgver=2.5.7.27050
-pkgrel=2
-pkgdesc="Client library for Firebird."
-arch=('i686' '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
- 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
-
- ./configure --prefix=/usr --with-system-icu --without-fbudf \
- --without-fbsbin --without-fbconf --without-fbdoc --without-fbsample \
- --without-fbsample-db --without-fbintl --without-fbmisc --without-fbhelp \
- --without-fbsecure-db --with-fbmsg=/usr/share/firebird --without-fblog \
- --without-fbglock --without-fbplugins
-
- CXXFLAGS+=' -fno-lifetime-dse' make
-}
-
-package() {
- cd $srcdir/Firebird-$pkgver-0
-
- mkdir -p $pkgdir/usr/{bin,share/{firebird,licenses/$pkgname}}
-
- cp -R gen/firebird/{lib,include} $pkgdir/usr
- rm -f $pkgdir/usr/lib/libedit.a
-
- install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird
- install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin
- install -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
- # Add libgds support FS#30062 FS#30282
- cd $pkgdir/usr/lib
- ln -s libfbclient.so libgds.so.0
- ln -s libfbclient.so libgds.so
-}
Copied: libfbclient/repos/extra-x86_64/PKGBUILD (from rev 300140, libfbclient/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-07-12 13:27:48 UTC (rev 300141)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Carlier Laurent <lordheavym at gmail.com>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgname=libfbclient
+pkgver=2.5.7.27050
+pkgrel=3
+pkgdesc="Client library for Firebird."
+arch=('i686' '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
+ 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
+
+ ./configure --prefix=/usr --with-system-icu --without-fbudf \
+ --without-fbsbin --without-fbconf --without-fbdoc --without-fbsample \
+ --without-fbsample-db --without-fbintl --without-fbmisc --without-fbhelp \
+ --without-fbsecure-db --with-fbmsg=/usr/share/firebird --without-fblog \
+ --without-fbglock --without-fbplugins
+
+ CXXFLAGS+=' -fno-lifetime-dse' make
+}
+
+package() {
+ cd $srcdir/Firebird-$pkgver-0
+
+ mkdir -p $pkgdir/usr/{bin,share/{firebird,licenses/$pkgname}}
+
+ cp -R gen/firebird/{lib,include} $pkgdir/usr
+ rm -f $pkgdir/usr/lib/libedit.a
+
+ install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird
+ install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin
+ install -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+ # Add libgds support FS#30062 FS#30282
+ cd $pkgdir/usr/lib
+ ln -s libfbclient.so libgds.so.0
+ ln -s libfbclient.so libgds.so
+}
Deleted: extra-x86_64/firebird-c++11.patch
===================================================================
--- extra-x86_64/firebird-c++11.patch 2017-07-12 13:27:17 UTC (rev 300140)
+++ extra-x86_64/firebird-c++11.patch 2017-07-12 13:27:48 UTC (rev 300141)
@@ -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;
Copied: libfbclient/repos/extra-x86_64/firebird-c++11.patch (from rev 300140, libfbclient/trunk/firebird-c++11.patch)
===================================================================
--- extra-x86_64/firebird-c++11.patch (rev 0)
+++ extra-x86_64/firebird-c++11.patch 2017-07-12 13:27:48 UTC (rev 300141)
@@ -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;
Deleted: extra-x86_64/firebird-c++14.patch
===================================================================
--- extra-x86_64/firebird-c++14.patch 2017-07-12 13:27:17 UTC (rev 300140)
+++ extra-x86_64/firebird-c++14.patch 2017-07-12 13:27:48 UTC (rev 300141)
@@ -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)
- {
Copied: libfbclient/repos/extra-x86_64/firebird-c++14.patch (from rev 300140, libfbclient/trunk/firebird-c++14.patch)
===================================================================
--- extra-x86_64/firebird-c++14.patch (rev 0)
+++ extra-x86_64/firebird-c++14.patch 2017-07-12 13:27:48 UTC (rev 300141)
@@ -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)
+ {
More information about the arch-commits
mailing list