Accepting request 458695 from LibreOffice:Factory
1 OBS-URL: https://build.opensuse.org/request/show/458695 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=124
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2a44444d40
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -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
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
From 84bfe584e4bd03a7b6e2c1e68c65bf99ae83c839 Mon Sep 17 00:00:00 2001
|
||||
From: Pranav Kant <pranavk@collabora.co.uk>
|
||||
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
|
||||
*/
|
||||
39
0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch
Normal file
39
0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 18f068baca7630afdc8d02a4e21a4aa1a9d70f86 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
|
||||
Date: Thu, 5 Jan 2017 16:06:10 +0100
|
||||
Subject: [PATCH] unixODBC changed soname to .2 so reflect it
|
||||
|
||||
we dlopen this library and thus we should be able to find it with any
|
||||
soname, so far .1 and .2 seem to be used.
|
||||
|
||||
Change-Id: Idcd284fada1acdfe8dde46c3056c21b792777280
|
||||
---
|
||||
dbaccess/source/ui/dlg/odbcconfig.cxx | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
|
||||
index cd1b583e1840..163fc8549d06 100644
|
||||
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
|
||||
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
|
||||
@@ -38,6 +38,7 @@
|
||||
#ifdef MACOSX
|
||||
#define ODBC_LIBRARY "libiodbc.dylib"
|
||||
#else
|
||||
+#define ODBC_LIBRARY_2 "libodbc.so.2"
|
||||
#define ODBC_LIBRARY_1 "libodbc.so.1"
|
||||
#define ODBC_LIBRARY "libodbc.so"
|
||||
#endif
|
||||
@@ -124,6 +125,10 @@ OOdbcEnumeration::OOdbcEnumeration()
|
||||
if ( !bLoaded )
|
||||
bLoaded = load(ODBC_LIBRARY_1);
|
||||
#endif
|
||||
+#ifdef ODBC_LIBRARY_2
|
||||
+ if ( !bLoaded )
|
||||
+ bLoaded = load(ODBC_LIBRARY_2);
|
||||
+#endif
|
||||
|
||||
if ( bLoaded )
|
||||
{
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
|
||||
size 2448421
|
||||
3
86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
Normal file
3
86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f
|
||||
size 1794694
|
||||
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34
|
||||
size 18033694
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305
|
||||
size 1769329
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:38e8bfbf16aef63ea9438f937138ec03d409b2f47fcc1605fd868a2d7ba12c17
|
||||
size 75701
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1
|
||||
size 183870036
|
||||
3
libreoffice-5.3.0.3.tar.xz
Normal file
3
libreoffice-5.3.0.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e
|
||||
size 168797580
|
||||
@ -1,119 +0,0 @@
|
||||
From: Michal Kubecek <mkubecek@suse.cz>
|
||||
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 <jani@documentfoundation.org>
|
||||
Tested-by: jan iversen <jani@documentfoundation.org>
|
||||
---
|
||||
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 <ibase.h>
|
||||
-#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 <com/sun/star/sdbc/XRow.hpp>
|
||||
#include <com/sun/star/sdbc/XStatement.hpp>
|
||||
#include <svtools/miscopt.hxx>
|
||||
+#include <config_firebird.h>
|
||||
|
||||
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
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
From: Michal Kubecek <mkubecek@suse.cz>
|
||||
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 <ci@libreoffice.org>
|
||||
Reviewed-by: jan iversen <jani@documentfoundation.org>
|
||||
---
|
||||
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 <ibase.h>
|
||||
-#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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a
|
||||
size 1936920
|
||||
3
libreoffice-help-5.3.0.3.tar.xz
Normal file
3
libreoffice-help-5.3.0.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f
|
||||
size 1615344
|
||||
@ -1,8 +1,8 @@
|
||||
Index: libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
Index: libreoffice-5.3.0.0.beta1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
===================================================================
|
||||
--- libreoffice-5.2.0.0.alpha1.orig/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
+++ libreoffice-5.2.0.0.alpha1/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|
||||
@@ -1103,29 +1103,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");
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8401e51c4b91cd47f103ba09519f0b5b9213561b7d6296ff5bdc2d1622950a48
|
||||
size 141771228
|
||||
3
libreoffice-translations-5.3.0.3.tar.xz
Normal file
3
libreoffice-translations-5.3.0.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4321a57fba1012b30eae6e629f18d4139395fd5751af381dc87e31e084fca1d1
|
||||
size 140659960
|
||||
@ -1,3 +1,106 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 16 12:19:35 UTC 2017 - normand@linux.vnet.ibm.com
|
||||
|
||||
- bypass upstream bug for aarch64 and ppc64/ppc64le
|
||||
https://bugs.documentfoundation.org/show_bug.cgi?id=105519
|
||||
removing some fods data files source of test failure.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 14 12:20:48 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Fixup pyuno loading as it broke when we dropped the uno patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 4 00:46:52 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Add conditional liberation2-fonts BuildRequires and Recommends
|
||||
for Tumbleweed, it is better suited for the version of freetype2
|
||||
we have available.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 1 13:10:25 UTC 2017 - adam.majer@suse.de
|
||||
|
||||
- use individual libboost-*-devel packages instead of boost-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 1 10:53:18 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Version update to 5.3.0.3:
|
||||
* RC3 of the 5.3 targets with additional fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 20 12:03:38 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Version update to 5.3.0.2:
|
||||
* RC2 of the 5.3.0 target, stabilizing the lokit
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 18 21:21:04 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Provide the breeze-dark content in the breeze icontheme
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 17 12:38:47 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Drop system-pyuno.diff patch as it breaks services tests as the
|
||||
pyuno was not loadable
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 13 09:21:39 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Version update to 5.3.0.1:
|
||||
* RC candidate stabilizing ont he beta1 bump
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 5 15:08:29 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Fix unixODBC loading bnc#1017925
|
||||
* 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 4 20:11:44 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
- Build firebird driver only for version 3, 2.x series does not pass
|
||||
tests at all
|
||||
- Drop 13.2 support, out of scope as EOL
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 19 11:42:00 UTC 2016 - tchvatal@suse.com
|
||||
|
||||
- Version update to 5.3.0.beta2:
|
||||
* Various bugfixes to bring 5.3 to stability
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
- Remove --enable-hardlink-deliver switch that is removed from autotools
|
||||
- Add dep on libzmf, libstaroffice
|
||||
- Update internal xmlsec
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 3 11:46:40 UTC 2016 - tchvatal@suse.com
|
||||
|
||||
- Version update to 5.2.4.1
|
||||
* various bugfixes mostly containing L3 fixes:
|
||||
- Fix L3 bnc#946674 LO-L3: Undo does not revert bundled font size changes for
|
||||
table cells
|
||||
- Fix L3 bnc#952640 LO-L3: Cut and Paste (at the same position) changes bullet
|
||||
point formatting
|
||||
- Fix L3 bnc#955548 LO-L3: CTRL+Z not working to undo changes performed through
|
||||
Navigator
|
||||
- Fix L3 bnc#959168 LO-L3: Undo on bullet point style change only works when
|
||||
focus is not set
|
||||
- bnc#957991 LO-L3: Improve pivot cache reading performance
|
||||
- Refresh patch libreoffice-hotfix-disablebrokenshapetest.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 21 07:56:22 UTC 2016 - tchvatal@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libreoffice
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -22,15 +22,20 @@
|
||||
%define numbertext_version 0.9.5
|
||||
# Urls
|
||||
%define external_url http://dev-www.libreoffice.org/src/
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.2.3
|
||||
%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.3.0
|
||||
# Wether to enable the kde integration
|
||||
%if 0%{?is_opensuse} || %{suse_version} == 1320
|
||||
%if 0%{?is_opensuse}
|
||||
%bcond_without kdeintegration
|
||||
%else
|
||||
%bcond_with kdeintegration
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
%bcond_without firebird
|
||||
%else
|
||||
%bcond_with firebird
|
||||
%endif
|
||||
Name: libreoffice
|
||||
Version: 5.2.3.3
|
||||
Version: 5.3.0.3
|
||||
Release: 0
|
||||
Summary: A Free Office Suite (Framework)
|
||||
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C
|
||||
@ -39,8 +44,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
|
||||
@ -51,7 +54,7 @@ Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.t
|
||||
Source1999: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
# Internal bundled stuff we can't remove
|
||||
# XMLSec is patched over and over in here
|
||||
Source2000: %{external_url}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
|
||||
Source2000: %{external_url}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
|
||||
# To build this we would pull cygwin; not worth it
|
||||
Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
# hsqldb simply does not work with new system version, but luckily we migrate to firebird
|
||||
@ -61,31 +64,35 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
# Needed for wiki-published and always taken as bundled
|
||||
Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
# Needed for integration tests
|
||||
Source2006: http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
|
||||
Source2007: http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar
|
||||
# PATCH-FIX-SUSE: disable really fragile test run on hsqldb
|
||||
Patch0: disable-flaky-hsqldb-test.patch
|
||||
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
|
||||
# to avoid BerkleyDB incompatibility with the plain build
|
||||
Patch1: scp2-user-config-suse.diff
|
||||
# correctly bootstrap python stuff with system python (deb#501028, bnc#90701)
|
||||
Patch3: system-pyuno.diff
|
||||
# do not use the broken help; unopkg complained about it when registering extensions
|
||||
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
|
||||
Patch4: nlpsolver-no-broken-help.diff
|
||||
Patch5: mediawiki-no-broken-help.diff
|
||||
Patch6: 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch
|
||||
# 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
|
||||
BuildRequires: ant
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: bison
|
||||
%if 0%{?suse_version} > 1325
|
||||
BuildRequires: libboost_date_time-devel
|
||||
BuildRequires: libboost_filesystem-devel
|
||||
BuildRequires: libboost_iostreams-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
%else
|
||||
BuildRequires: boost-devel
|
||||
%endif
|
||||
BuildRequires: bsh2
|
||||
BuildRequires: commons-codec
|
||||
BuildRequires: commons-httpclient
|
||||
@ -107,10 +114,15 @@ BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: junit4
|
||||
BuildRequires: libbase
|
||||
BuildRequires: libcppunit-devel
|
||||
%if 0%{?suse_version} >= 1330
|
||||
BuildRequires: liberation2-fonts
|
||||
%else
|
||||
BuildRequires: liberation-fonts
|
||||
%endif
|
||||
BuildRequires: libexif
|
||||
# once FB 3.0 is in Factory, change to pkgconfig(fbclient) / pkgconfig(fbembed)
|
||||
BuildRequires: libfbembed-devel
|
||||
%if %{with firebird}
|
||||
BuildRequires: pkgconfig(fbclient)
|
||||
%endif
|
||||
BuildRequires: libfonts
|
||||
BuildRequires: libformula
|
||||
BuildRequires: libjpeg-devel
|
||||
@ -179,16 +191,18 @@ BuildRequires: pkgconfig(liblangtag)
|
||||
BuildRequires: pkgconfig(libmspub-0.1) >= 0.1
|
||||
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.5
|
||||
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4
|
||||
BuildRequires: pkgconfig(liborcus-0.11)
|
||||
BuildRequires: pkgconfig(liborcus-0.12)
|
||||
BuildRequires: pkgconfig(libpagemaker-0.0)
|
||||
BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
BuildRequires: pkgconfig(libstaroffice-0.0)
|
||||
BuildRequires: pkgconfig(libvisio-0.1) >= 0.1
|
||||
BuildRequires: pkgconfig(libwpd-0.10) >= 0.10
|
||||
BuildRequires: pkgconfig(libwpg-0.3)
|
||||
BuildRequires: pkgconfig(libwps-0.4) >= 0.4.2
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(libxslt)
|
||||
BuildRequires: pkgconfig(libzmf-0.0)
|
||||
BuildRequires: pkgconfig(mdds-1.2)
|
||||
BuildRequires: pkgconfig(mythes)
|
||||
BuildRequires: pkgconfig(nspr) >= 4.8
|
||||
@ -207,7 +221,11 @@ Requires: python3
|
||||
Requires(post): update-desktop-files
|
||||
Requires(postun): update-desktop-files
|
||||
Recommends: google-carlito-fonts
|
||||
%if 0%{?suse_version} >= 1330
|
||||
Recommends: liberation2-fonts
|
||||
%else
|
||||
Recommends: liberation-fonts
|
||||
%endif
|
||||
Provides: %{name}-draw-extensions = %{version}
|
||||
Obsoletes: %{name}-draw-extensions < %{version}
|
||||
Provides: %{name}-impress-extensions = %{version}
|
||||
@ -931,20 +949,25 @@ Provides additional %{langname} translations and resources for %{project}. \
|
||||
%if 0%{?suse_version} < 1330
|
||||
%patch1
|
||||
%endif
|
||||
%patch3 -p1
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
cp -vn %{SOURCE20} dbaccess/qa/unit/data/
|
||||
%patch990 -p1
|
||||
|
||||
# Do not generate doxygen timestamp
|
||||
echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile
|
||||
echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
|
||||
|
||||
# bypass test failure tracked by upstream bug
|
||||
# https://bugs.documentfoundation.org/show_bug.cgi?id=105519
|
||||
%ifarch aarch64 ppc64 ppc64le
|
||||
for xx in forecast.ets.add forecast.ets.mult linest logest minverse rate
|
||||
do
|
||||
rm sc/qa/unit/data/functions/fods/$xx.fods
|
||||
done
|
||||
%endif
|
||||
|
||||
%build
|
||||
# Parallel build settings ...
|
||||
lo_jobs="%{?jobs:%{jobs}}"
|
||||
@ -1037,10 +1060,14 @@ export NOCONFIGURE=yes
|
||||
--enable-kde4 \
|
||||
%else
|
||||
--disable-kde4 \
|
||||
%endif
|
||||
%if %{with firebird}
|
||||
--enable-firebird-sdbc \
|
||||
%else
|
||||
--disable-firebird-sdbc \
|
||||
%endif
|
||||
--enable-evolution2 \
|
||||
--enable-dbus \
|
||||
--enable-hardlink-deliver \
|
||||
--enable-ext-ct2n \
|
||||
--enable-ext-nlpsolver \
|
||||
--enable-ext-numbertext \
|
||||
@ -1055,9 +1082,6 @@ export NOCONFIGURE=yes
|
||||
--enable-symbols
|
||||
# no coinormp packages for coinmp
|
||||
|
||||
# hack to correctly bootstrap python stuff with system python, (deb#501028, bnc#90701)
|
||||
sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py
|
||||
|
||||
# just call make here as we added the jobs in configure
|
||||
# The check phase is run here too if it is split with nocheck
|
||||
# install of jars get broken sometimes
|
||||
@ -1074,8 +1098,10 @@ grep -v "%{_libdir}/libreoffice/program/libvclplug_gtk3lo.so" file-lists/gnome_l
|
||||
mv tmplist file-lists/gnome_list.txt
|
||||
|
||||
# Remove firebird connector from main package filelist
|
||||
%if %{with firebird}
|
||||
grep -v "%{_libdir}/libreoffice/program/libfirebird_sdbclo.so" file-lists/common_list.txt > tmplist
|
||||
mv tmplist file-lists/common_list.txt
|
||||
%endif
|
||||
|
||||
################
|
||||
# update desktop files
|
||||
@ -1204,6 +1230,13 @@ done
|
||||
# Remove pointless readmes
|
||||
rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
|
||||
|
||||
# Prepare uno path detection, can't be patched in because it breaks tests
|
||||
echo "import sys, os" > uno.py
|
||||
echo "sys.path.append('%{baseinstdir}/program')" >> uno.py
|
||||
echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{_libdir}/libreoffice/program/fundamentalrc')" >> uno.py
|
||||
cat %{buildroot}%{_libdir}/%{name}/program/uno.py >> uno.py
|
||||
cp uno.py %{buildroot}%{_libdir}/%{name}/program/uno.py
|
||||
|
||||
# Generate python cache files
|
||||
%py3_compile %{buildroot}/%{_libdir}/libreoffice/program/
|
||||
%py3_compile %{buildroot}/%{_libdir}/libreoffice/share/extensions/
|
||||
@ -1232,8 +1265,10 @@ ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/
|
||||
mkdir -p %{buildroot}%{python3_sitelib}
|
||||
ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py
|
||||
ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py
|
||||
ln -s %{_libdir}/libreoffice/program/officehelper.py %{buildroot}%{python3_sitelib}/officehelper.py
|
||||
echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt
|
||||
echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt
|
||||
echo "%{python3_sitelib}/officehelper.py" >> file-lists/pyuno_list.txt
|
||||
|
||||
# move glade catalog to system glade dir
|
||||
install -m 0755 -d %{buildroot}%{_datadir}/glade/catalogs
|
||||
@ -1340,7 +1375,6 @@ exit 0
|
||||
%{_libdir}/girepository-1.0/LOKDocView-0.1.typelib
|
||||
%{_libdir}/liblibreofficekitgtk.so
|
||||
%dir %{_libdir}/libreoffice/share/libreofficekit
|
||||
%{_libdir}/libreoffice/share/libreofficekit/handle_graphic.png
|
||||
%{_libdir}/libreoffice/share/libreofficekit/handle_image_end.png
|
||||
%{_libdir}/libreoffice/share/libreofficekit/handle_image_middle.png
|
||||
%{_libdir}/libreoffice/share/libreofficekit/handle_image_start.png
|
||||
@ -1385,9 +1419,11 @@ exit 0
|
||||
%files -f file-lists/postgresql_list.txt base-drivers-postgresql
|
||||
%defattr(-,root,root)
|
||||
|
||||
%if %{with firebird}
|
||||
%files base-drivers-firebird
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libreoffice/program/libfirebird_sdbclo.so
|
||||
%endif
|
||||
|
||||
%files -f file-lists/filters_list.txt filters-optional
|
||||
%defattr(-,root,root)
|
||||
@ -1439,6 +1475,7 @@ exit 0
|
||||
%dir %{_datadir}/%{name}/share
|
||||
%dir %{_datadir}/%{name}/share/config
|
||||
%{_datadir}/%{name}/share/config/images_breeze.zip
|
||||
%{_datadir}/%{name}/share/config/images_breeze_dark.zip
|
||||
|
||||
%files icon-theme-galaxy
|
||||
%defattr(-,root,root)
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
Index: libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh
|
||||
===================================================================
|
||||
--- libreoffice-5.2.0.0.alpha1.orig/desktop/scripts/soffice.sh
|
||||
+++ libreoffice-5.2.0.0.alpha1/desktop/scripts/soffice.sh
|
||||
@@ -137,6 +137,9 @@ if echo "$checks" | grep -q "cc" ; then
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
|
||||
+export PYTHONPATH
|
||||
+
|
||||
case "`uname -s`" in
|
||||
NetBSD|OpenBSD|DragonFly)
|
||||
# this is a temporary hack until we can live with the default search paths
|
||||
Index: libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py
|
||||
===================================================================
|
||||
--- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/module/uno.py
|
||||
+++ libreoffice-5.2.0.0.alpha1/pyuno/source/module/uno.py
|
||||
@@ -16,8 +16,12 @@
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
#
|
||||
+import os
|
||||
import sys
|
||||
|
||||
+sys.path.append('@INSTALLDIR@/program')
|
||||
+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
|
||||
+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc"
|
||||
import pyuno
|
||||
|
||||
try:
|
||||
Index: libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py
|
||||
===================================================================
|
||||
--- libreoffice-5.2.0.0.alpha1.orig/pyuno/source/officehelper.py
|
||||
+++ libreoffice-5.2.0.0.alpha1/pyuno/source/officehelper.py
|
||||
@@ -44,7 +44,7 @@ def bootstrap():
|
||||
if "UNO_PATH" in os.environ:
|
||||
sOffice = os.environ["UNO_PATH"]
|
||||
else:
|
||||
- sOffice = "" # lets hope for the best
|
||||
+ sOffice = "@INSTALLDIR@/program"
|
||||
sOffice = os.path.join(sOffice, "soffice")
|
||||
if platform.startswith("win"):
|
||||
sOffice += ".exe"
|
||||
Loading…
Reference in New Issue
Block a user