[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-37-g996658b
The following commit has been merged in the debian-experimental-4.1 branch:
commit 8983e7ac42d97d16bc9804184496ab9a599ad6be
Author: Rene Engelhard <rene@debian.org>
Date: Sat Mar 9 14:45:51 2013 +0100
git update; fix build with mysql..
diff --git a/changelog b/changelog
index db0e100..d0cce4e 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130305-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130309-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/build-dont-run-checks.diff b/patches/build-dont-run-checks.diff
index fd960c2..1abdaf8 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -19,7 +19,7 @@ index 0e694e5..48b25ac 100644
.PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun help showmodules translations
.DEFAULT_GOAL := all
--all : build unitcheck
+-all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck))
+all : build
build :
@@ -28,15 +28,6 @@ diff --git a/Makefile.in b/Makefile.in
index 53ec395..fdc2fb7 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -216,7 +216,7 @@ bootstrap: compilerplugins
- # Build
- #
- build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
-- $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild all slowcheck
-+ $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild all
-
- build-nocheck : export SKIP_TESTS := YES
- build-nocheck : build
@@ -402,7 +402,7 @@ findunusedcode:
| grep -v ^WSObject \
> unusedcode.easy
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index 15d0f2e..beb4051 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -21,17 +21,15 @@ index e6f78a7..0660940 100644
AC_MSG_CHECKING([which C preprocessor to use in idlc])
diff --git a/config_host.mk.in b/config_host.mk.in
-index 828bcd6..74e3b55 100644
+index cf54479..7d85380 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
-@@ -487,8 +488,8 @@ export SCPDEFS=@SCPDEFS@
+@@ -488,7 +488,7 @@ export SCPDEFS=@SCPDEFS@
export SERVLETAPI_JAR=@SERVLETAPI_JAR@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
export SOLARENV=@SRC_ROOT@/solenv
-export SOLARINC=@SOLARINC@
--export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
+export SOLARINC=@SOLARINC@ @GCJ_JNI_INCLUDE@
-+export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@ @GCJ_JNI_INCLUDE@
export SOLARLIB=@SOLARLIB@
- export SOLARLIB_FOR_BUILD=@SOLARLIB_FOR_BUILD@
export SOLARVER=@SOLARVER@
+ export SOLARVERSION=@SOLARVER@
diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
index 66307ba..5d8b78e 100644
--- a/patches/mysqlcppconn-libmysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -32,7 +32,7 @@ index 542c384..0b58f14 100644
+++ b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
- $(if $(filter NO,$(SYSTEM_MYSQL)), \
+ $(if $(filter NO,$(SYSTEM_MARIADB)), \
mysqlcppconn/patches/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch) \
+ mysql-connector-c++-1.1.0-SONAME.patch \
mysqlcppconn/patches/default_to_protocol_tcp.patch \
diff --git a/patches/reportdesign-mention-package.diff b/patches/reportdesign-mention-package.diff
index bdd0a61..3ccceb6 100644
--- a/patches/reportdesign-mention-package.diff
+++ b/patches/reportdesign-mention-package.diff
@@ -2,10 +2,12 @@ diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/db
index 974b36e..2f42c27 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
-@@ -96,5 +96,5 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
+@@ -86,7 +86,7 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
String RID_STR_EXTENSION_NOT_PRESENT
{
// #i96130# use hard coded name
- Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder.";
+ Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder. For this, install the package 'libreoffice-report-builder'.";
};
+
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rules b/rules
index 85bfe0e..3d3c670 100755
--- a/rules
+++ b/rules
@@ -281,8 +281,10 @@ SYSTEM_LIBRSVG=y
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
-# cannot be disabled, unless you have a internal MySQL/PostgreSQL somewhere :-)
-SYSTEM_STUFF += mysql mysql-cppconn
+USE_MARIADB=n
+# set this also to y for system-mysql..
+SYSTEM_STUFF += mariadb
+SYSTEM_STUFF += mysql-cppconn
MYSQLCPPCONN_MINVER= (>= 1.1.0~r791)
SYSTEM_STUFF += postgresql
DICT_DIR=/usr/share/hunspell
@@ -1026,12 +1028,16 @@ else
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- CONFIGURE_FLAGS += --enable-ext-mysql-connector
- ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
+ CONFIGURE_FLAGS += --enable-ext-mariadb-connector
+ ifneq "$(USE_MARIADB)" "y"
ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmysqlclient-dev
+ BUILD_DEPS += , libmysqlclient-dev
else
- BUILD_DEPS += , libmysqlclient-dev (>= 5.5~)
+ BUILD_DEPS += , libmysqlclient-dev (>= 5.5~)
+ endif
+ else
+ ifneq (,$(filter mariadb, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libmariadbclient-dev
endif
endif
ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
@@ -1601,6 +1607,12 @@ ifneq "$(WHEEZY_BACKPORT)" "y"
endif
endif
+ifeq "$(USE_MARIADB)" "n"
+ # MARIADBCONFIG=mysql_config for autogen.sh somehow doesn't work...
+ mkdir -p debian/usr/bin && \
+ cd debian/usr/bin && ln -s /usr/bin/mysql_config mariadb_config
+endif
+
touch $@
build:
--
LibreOffice packaging repository
Reply to: