Create a gist now

Instantly share code, notes, and snippets.

What would you like to do?
Libreoffice with Firebird3 patch
diff --git a/download.lst b/download.lst
index 7ba8351..7f3899d 100644
--- a/download.lst
+++ b/download.lst
@@ -34,10 +34,10 @@ export ETONYEK_MD5SUM := 77ff46936dcc83670557274e7dd2aa33
export ETONYEK_VERSION_MICRO := 6
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
-export FIREBIRD_MD5SUM := b0b5293991fcf07347b38431c80be1d4
-export FIREBIRD_TARBALL := Firebird-2.5.5.26952-0.tar.bz2
-# FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7
-# export FIREBIRD_TARBALL := Firebird-3.0-alpha1-20130302.tar.gz
+#export FIREBIRD_MD5SUM := b0b5293991fcf07347b38431c80be1d4
+#export FIREBIRD_TARBALL := Firebird-2.5.5.26952-0.tar.bz2
+export FIREBIRD_MD5SUM := 51d35d33d16980d765c0617683ecbcbf
+export FIREBIRD_TARBALL := Firebird-3.0.0.32366-ReleaseCandidate2.tar.bz2
export FONTCONFIG_TARBALL := 77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
export FONT_CALADEA_TARBALL := 368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
export FONT_CARLITO_TARBALL := c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk
index 6e757d8..0d9a6be 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -12,13 +12,13 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,firebird,firebird))
$(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
ifeq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient.dll,gen/Release/firebird/lib/ifbclient.dll))
else ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.5))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.dylib,gen/Release/firebird/lib/libfbclient.dylib.3.0.0))
else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.5))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbclient.so.3.0.0,gen/Release/firebird/lib/libfbclient.so.3.0.0))
endif
-$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/firebird/firebird.msg))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_SHARE_FOLDER)/firebird/firebird.msg,gen/Release/firebird/firebird.msg))
# vim: set noet sw=4 ts=4:
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index cd89dfb..426ab15 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -34,7 +34,7 @@ MAKE_PRE=$(if $(filter WNT,$(OS)),\
MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
- $(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.5)
+ $(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbclient.dylib.3.0.0)
# do not set LDFLAGS - it is mysteriously not used by firebird on MacOSX
$(call gb_ExternalProject_get_state_target,firebird,build):
@@ -61,8 +61,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
" \
&& MAKE=$(MAKE) ./configure \
--without-editline \
- --disable-superserver \
- --with-system-icu --without-fbsample --without-fbsample-db \
+ --without-fbsample --without-fbsample-db \
$(if $(filter-out MSC,$(COM)),$(if $(ENABLE_DEBUG),--enable-debug)) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING), \
@@ -71,9 +70,9 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
--enable-shared --disable-static \
) \
&& if [ -n "$${FB_CPU_ARG}" ]; then \
- $(MAKE_PRE) $(MAKE) $(INVOKE_FPA) SHELL='$(SHELL)' firebird_embedded $(MAKE_POST); \
+ $(MAKE_PRE) $(MAKE) $(INVOKE_FPA) SHELL='$(SHELL)' $(MAKE_POST); \
else \
- $(MAKE_PRE) $(MAKE) SHELL='$(SHELL)' firebird_embedded $(MAKE_POST); \
+ $(MAKE_PRE) $(MAKE) SHELL='$(SHELL)' $(MAKE_POST); \
fi \
)
# vim: set noet sw=4 ts=4:
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index d04a350a..c490720 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -14,10 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,firebird,0))
$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
- external/firebird/firebird-rpath.patch.0 \
- external/firebird/firebird-c++11.patch.1 \
- external/firebird/firebird.disable-ib-util-not-found.patch.1 \
- external/firebird/firebird-c++14.patch \
))
ifeq ($(OS)-$(COM),WNT-MSC)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment