From 72577138ebef28a12f517b68b6d3af671ad3885e Mon Sep 17 00:00:00 2001 From: milisarge Date: Fri, 30 Jun 2017 23:01:52 +0300 Subject: [PATCH] freebird.paketlendi --- .../freebird-client/firebird-c++11.patch | 16 ++++++++++ .../freebird-client/firebird-c++14.patch | 30 +++++++++++++++++++ talimatname/genel/freebird-client/talimat | 17 ++++++----- 3 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 talimatname/genel/freebird-client/firebird-c++11.patch create mode 100644 talimatname/genel/freebird-client/firebird-c++14.patch diff --git a/talimatname/genel/freebird-client/firebird-c++11.patch b/talimatname/genel/freebird-client/firebird-c++11.patch new file mode 100644 index 000000000..00de488ea --- /dev/null +++ b/talimatname/genel/freebird-client/firebird-c++11.patch @@ -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; diff --git a/talimatname/genel/freebird-client/firebird-c++14.patch b/talimatname/genel/freebird-client/firebird-c++14.patch new file mode 100644 index 000000000..d978cef23 --- /dev/null +++ b/talimatname/genel/freebird-client/firebird-c++14.patch @@ -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) + { diff --git a/talimatname/genel/freebird-client/talimat b/talimatname/genel/freebird-client/talimat index 3de2945d8..97c7099c7 100644 --- a/talimatname/genel/freebird-client/talimat +++ b/talimatname/genel/freebird-client/talimat @@ -1,33 +1,36 @@ # Description: Firebird için istemci kütüphanesi. # URL: http://www.firebirdsql.org/ -# Packager: alihan-ozturk28@hotmail.com milisarge +# Packager: milisarge # Depends on: icu name=freebird-client -version=2.5.5.26952 +version=2.5.7.27050 release=1 -source=( http://downloads.sourceforge.net/firebird/Firebird-$version-0.tar.bz2 ) +source=( http://downloads.sourceforge.net/firebird/Firebird-$version-0.tar.bz2 + firebird-c++11.patch + firebird-c++14.patch) build() { cd $SRC/Firebird-$version-0 - ./autogen.sh - find ./ -name \*.sh -print0 | xargs -0 chmod +x + patch -Np1 -i ../firebird-c++11.patch + patch -Np0 -i ../firebird-c++14.patch ./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 - make -j1 + CXXFLAGS+=' -fno-lifetime-dse' make -j1 - mkdir -p $PKG/usr/{bin,share/{firebird,licenses/$name}} + mkdir -p $PKG/usr/{bin,share/{firebird,licenses/$name}} cp -R gen/firebird/{lib,include} $PKG/usr rm -f $PKG/usr/lib/libedit.a install -m644 gen/firebird/*.msg $PKG/usr/share/firebird install -m755 gen/firebird/bin/fb_config $PKG/usr/bin + install -m644 ${SRC}/LICENSE $PKG/usr/share/licenses/$name/LICENSE # Add libgds support FS#30062 FS#30282 cd $PKG/usr/lib