diff --git a/.gitattributes b/.gitattributes index a67b740..ad0e1bf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,4 +23,3 @@ *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns 185d60944ea767075d27247c3162b3bc-unowinreg.dll filter=lfs diff=lfs merge=lfs -text -firebird_integer_x64le_ods12.odb filter=lfs diff=lfs merge=lfs -text diff --git a/0001-allow-none-gi-support.patch b/0001-allow-none-gi-support.patch deleted file mode 100644 index b23513d..0000000 --- a/0001-allow-none-gi-support.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 84bfe584e4bd03a7b6e2c1e68c65bf99ae83c839 Mon Sep 17 00:00:00 2001 -From: Pranav Kant -Date: Tue, 18 Oct 2016 17:27:00 +0530 -Subject: tdf#102511: Add (allow-none) for backward GI compatibility - -(allow-none), though deprecated since GI 1.42, is required to -maintain the backward compatibility since (nullable), added in -GI 1.42, is not understood by GI tools < 1.42 preventing the -clients from passing a null parameter to various functions in the -widget. - -We can remove this deprecated (allow-none) annotation once we -bump the GI version in LibreOffice to atleast 1.42 - -Change-Id: I98a1f3d2205ec5afd8060f16e69c5f938f229e26 - -Index: libreoffice-5.2.3.2/include/LibreOfficeKit/LibreOfficeKitGtk.h -=================================================================== ---- libreoffice-5.2.3.2.orig/include/LibreOfficeKit/LibreOfficeKitGtk.h -+++ libreoffice-5.2.3.2/include/LibreOfficeKit/LibreOfficeKitGtk.h -@@ -42,7 +42,7 @@ GType lok_doc_v - - /** - * lok_doc_view_new: -- * @pPath: (nullable): LibreOffice install path. Pass null to set it to default -+ * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default - * path which in most cases would be $libdir/libreoffice/program - * @cancellable: The cancellable object that you can use to cancel this - * operation. -@@ -56,9 +56,9 @@ GtkWidget* lok_doc_v - - /** - * lok_doc_view_new_from_user_profile: -- * @pPath: (nullable): LibreOffice install path. Pass null to set it to default -+ * @pPath: (nullable): (allow-none): LibreOffice install path. Pass null to set it to default - * path which in most cases would be $libdir/libreoffice/program -- * @pUserProfile: (nullable): User profile URL. Must be either a file URL or a -+ * @pUserProfile: (nullable): (allow-none): User profile URL. Must be either a file URL or a - * special vnd.sun.star.pathname URL. Pass non-null to be able to use this - * widget and LibreOffice itself in parallel. - * @cancellable: The cancellable object that you can use to cancel this -@@ -84,7 +84,7 @@ GtkWidget* lok_doc_v - * lok_doc_view_open_document: - * @pDocView: The #LOKDocView instance - * @pPath: (transfer full): The path of the document that #LOKDocView widget should try to open -- * @pRenderingArguments: (nullable): lok::Document::initializeForRendering() arguments. -+ * @pRenderingArguments: (nullable): (allow-none): lok::Document::initializeForRendering() arguments. - * @cancellable: - * @callback: - * @userdata: -@@ -307,7 +307,7 @@ gboolean lok_doc_ - * lok_doc_view_set_document_password: - * @pDocView: The #LOKDocView instance - * @pUrl: the URL of the document to set password for, as sent with signal `password-required` -- * @pPassword: (nullable): the password, NULL for no password -+ * @pPassword: (nullable): (allow-none): the password, NULL for no password - * - * Set the password for password protected documents - */ diff --git a/firebird_integer_x64le_ods12.odb b/firebird_integer_x64le_ods12.odb deleted file mode 100644 index 234acd8..0000000 --- a/firebird_integer_x64le_ods12.odb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38e8bfbf16aef63ea9438f937138ec03d409b2f47fcc1605fd868a2d7ba12c17 -size 75701 diff --git a/libreoffice-firebird3-selftest.patch b/libreoffice-firebird3-selftest.patch deleted file mode 100644 index ab0f78e..0000000 --- a/libreoffice-firebird3-selftest.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Michal Kubecek -Date: Thu, 2 Jun 2016 11:56:10 +0200 -Subject: connectivity: firebird: use ODS12 test database for Firebird 3 -Patch-mainline: Not tagged yet (5.3.0.0.alpha1?) -Git-commit: de899f0b350e51b1932fa4674f7ce2ae386cd1ce -References: bsc#982485 - -Firebird 3.0 uses new database file format (ODS, On Disk Structure) so -that we need to use either ODS11 or ODS12 version of test database for -dbaccess_firebird test, depending on whether building against Firebird -2.5 or 3.0 libraries. - -Change-Id: Idecdc35b0ac87ab7f46cb79b5c044c65423a2c7e -Reviewed-on: https://gerrit.libreoffice.org/25846 -Reviewed-by: jan iversen -Tested-by: jan iversen ---- - config_host/config_firebird.h.in | 10 ++++++++++ - configure.ac | 16 +++++++++++++--- - dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb | Bin 0 -> 75701 bytes - dbaccess/qa/unit/firebird.cxx | 5 +++++ - 4 files changed, 28 insertions(+), 3 deletions(-) - create mode 100644 config_host/config_firebird.h.in - create mode 100644 dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb - -diff --git a/config_host/config_firebird.h.in b/config_host/config_firebird.h.in -new file mode 100644 -index 000000000000..c6aa43ac54f3 ---- /dev/null -+++ b/config_host/config_firebird.h.in -@@ -0,0 +1,10 @@ -+/* -+Settings for Firebird -+*/ -+ -+#ifndef CONFIG_FIREBIRD_H -+#define CONFIG_FIREBIRD_H -+ -+#define HAVE_FIREBIRD_30 0 -+ -+#endif -diff --git a/configure.ac b/configure.ac -index 6abeae315c2e..1d137c6a129c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8671,8 +8671,10 @@ if test "$enable_firebird_sdbc" = "yes" ; then - if test -n "${FIREBIRD_VERSION}"; then - FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1` - FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2` -- if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5" -o \ -- "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then -+ if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; then -+ AC_MSG_RESULT([OK]) -+ elif test "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then -+ AC_DEFINE(HAVE_FIREBIRD_30, 1) - AC_MSG_RESULT([OK]) - else - AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed]) -@@ -8681,10 +8683,16 @@ if test "$enable_firebird_sdbc" = "yes" ; then - __save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include --#if defined(FB_API_VER) && (FB_API_VER == 25 || FB_API_VER == 30) -+#if defined(FB_API_VER) && FB_API_VER == 25 -+int fb_api_is_25(void) { return 0; } -+#elif defined(FB_API_VER) && FB_API_VER == 30 -+int fb_api_is_30(void) { return 0; } - #else - #error "Wrong Firebird API version" - #endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed])) -+ if nm conftest.$OBJEXT | grep fb_api_is_30; then -+ AC_DEFINE(HAVE_FIREBIRD_30, 1) -+ fi - CFLAGS="${__save_CFLAGS}" - fi - ENABLE_FIREBIRD_SDBC="TRUE" -@@ -8727,6 +8735,7 @@ AC_SUBST(LIBATOMIC_OPS_LIBS) - AC_SUBST(SYSTEM_FIREBIRD) - AC_SUBST(FIREBIRD_CFLAGS) - AC_SUBST(FIREBIRD_LIBS) -+AC_SUBST(HAVE_FIREBIRD_30) - dnl AC_SUBST([TOMMATH_CFLAGS]) - dnl AC_SUBST([TOMMATH_LIBS]) - -@@ -12928,6 +12937,7 @@ AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h]) - AC_CONFIG_HEADERS([config_host/config_cxxabi.h]) - AC_CONFIG_HEADERS([config_host/config_dbus.h]) - AC_CONFIG_HEADERS([config_host/config_features.h]) -+AC_CONFIG_HEADERS([config_host/config_firebird.h]) - AC_CONFIG_HEADERS([config_host/config_folders.h]) - AC_CONFIG_HEADERS([config_host/config_gio.h]) - AC_CONFIG_HEADERS([config_host/config_global.h]) -diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx -index c9ee575f9b7f..da0bed760d2e 100644 ---- a/dbaccess/qa/unit/firebird.cxx -+++ b/dbaccess/qa/unit/firebird.cxx -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - using namespace ::com::sun::star; - using namespace ::com::sun::star::sdb; -@@ -65,7 +66,11 @@ void FirebirdTest::testEmptyDBConnection() - void FirebirdTest::testIntegerDatabase() - { - uno::Reference< XOfficeDatabaseDocument > xDocument = -+#if HAVE_FIREBIRD_30 -+ getDocumentForFileName("firebird_integer_x64le_ods12.odb"); -+#else - getDocumentForFileName("firebird_integer_x64le.odb"); -+#endif - - uno::Reference< XConnection > xConnection = - getConnectionForDocument(xDocument); --- -2.9.0 - diff --git a/libreoffice-firebird3.patch b/libreoffice-firebird3.patch deleted file mode 100644 index 77ad623..0000000 --- a/libreoffice-firebird3.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Michal Kubecek -Date: Thu, 2 Jun 2016 08:12:37 +0200 -Subject: configure.ac: allow build with Firebird 3.0 -Patch-mainline: Not tagged yet (5.3.0.0.alpha1?) -Git-commit: e5d48f12faec6027bf79411cb69111d90f4e4129 -References: bsc#982485 - -Relax the checks in configure.ac to allow building against recently -released Firebird 3.0. In this version, libfbclient is also used to -access local database files (embedded server mode) rather than -separate libfbembed. - -Change-Id: Id498cbca22409f95ee299a6165cc765efa25eca7 -Reviewed-on: https://gerrit.libreoffice.org/25845 -Tested-by: Jenkins -Reviewed-by: jan iversen ---- - configure.ac | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ebca3bab7665..6abeae315c2e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8653,8 +8653,10 @@ if test "$enable_firebird_sdbc" = "yes" ; then - AC_PATH_PROG(FIREBIRDCONFIG, [fb_config]) - if test -z "$FIREBIRDCONFIG"; then - AC_MSG_NOTICE([No fb_config -- using pkg-config]) -- PKG_CHECK_MODULES(FIREBIRD, fbembed) -- FIREBIRD_VERSION=`pkg-config --modversion fbembed` -+ PKG_CHECK_MODULES([FIREBIRD], [fbclient >= 3], [FIREBIRD_PKGNAME=fbclient], [ -+ PKG_CHECK_MODULES([FIREBIRD], [fbembed], [FIREBIRD_PKGNAME=fbembed]) -+ ]) -+ FIREBIRD_VERSION=`pkg-config --modversion "$FIREBIRD_PKGNAME"` - else - AC_MSG_NOTICE([fb_config found]) - FIREBIRD_VERSION=`$FIREBIRDCONFIG --version` -@@ -8669,19 +8671,20 @@ if test "$enable_firebird_sdbc" = "yes" ; then - if test -n "${FIREBIRD_VERSION}"; then - FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1` - FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2` -- if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5"; then -+ if test "$FIREBIRD_MAJOR" -eq "2" -a "$FIREBIRD_MINOR" -eq "5" -o \ -+ "$FIREBIRD_MAJOR" -eq "3" -a "$FIREBIRD_MINOR" -eq "0"; then - AC_MSG_RESULT([OK]) - else -- AC_MSG_ERROR([Ensure firebird 2.5.x is installed]) -+ AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed]) - fi - else - __save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} ${FIREBIRD_CFLAGS}" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include --#if defined(FB_API_VER) && FB_API_VER == 25 -+#if defined(FB_API_VER) && (FB_API_VER == 25 || FB_API_VER == 30) - #else - #error "Wrong Firebird API version" --#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x is installed])) -+#endif]])],AC_MSG_RESULT([OK]),AC_MSG_ERROR([Ensure firebird 2.5.x or 3.0.x is installed])) - CFLAGS="${__save_CFLAGS}" - fi - ENABLE_FIREBIRD_SDBC="TRUE" --- -2.9.0 - diff --git a/libreoffice-hotfix-disablebrokenshapetest.patch b/libreoffice-hotfix-disablebrokenshapetest.patch index aa11f50..5c1ed81 100644 --- a/libreoffice-hotfix-disablebrokenshapetest.patch +++ b/libreoffice-hotfix-disablebrokenshapetest.patch @@ -1,8 +1,8 @@ -Index: libreoffice-5.2.4.1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +Index: libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx =================================================================== ---- libreoffice-5.2.4.1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -+++ libreoffice-5.2.4.1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -@@ -1114,29 +1114,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " +--- libreoffice-5.3.0.0.beta1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ++++ libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +@@ -1102,29 +1102,6 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, " assertXPath(pXmlDoc, "//w:ind", "start", "1418"); } @@ -29,6 +29,6 @@ Index: libreoffice-5.2.4.1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx -#endif -} - - DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx") - { - xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + #endif + + CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/libreoffice.changes b/libreoffice.changes index 96988ea..28b57da 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -4,6 +4,12 @@ Sat Dec 3 12:15:27 UTC 2016 - tchvatal@suse.com - Version update to 5.3.0.beta1: * Starting of testing of new major release - Refresh patch system-pyuno.diff +- Refresh again libreoffice-hotfix-disablebrokenshapetest.patch +- Drop upstreamed patches: + * libreoffice-firebird3-selftest.patch + * libreoffice-firebird3.patch + * 0001-allow-none-gi-support.patch + ------------------------------------------------------------------- Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 8afc5aa..46a9d59 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -39,8 +39,6 @@ Url: http://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz -# test database for Patch18 -Source20: firebird_integer_x64le_ods12.odb Source99: %{name}-rpmlintrc # prebuilt extensions Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt @@ -74,11 +72,6 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch -# PATCH-FIX-UPSTREAM: fix build against (system) Firebird 3.0 -Patch17: libreoffice-firebird3.patch -Patch18: libreoffice-firebird3-selftest.patch -# PATCH-FIX-UPSTREAM: taken from 5.3 branch to fix working with sle12 gnome introspection -Patch19: 0001-allow-none-gi-support.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -935,10 +928,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch4 %patch5 %patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -cp -vn %{SOURCE20} dbaccess/qa/unit/data/ %patch990 -p1 # Do not generate doxygen timestamp