From 63375577f32c6b3591d33e36629d92efd7c7761f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de> Date: Sat, 6 Jul 2019 14:17:40 +0200 Subject: [PATCH] firebird: remove package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de> --- .../files/fix-gcc6-no_throw_bad_alloc.patch | 19 --- srcpkgs/firebird/patches/001-rpath.patch | 11 -- .../004-disable-ib-util-not-found.patch | 19 --- srcpkgs/firebird/patches/005-c++14.patch | 14 --- srcpkgs/firebird/patches/006-musl-glibc.patch | 11 -- srcpkgs/firebird/template | 108 ------------------ srcpkgs/firebird/update | 2 - 7 files changed, 184 deletions(-) delete mode 100644 srcpkgs/firebird/files/fix-gcc6-no_throw_bad_alloc.patch delete mode 100644 srcpkgs/firebird/patches/001-rpath.patch delete mode 100644 srcpkgs/firebird/patches/004-disable-ib-util-not-found.patch delete mode 100644 srcpkgs/firebird/patches/005-c++14.patch delete mode 100644 srcpkgs/firebird/patches/006-musl-glibc.patch delete mode 100644 srcpkgs/firebird/template delete mode 100644 srcpkgs/firebird/update diff --git a/srcpkgs/firebird/files/fix-gcc6-no_throw_bad_alloc.patch b/srcpkgs/firebird/files/fix-gcc6-no_throw_bad_alloc.patch deleted file mode 100644 index 922abd1cee..0000000000 --- a/srcpkgs/firebird/files/fix-gcc6-no_throw_bad_alloc.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/common/classes/alloc.h 2015-11-16 12:39:40.000000000 +0100 -+++ src/common/classes/alloc.h 2016-09-14 14:28:38.810632773 +0200 -@@ -49,14 +49,8 @@ - stdlib.h (EKU) */ - #endif - --// MSVC does not support exception specification, so it's unknown if that will be correct or not --// from its POV. For now, use it and disable the C4290 warning. --// --//#if defined (_MSC_VER) --//#define THROW_BAD_ALLOC --//#else --#define THROW_BAD_ALLOC throw (std::bad_alloc) --//#endif -+// Handled by -fcheck-new compiler option -+#define THROW_BAD_ALLOC - - #ifdef USE_VALGRIND - diff --git a/srcpkgs/firebird/patches/001-rpath.patch b/srcpkgs/firebird/patches/001-rpath.patch deleted file mode 100644 index a92f0064b2..0000000000 --- a/srcpkgs/firebird/patches/001-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- builds/posix/make.defaults -+++ builds/posix/make.defaults -@@ -255,7 +255,7 @@ - - LIB_PLATFORM_RPATH = -Wl,-rpath,$(1) - ifeq ($(strip @BINRELOC_CFLAGS@),) --LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@)) -+LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN') - else - LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$$$ORIGIN/../$(1)') - endif diff --git a/srcpkgs/firebird/patches/004-disable-ib-util-not-found.patch b/srcpkgs/firebird/patches/004-disable-ib-util-not-found.patch deleted file mode 100644 index 7e9a30c6f1..0000000000 --- a/srcpkgs/firebird/patches/004-disable-ib-util-not-found.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/jrd/fun.epp 2015-01-23 22:11:26.751475044 +0100 -+++ src/jrd/fun.epp 2015-01-23 22:16:42.507322568 +0100 -@@ -160,10 +160,14 @@ - if (tryLibrary(LIBNAME, message[3])) - return; - -+ /* fdo#72543: quote from https://bugs.freedesktop.org/show_bug.cgi?id=72543#c8 -+ "we don't need UDF support for embedded firebird, -+ hence the lack of ib_util isn't an issue and can safely be ignored" - // all failed - log error - gds__log("ib_util init failed, UDFs can't be used - looks like firebird misconfigured\n" - "\t%s\n\t%s\n\t%s\n\t%s", message[0].c_str(), message[1].c_str(), - message[2].c_str(), message[3].c_str()); -+ */ - #endif // !BOOT_BUILD - } - -Seulement dans firebird/src/misc: codes.cpp -Seulement dans firebird: temp diff --git a/srcpkgs/firebird/patches/005-c++14.patch b/srcpkgs/firebird/patches/005-c++14.patch deleted file mode 100644 index ad095bf679..0000000000 --- a/srcpkgs/firebird/patches/005-c++14.patch +++ /dev/null @@ -1,14 +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); -+} diff --git a/srcpkgs/firebird/patches/006-musl-glibc.patch b/srcpkgs/firebird/patches/006-musl-glibc.patch deleted file mode 100644 index 68b451d16e..0000000000 --- a/srcpkgs/firebird/patches/006-musl-glibc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/classes/rwlock.h 2015-03-27 14:47:01.000000000 +0100 -+++ src/common/classes/rwlock.h 2016-02-24 15:11:46.043602883 +0100 -@@ -191,7 +191,7 @@ - - void init() - { --#if defined(LINUX) && !defined(USE_VALGRIND) -+#if defined(LINUX) && defined(__GLIBC__) && !defined(USE_VALGRIND) - pthread_rwlockattr_t attr; - if (pthread_rwlockattr_init(&attr)) - system_call_failed::raise("pthread_rwlockattr_init"); diff --git a/srcpkgs/firebird/template b/srcpkgs/firebird/template deleted file mode 100644 index acb2591d93..0000000000 --- a/srcpkgs/firebird/template +++ /dev/null @@ -1,108 +0,0 @@ -# Template file for 'firebird' -pkgname=firebird -version=2.5.9.27139 -revision=1 -_build=0 -_uver=${version//./_} -wrksrc="${pkgname^}-${version}-${_build}" -build_style=gnu-configure -configure_args="--prefix=/usr/libexec/firebird --with-system-icu --with-system-editline" -nocross=yes -hostmakedepends="automake libtool pkg-config icu" -makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-devel" -short_desc="Relational database offering many ANSI SQL standard features" -maintainer="Jürgen Buchmüller <pullmoll@t-online.de>" -license="custom" -homepage="https://www.firebirdsql.org/en/start/" -distfiles="https://github.com/FirebirdSQL/firebird/releases/download/R${_uver%_*}/Firebird-${version}-${_build}.tar.bz2" -checksum=46ee37b14b44f3e45cd286b739f92e9366643f52bef51a131cc973a6980d9481 -disable_parallel_build=yes - -pre_configure() { - # Avoid errors telling we are not 'root' and - # do not change ownership to root:root and - # do not change permissions to read-only - find -iname "*.sh.in" -exec sed -i "{}" \ - -e 's;"`whoami`";"root";' \ - -e 's;chown root:root;#&;' \ - -e 's;chown -R;#&;' \ - -e 's;chmod 0444;chmod 0644;' \ - -e 's;chmod 0555;chmod 0755;' \; - mv configure.{in,ac} - autoreconf -if -} - -do_install() { - local _lib _v0=${version%.*} _v1=${version%.*.*} _v2=${version%.*.*.*} - - cd ${wrksrc}/gen - ./install/makeInstallImage.sh - - cd ${wrksrc} - - # Fix permissions - find gen/buildroot -type f -perm 0444 -exec chmod 0644 "{}" \; - find gen/buildroot -type f -perm 0555 -exec chmod 0755 "{}" \; - - # Move some directories and files from /usr/libexec/firebird to /usr - mkdir -p gen/buildroot/usr/bin - mkdir -p gen/buildroot/usr/include - mkdir -p gen/buildroot/usr/lib - mv gen/buildroot/usr/libexec/firebird/bin/fb_config gen/buildroot/usr/bin/ - mv gen/buildroot/usr/libexec/firebird/include/* gen/buildroot/usr/include/ - mv gen/buildroot/usr/libexec/firebird/lib/* gen/buildroot/usr/lib/ - - # Re-create shared library symlinks in /usr/lib - for _lib in libfbclient libfbembed; do - ln -sf ${_lib}.so.${_v0} gen/buildroot/usr/lib/${_lib}.so.${_v1} - ln -sf ${_lib}.so.${_v0} gen/buildroot/usr/lib/${_lib}.so.${_v2} - ln -sf ${_lib}.so.${_v0} gen/buildroot/usr/lib/${_lib}.so - done - - # Add libgds support FS#30062 FS#30282 - ln -sf libfbclient.so.${_v0} gen/buildroot/usr/lib/libgds.so.0 - ln -sf libfbclient.so.${_v0} gen/buildroot/usr/lib/libgds.so - - vlicense doc/license/IDPL.txt IDPL - vlicense doc/license/README.license.usage.txt LICENSE - - # Modify fb_config for the /usr/include and /usr/lib paths - sed -i gen/buildroot/usr/bin/fb_config \ - -e "s;/usr/libexec/firebird/include;/usr/include;g" \ - -e "s;/usr/libexec/firebird/lib;/usr/lib;g" - - cp -pR gen/buildroot/* ${DESTDIR}/ - - # TODO: create superserver? - # system account? - # runit service? - # Example https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=firebird-superserver -} - -libfbclient_package() { - short_desc+=" - client libraries" - pkg_install() { - local _v _v0=${version%.*} _v1=${version%.*.*} _v2=${version%.*.*.*} - vmove usr/bin/fb_config - for _v in ${_v0} ${_v1} ${_v2}; do - vmove usr/lib/libfbclient.so.${_v} - vmove usr/lib/libfbembed.so.${_v} - done - vmove usr/lib/libgds.so.0 - vmove usr/lib/libib_util.so - vmove usr/libexec/firebird/*.msg - vlicense doc/license/IDPL.txt IDPL - vlicense doc/license/README.license.usage.txt LICENSE - } -} - -libfbclient-devel_package() { - short_desc+=" - development files" - depends="libfbclient>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/libfbclient.so - vmove usr/lib/libfbembed.so - vmove usr/lib/libgds.so - } -} diff --git a/srcpkgs/firebird/update b/srcpkgs/firebird/update deleted file mode 100644 index 19193bafdb..0000000000 --- a/srcpkgs/firebird/update +++ /dev/null @@ -1,2 +0,0 @@ -site="http://firebirdsql.org/en/firebird-2-5/" -pattern="Firebird-\K[\d\.]*(?=\-0\.tar\.bz2)"