Date: Thursday, August 19, 2021 @ 18:28:15 Author: felixonmars Revision: 422372
archrelease: copy trunk to testing-x86_64 Added: libfbclient/repos/testing-x86_64/ libfbclient/repos/testing-x86_64/LICENSE (from rev 422371, libfbclient/trunk/LICENSE) libfbclient/repos/testing-x86_64/PKGBUILD (from rev 422371, libfbclient/trunk/PKGBUILD) libfbclient/repos/testing-x86_64/shared-re2.patch (from rev 422371, libfbclient/trunk/shared-re2.patch) libfbclient/repos/testing-x86_64/update-re2.patch (from rev 422371, libfbclient/trunk/update-re2.patch) ------------------+ LICENSE | 44 ++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ shared-re2.patch | 27 ++++++++++++++++++++++++ update-re2.patch | 28 +++++++++++++++++++++++++ 4 files changed, 157 insertions(+) Copied: libfbclient/repos/testing-x86_64/LICENSE (from rev 422371, libfbclient/trunk/LICENSE) =================================================================== --- testing-x86_64/LICENSE (rev 0) +++ testing-x86_64/LICENSE 2021-08-19 18:28:15 UTC (rev 422372) @@ -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. Copied: libfbclient/repos/testing-x86_64/PKGBUILD (from rev 422371, libfbclient/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2021-08-19 18:28:15 UTC (rev 422372) @@ -0,0 +1,58 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Carlier Laurent <lordhea...@gmail.com> +# Contributor: Douglas Soares de Andrade <d...@aur.archlinux.org> + +pkgname=libfbclient +pkgver=4.0.0.2496 +pkgrel=1 +pkgdesc="Client library for Firebird" +arch=('x86_64') +url="https://www.firebirdsql.org/" +license=('custom') +depends=('gcc-libs' 'libtommath') +makedepends=('editline' 'libtomcrypt' 're2' 'unzip') +source=(https://github.com/FirebirdSQL/firebird/releases/download/v4.0.0/Firebird-$pkgver-0.tar.xz + shared-re2.patch update-re2.patch + LICENSE) +sha512sums=('110f1e9b245631ba04fb1f3f3fe16209e432157615c5c23046a277f3e6a164a2142c6732e793d9cc6650d65239a0da8bf37a74329134bd006b7d2cb070812bd6' + '7d431b6662df6f35ddd4d850de646adc4e10f6963ab5b73595de3de9a4465b5e32d28cebb68934d83e105671505de171924c6ba6539bfa5b98d8be3d7f7fab7f' + 'eb61d677461c80366d1458e9d98387f139f71fd0f49e3cf538a3656223d61470336d51afdd3d7929593ab8666ccbf95e11cb80275ba8d5588771592b0f70346c' + '1e4c24f60d2cdc1a89b52b45f778ed264ae14428a940b0509ca5c50182aed6149b7a6a546e7d08b0f264bafde81a210abe20db204c20db596f5fc2ec205ac37e') + +prepare() { + patch -d Firebird-$pkgver-0 -p1 < shared-re2.patch + patch -d Firebird-$pkgver-0 -p1 < update-re2.patch + + # Ensure system libs are used + rm -r Firebird-$pkgver-0/extern/{editline,libtommath,libtomcrypt,zlib} +} + +build() { + cd Firebird-$pkgver-0 + + ./configure --prefix=/usr \ + --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 --without-fbtzdata --with-system-editline + + make +} + +package() { + cd Firebird-$pkgver-0 + + mkdir -p "$pkgdir"/usr/{bin,share/{firebird,licenses/$pkgname}} + + cp -R gen/Release/firebird/{lib,include} "$pkgdir"/usr + rm -f "$pkgdir"/usr/lib/{libdecFloat.a,libedit.a} + + install -m644 gen/Release/firebird/*.msg "$pkgdir"/usr/share/firebird + install -m755 gen/Release/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/testing-x86_64/shared-re2.patch (from rev 422371, libfbclient/trunk/shared-re2.patch) =================================================================== --- testing-x86_64/shared-re2.patch (rev 0) +++ testing-x86_64/shared-re2.patch 2021-08-19 18:28:15 UTC (rev 422372) @@ -0,0 +1,27 @@ +diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in +index c7d3336266..8ad766c1a4 100644 +--- a/builds/posix/Makefile.in ++++ b/builds/posix/Makefile.in +@@ -170,9 +170,6 @@ external: + $(MAKE) -C $(ROOT)/extern/decNumber + ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(LIB) + +- CXXFLAGS="-O3 -g -fPIC" $(MAKE) -C $(ROOT)/extern/re2 +- ln -sf $(ROOT)/extern/re2/obj/libre2.a $(LIB) +- + ifeq ($(TOMMATH_BUILD_FLG),Y) + CFLAGS="$(CFLAGS)" $(MAKE) -C $(ROOT)/extern/libtommath -f makefile.shared GCC=$(GCC) + +diff --git a/builds/posix/make.rules b/builds/posix/make.rules +index 3afd891141..44e9e3754d 100644 +--- a/builds/posix/make.rules ++++ b/builds/posix/make.rules +@@ -32,7 +32,7 @@ + + + # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002 +-WFLAGS =-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(ROOT)/extern/re2 $(CPPFLAGS) $(LTCSOURCE) ++WFLAGS =-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include $(CPPFLAGS) $(LTCSOURCE) + + ifeq ($(TOMMATH_BUILD_FLG),Y) + WFLAGS += -I$(TOMMATH_INC) Copied: libfbclient/repos/testing-x86_64/update-re2.patch (from rev 422371, libfbclient/trunk/update-re2.patch) =================================================================== --- testing-x86_64/update-re2.patch (rev 0) +++ testing-x86_64/update-re2.patch 2021-08-19 18:28:15 UTC (rev 422372) @@ -0,0 +1,28 @@ +commit 512319738fcf9819f375f20441f09a7b1dff5168 +Author: Adriano dos Santos Fernandes <adrian...@gmail.com> +Date: Wed May 26 10:41:25 2021 -0300 + + Replace removed RE2 method. + +diff --git a/src/common/SimilarToRegex.cpp b/src/common/SimilarToRegex.cpp +index 3a62b245e3..0b6e533018 100644 +--- a/src/common/SimilarToRegex.cpp ++++ b/src/common/SimilarToRegex.cpp +@@ -108,7 +108,7 @@ namespace + options.set_log_errors(false); + options.set_dot_nl(true); + options.set_case_sensitive(!(flags & COMP_FLAG_CASE_INSENSITIVE)); +- options.set_utf8(!(flags & COMP_FLAG_LATIN)); ++ options.set_encoding(flags & COMP_FLAG_LATIN ? RE2::Options::EncodingLatin1 : RE2::Options::EncodingUTF8); + + re2::StringPiece sp((const char*) re2PatternStr.c_str(), re2PatternStr.length()); + regexp = FB_NEW_POOL(pool) RE2(sp, options); +@@ -759,7 +759,7 @@ namespace + options.set_log_errors(false); + options.set_dot_nl(true); + options.set_case_sensitive(!(flags & COMP_FLAG_CASE_INSENSITIVE)); +- options.set_utf8(!(flags & COMP_FLAG_LATIN)); ++ options.set_encoding(flags & COMP_FLAG_LATIN ? RE2::Options::EncodingLatin1 : RE2::Options::EncodingUTF8); + + re2::StringPiece sp((const char*) finalRe2Pattern.c_str(), finalRe2Pattern.length()); + regexp = FB_NEW_POOL(pool) RE2(sp, options);