pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 318095 from LibreOffice:Factory

Browse Source 
- Add explicit requires over libmysqlclient_r18, should cover bnc#829430

- Add patch to build with old cairo (sle11):
  * old-cairo.patch

- Version bump to 5.0 rc3:
  * Various more fixes closing on the 5.0 release
- Removed upstreamed patches:
  * fix-old-poppler.patch
  * mdds-old-gcc.patch

- Try to fix build on SLE11 and remove obsolete patch:
  * A mdds-old-gcc.patch
  * D pack-desktop-files-for-optional-filters.diff

- Update to 5.0 rc2:
  * Few small fixes and updates in internal libraries

- Version bump to 5.0 rc1, remove obsolete patches:
  * 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch
  * 0001-writerperfect-fix-gcc-4.7-build.patch

- More chrpat love for sle11

- Add python-importlib to build/requirements on py2 distros

- Provide/obsolete crystal icons so they are purged and not left over
- Add few patch to get LO in more buildable state on SLE11, all
  upstreamed:
  * 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch

OBS-URL: https://build.opensuse.org/request/show/318095
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=94
This commit is contained in:
Dominique Leuenberger 2015-08-03 15:20:52 +00:00 committed by Git OBS Bridge
commit 04884d32bb
31 changed files with 222 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
0001-Make-cpp-poppler-version.h-header-optional.patch
View File

@ -1,102 +0,0 @@
From 459fe2262e26c3f24108e5ba1bdf342b6236cf54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Thu, 16 Apr 2015 10:13:06 +0200
Subject: [PATCH] Make cpp/poppler-version.h header optional
Older popler (SLE11) does not have this header yet.
With the code simply if the header not found define version to oldest
possible working candidate and also raise the .pc check to the same.
Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c
---
config_host/config_poppler.h.in | 10 ++++++++++
configure.ac | 9 ++++++---
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 ++++++++
3 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 config_host/config_poppler.h.in
diff --git a/config_host/config_poppler.h.in b/config_host/config_poppler.h.in
new file mode 100644
index 0000000..458c49b
--- /dev/null
+++ b/config_host/config_poppler.h.in
@@ -0,0 +1,10 @@
+/*
+Settings for poppler header file dection
+*/
+
+#ifndef CONFIG_POPPLER_H
+#define CONFIG_POPPLER_H
+
+#define HAVE_POPPLER_VERSION_H 0
+
+#endif
diff --git a/configure.ac b/configure.ac
index 9e8e1d2..79effbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10432,14 +10432,15 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
if test "$with_system_poppler" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_POPPLER=TRUE
- PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
+ PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
save_CPPFLAGS=$CPPFLAGS
CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
- AC_CHECK_HEADER([cpp/poppler-version.h], [],
- [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
+ AC_CHECK_HEADER([cpp/poppler-version.h],
+ [AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)],
+ [])
CXXFLAGS=$save_CXXFLAGS
CPPFLAGS=$save_CPPFLAGS
AC_LANG_POP([C++])
@@ -10449,6 +10450,7 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
AC_MSG_RESULT([internal])
SYSTEM_POPPLER=
BUILD_TYPE="$BUILD_TYPE POPPLER"
+ AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)
fi
else
AC_MSG_RESULT([no])
@@ -13002,6 +13004,7 @@ AC_CONFIG_HEADERS([config_host/config_vcl.h])
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_CONFIG_HEADERS([config_host/config_oauth2.h])
+AC_CONFIG_HEADERS([config_host/config_poppler.h])
AC_OUTPUT
if test "$CROSS_COMPILING" = TRUE; then
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index d15491b..f4fa810 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
#include <sal/types.h>
+#include <config_poppler.h>
#if defined __GNUC__
# pragma GCC diagnostic push
@@ -50,7 +51,14 @@
class GfxPath;
class GfxFont;
class PDFDoc;
+#if HAVE_POPPLER_VERSION_H
#include <cpp/poppler-version.h>
+#else
+#define POPPLER_VERSION "0.12.3"
+#define POPPLER_VERSION_MAJOR 0
+#define POPPLER_VERSION_MINOR 12
+#define POPPLER_VERSION_MICRO 3
+#endif
#define POPPLER_CHECK_VERSION(major,minor,micro) \
(POPPLER_VERSION_MAJOR > (major) || \
(POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
--
2.3.5

3
b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28
size 23218952

3
cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab
size 154444

3
e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3
size 25485678

3
ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:648f10fb764d000d6a68b2d4e008117900e853c197a024d1f91dbba9b91012ca
size 726942

3
ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513
size 1982036

3
harfbuzz-0.9.23.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7
size 1027508

3
harfbuzz-0.9.40.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f
size 1182989

3
language-subtag-registry-2014-12-03.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25a590bab49352b655ea7ad4ac4b7758b3a541124f4eec268733ab435f71c5f4
size 72082

3
language-subtag-registry-2015-06-08.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c079b7cbcfbe9517585f8234187741ca79e6ee900fb13642869db5295eef31b
size 72992

3
libetonyek-0.1.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:716edf726ba3896fe85eea9a75786948d5ddeda63a54c00f3308658cc3bbd9e4
size 423556

3
libetonyek-0.1.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9963d8a2b0125390fa259fe872ab707a6642817d2aa1e667e9f97a1ba3510d1f
size 460867

3
libfreehand-0.1.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c69962d5947561afeefeee71bc78ba7419e9d9b0fea8bcef2f625be867afe307
size 340549

3
libfreehand-0.1.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877
size 597212

3
libmwaw-0.3.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:444e15e3e60e9fcc7d859b201571d9612a5347cefd6e753ce4710f638514da67
size 1170238

3
libmwaw-0.3.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe71b7f120aca311a977569f51ffb258e824616db6afbb29ea0072398fc4c9b4
size 1304580

3
libodfgen-0.1.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66d1f350fb9c0e8c9eec1b8c644d8531b8d6777ae7b8507f8abc4783b6d2981c
size 406636

3
libodfgen-0.1.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f74999d2c93ac0cc077a0a9c36340daff29dc772992160ae81dd010345f72b80
size 435590

3
libreoffice-4.4.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad6154c157e07adee2271cfc722a116065a2e7261ee7d93fc796f76703e88966
size 164320100

3
libreoffice-5.0.0.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c290a4f1911e96a5851f9e4e354264c69c86fde222f79a363419ea782b4a44a
size 165377132

3
libreoffice-help-4.4.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e10d43de0478d2aa939131e46cb8f7144e0302ee61e06a60732da9b9a03e3526
size 1875884

3
libreoffice-help-5.0.0.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f656f97c9903fe89652de5cac4269cfb07fd19d23d92baf1663261650846d500
size 1882452

3
libreoffice-translations-4.4.3.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:393e1fc8c91f1addc5a90795b23c2ee03ba6f3ad0f21664067859dcbf8b28e9f
size 127857520

3
libreoffice-translations-5.0.0.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34f76fac859d7f5b3c34b5cfe81404e9ab4d5d771dc551d8507fa2757ebbd0e1
size 129775160

78
libreoffice.changes
View File

@ -1,3 +1,81 @@
-------------------------------------------------------------------
Wed Jul 22 12:12:07 UTC 2015 - tchvatal@suse.com
- Add explicit requires over libmysqlclient_r18, should cover bnc#829430
-------------------------------------------------------------------
Tue Jul 14 14:56:11 UTC 2015 - tchvatal@suse.com
- Add patch to build with old cairo (sle11):
* old-cairo.patch
-------------------------------------------------------------------
Tue Jul 14 09:00:37 UTC 2015 - tchvatal@suse.com
- Version bump to 5.0 rc3:
* Various more fixes closing on the 5.0 release
- Removed upstreamed patches:
* fix-old-poppler.patch
* mdds-old-gcc.patch
-------------------------------------------------------------------
Fri Jul 3 07:04:45 UTC 2015 - tchvatal@suse.com
- Try to fix build on SLE11 and remove obsolete patch:
* A mdds-old-gcc.patch
* D pack-desktop-files-for-optional-filters.diff
-------------------------------------------------------------------
Wed Jul 1 08:55:34 UTC 2015 - tchvatal@suse.com
- Update to 5.0 rc2:
* Few small fixes and updates in internal libraries
-------------------------------------------------------------------
Tue Jun 23 13:21:48 UTC 2015 - tchvatal@suse.com
- Version bump to 5.0 rc1, remove obsolete patches:
* 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch
* 0001-writerperfect-fix-gcc-4.7-build.patch
-------------------------------------------------------------------
Mon Jun 22 09:15:38 UTC 2015 - tchvatal@suse.com
- More chrpat love for sle11
-------------------------------------------------------------------
Fri Jun 19 10:33:12 UTC 2015 - tchvatal@suse.com
- Add python-importlib to build/requirements on py2 distros
-------------------------------------------------------------------
Fri Jun 19 09:40:37 UTC 2015 - tchvatal@suse.com
- Provide/obsolete crystal icons so they are purged and not left over
- Add few patch to get LO in more buildable state on SLE11, all
upstreamed:
* 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch
* 0001-writerperfect-fix-gcc-4.7-build.patch
* fix-old-poppler.patch
-------------------------------------------------------------------
Wed Jun 17 06:54:47 UTC 2015 - tchvatal@suse.com
- Fix breeze icons handling, drop crystal icons.
-------------------------------------------------------------------
Sat Jun 13 13:23:20 UTC 2015 - tchvatal@suse.com
- Version bump to 5.0.0.beta3:
* Drop merged patch 0001-Make-cpp-poppler-version.h-header-optional.patch
* Update some internal tarballs so we keep building
- based on these bumps update the buildrequires too
-------------------------------------------------------------------
Wed Jun 3 12:08:54 UTC 2015 - tchvatal@suse.com
- Generate python cache files wrt bnc#929793
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 21 11:59:03 UTC 2015 - tchvatal@suse.com Thu May 21 11:59:03 UTC 2015 - tchvatal@suse.com

123
libreoffice.spec
View File

@ -23,7 +23,7 @@
%define numbertext_version 0.9.5 %define numbertext_version 0.9.5
# Urls # Urls
%define external_url http://dev-www.libreoffice.org/src/ %define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.4.3 %define tarball_url http://download.documentfoundation.org/libreoffice/src/5.0.0
# Old Make and bundle or not # Old Make and bundle or not
%if 0%{?suse_version} > 1230 %if 0%{?suse_version} > 1230
%bcond_with oldmake %bcond_with oldmake
@ -60,10 +60,12 @@
%else %else
%global python_type python %global python_type python
%global python3_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %global python3_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
BuildRequires: python-importlib
Requires: python-importlib
%endif %endif
# This is used due to the need for beta releases # This is used due to the need for beta releases
Name: libreoffice Name: libreoffice
Version: 4.4.3.2 Version: 5.0.0.3
Release: 0 Release: 0
Summary: A Free Office Suite (Framework) 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 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
@ -98,36 +100,36 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi
Source2006: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz Source2006: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
Source2007: %{external_url}/librevenge-0.0.2.tar.bz2 Source2007: %{external_url}/librevenge-0.0.2.tar.bz2
Source2008: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz Source2008: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
Source2009: %{external_url}/libetonyek-0.1.1.tar.bz2 Source2009: %{external_url}/libetonyek-0.1.3.tar.bz2
Source2010: %{external_url}/libe-book-0.1.2.tar.bz2 Source2010: %{external_url}/libe-book-0.1.2.tar.bz2
Source2011: %{external_url}/libfreehand-0.1.0.tar.bz2 Source2011: %{external_url}/libfreehand-0.1.1.tar.bz2
Source2012: %{external_url}/libodfgen-0.1.3.tar.bz2 Source2012: %{external_url}/libodfgen-0.1.4.tar.bz2
Source2013: %{external_url}/libcdr-0.1.1.tar.bz2 Source2013: %{external_url}/libcdr-0.1.1.tar.bz2
Source2014: %{external_url}/libmspub-0.1.2.tar.bz2 Source2014: %{external_url}/libmspub-0.1.2.tar.bz2
Source2015: %{external_url}/libmwaw-0.3.4.tar.bz2 Source2015: %{external_url}/libmwaw-0.3.5.tar.bz2
Source2016: %{external_url}/libpagemaker-0.0.2.tar.bz2 Source2016: %{external_url}/libpagemaker-0.0.2.tar.bz2
Source2017: %{external_url}/libvisio-0.1.1.tar.bz2 Source2017: %{external_url}/libvisio-0.1.1.tar.bz2
Source2018: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz Source2018: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
Source2019: %{external_url}/libwpd-0.10.0.tar.bz2 Source2019: %{external_url}/libwpd-0.10.0.tar.bz2
Source2020: %{external_url}/libwpg-0.3.0.tar.bz2 Source2020: %{external_url}/libwpg-0.3.0.tar.bz2
Source2021: %{external_url}/libwps-0.3.1.tar.bz2 Source2021: %{external_url}/libwps-0.4.0.tar.bz2
Source2022: %{external_url}/libabw-0.1.1.tar.bz2 Source2022: %{external_url}/libabw-0.1.1.tar.bz2
Source2023: %{external_url}/lcms2-2.6.tar.gz Source2023: %{external_url}/lcms2-2.6.tar.gz
Source2024: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source2024: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
Source2025: %{external_url}/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 Source2025: %{external_url}/mdds_0.12.1.tar.bz2
Source2026: %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz Source2026: %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
Source2027: %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz Source2027: %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
Source2028: %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 Source2028: %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
Source2029: %{external_url}/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip Source2029: %{external_url}/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip
Source2030: %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip Source2030: %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
Source2031: %{external_url}/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz Source2031: %{external_url}/e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz
Source2032: %{external_url}/graphite2-1.2.4.tgz Source2032: %{external_url}/graphite2-1.2.4.tgz
Source2033: %{external_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 Source2033: %{external_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
Source2034: %{external_url}/harfbuzz-0.9.23.tar.bz2 Source2034: %{external_url}/harfbuzz-0.9.40.tar.bz2
Source2035: %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz Source2035: %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
Source2036: %{external_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 Source2036: %{external_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
Source2037: %{external_url}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz Source2037: %{external_url}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
Source2038: %{external_url}/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz Source2038: %{external_url}/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip
Source2039: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2039: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
Source2040: %{external_url}/Firebird-2.5.2.26540-0.tar.bz2 Source2040: %{external_url}/Firebird-2.5.2.26540-0.tar.bz2
Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz
@ -151,25 +153,23 @@ Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.
Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
Source2060: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz Source2060: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
Source2062: %{external_url}/language-subtag-registry-2014-12-03.tar.bz2 Source2062: %{external_url}/language-subtag-registry-2015-06-08.tar.bz2
# Make for old distros where too old gnumake resides # Make for old distros where too old gnumake resides
Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2 Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build # to avoid BerkleyDB incompatibility with the plain build
# FIXME: make it configurable and push upstream # FIXME: make it configurable and push upstream
Patch1: scp2-user-config-suse.diff Patch1: scp2-user-config-suse.diff
# pack new desktop files # correctly bootstrap python stuff with system python (deb#501028, bnc#90701)
Patch2: pack-desktop-files-for-optional-filters.diff
# correctly bootstrap python stuff with system python (deb#501028, i#90701)
Patch3: system-pyuno.diff Patch3: system-pyuno.diff
# do not use the broken help; unopkg complained about it when registering extensions # 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 # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch4: nlpsolver-no-broken-help.diff Patch4: nlpsolver-no-broken-help.diff
Patch5: mediawiki-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff
# PATCH-FIX-UPSTREAM: patch to build with older poppler, will be in 5.0
Patch6: 0001-Make-cpp-poppler-version.h-header-optional.patch
# PATCH-FIX-SUSE: do not declare java6 available for without system libs build # PATCH-FIX-SUSE: do not declare java6 available for without system libs build
Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch
# PATCH-FIX-UPSTREAM: build with old sle11 cairo
Patch8: old-cairo.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
@ -248,6 +248,8 @@ Provides: %{name}-l10n-prebuild = %{version}
Obsoletes: %{name}-l10n-prebuild < %{version} Obsoletes: %{name}-l10n-prebuild < %{version}
Provides: %{name}-ure = %{version} Provides: %{name}-ure = %{version}
Obsoletes: %{name}-ure < %{version} Obsoletes: %{name}-ure < %{version}
Provides: %{name}-icon-theme-crystal = %{version}
Obsoletes: %{name}-icon-theme-crystal < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %arm %ix86 x86_64 ppc ppc64 ExclusiveArch: %arm %ix86 x86_64 ppc ppc64
%if %{with systemlibs} %if %{with systemlibs}
@ -271,7 +273,7 @@ BuildRequires: libbase
BuildRequires: libcdr-devel >= 0.1 BuildRequires: libcdr-devel >= 0.1
BuildRequires: libcmis-devel >= 0.5.0 BuildRequires: libcmis-devel >= 0.5.0
BuildRequires: libe-book-devel >= 0.1.1 BuildRequires: libe-book-devel >= 0.1.1
BuildRequires: libetonyek-devel >= 0.1.1 BuildRequires: libetonyek-devel >= 0.1.2
BuildRequires: libexif BuildRequires: libexif
BuildRequires: libexttextcat-devel >= 3.1.1 BuildRequires: libexttextcat-devel >= 3.1.1
BuildRequires: libfbembed-devel BuildRequires: libfbembed-devel
@ -284,10 +286,10 @@ BuildRequires: liblayout
BuildRequires: liblcms2-devel BuildRequires: liblcms2-devel
BuildRequires: libloader BuildRequires: libloader
BuildRequires: libmspub-devel >= 0.1 BuildRequires: libmspub-devel >= 0.1
BuildRequires: libmwaw-devel >= 0.3.4 BuildRequires: libmwaw-devel >= 0.3.5
BuildRequires: libmysqlclient-devel BuildRequires: libmysqlclient-devel
BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: libmysqlcppconn-devel >= 1.0.6
BuildRequires: libodfgen-devel >= 0.1 BuildRequires: libodfgen-devel >= 0.1.4
BuildRequires: liborcus-devel >= 0.7.0 BuildRequires: liborcus-devel >= 0.7.0
BuildRequires: libpagemaker-devel BuildRequires: libpagemaker-devel
BuildRequires: libredland-devel BuildRequires: libredland-devel
@ -298,11 +300,11 @@ BuildRequires: libserializer
BuildRequires: libvisio-devel >= 0.1 BuildRequires: libvisio-devel >= 0.1
BuildRequires: libwpd-devel >= 0.10 BuildRequires: libwpd-devel >= 0.10
BuildRequires: libwpg-devel BuildRequires: libwpg-devel
BuildRequires: libwps-devel BuildRequires: libwps-devel >= 0.4.0
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
BuildRequires: lpsolve-devel BuildRequires: lpsolve-devel
BuildRequires: mdds-devel >= 0.11.2 BuildRequires: mdds-devel >= 0.12.0
BuildRequires: npapi-sdk BuildRequires: npapi-sdk
BuildRequires: pentaho-libxml BuildRequires: pentaho-libxml
BuildRequires: pentaho-reporting-flow-engine BuildRequires: pentaho-reporting-flow-engine
@ -379,20 +381,22 @@ BuildArch: noarch
%description branding-upstream %description branding-upstream
This package includes the original branding for the LibreOffice office suite. This package includes the original branding for the LibreOffice office suite.
%package icon-theme-crystal %package icon-theme-breeze
Summary: Crystal LibreOffice Icon Theme (KDE3 default) Summary: Breeze LibreOffice Icon Theme (KDE Frameworks default)
License: LGPL-2.1 License: LGPL-2.1
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Requires(post): %{name}-share-linker Requires(post): %{name}-share-linker
Requires(postun): %{name}-share-linker Requires(postun): %{name}-share-linker
Supplements: packageand(libreoffice:plasma5-workspace)
Provides: libreoffice-icon-themes = %{version} Provides: libreoffice-icon-themes = %{version}
Obsoletes: libreoffice-icon-themes < %{version} Obsoletes: libreoffice-icon-themes < %{version}
%if %{with noarch_subpkgs} %if %{with noarch_subpkgs}
BuildArch: noarch BuildArch: noarch
%endif %endif
%description icon-theme-crystal %description icon-theme-breeze
This package provides Crystal LibreOffice icon theme. It is used in KDE3 by default. This package provides Breeze LibreOffice icon theme. It is used in KDE
Frameworks by default.
%package icon-theme-galaxy %package icon-theme-galaxy
Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default) Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default)
@ -684,6 +688,9 @@ Summary: MySQL Database Driver for LibreOffice
License: GPL-2.0 and LGPL-3.0 License: GPL-2.0 and LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Requires: libreoffice-base = %{version} Requires: libreoffice-base = %{version}
# This mysql thing is just dlopened
# WARNING: the soname might change!
Requires: libmysqlclient_r18
Requires(pre): libreoffice = %{version} Requires(pre): libreoffice = %{version}
Supplements: packageand(libreoffice-base:mysql-client) Supplements: packageand(libreoffice-base:mysql-client)
@ -756,7 +763,7 @@ if [ -f %{_datadir}/libreoffice/%{1}_list.txt ] ; then \
fi \ fi \
\ \
%postun %{1} \ %postun %{1} \
if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt -a -f %{_bindir}/libreoffice-share-linker ]; then \ if [ "$1" = "0" -a -f %{_datadir}/libreoffice/%{1}_list.txt -a -x %{_bindir}/libreoffice-share-linker ]; then \
%{_bindir}/libreoffice-share-linker --unlink %{_datadir}/libreoffice/%{1}_list.txt || true \ %{_bindir}/libreoffice-share-linker --unlink %{_datadir}/libreoffice/%{1}_list.txt || true \
rm -f %{_datadir}/libreoffice/%{1}_list.txt 2> /dev/null || true \ rm -f %{_datadir}/libreoffice/%{1}_list.txt 2> /dev/null || true \
fi \ fi \
@ -960,14 +967,13 @@ Provides additional %{langname} translations and resources for %{project}. \
%prep %prep
%setup -q -b1 -b2 %setup -q -b1 -b2
%patch1 %patch1
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 %patch4
%patch5 %patch5
%patch6 -p1
%if !%{with systemlibs} %if !%{with systemlibs}
%patch7 -p1 %patch7 -p1
%endif %endif
%patch8 -p1
%patch990 -p1 %patch990 -p1
# 256x256 icons # 256x256 icons
tar -xjf %{SOURCE20} tar -xjf %{SOURCE20}
@ -1278,13 +1284,6 @@ for file in $files; do
echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt
done done
# Symlink uno.py and unohelper.py so that python can find them
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
echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt
echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt
# Install appdata files, so we're shown in gnome-software (and other, future app stores) # Install appdata files, so we're shown in gnome-software (and other, future app stores)
# upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...] # upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...]
# fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name # fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name
@ -1306,13 +1305,57 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
# Remove RPATH on some 3rd party bundled libs # Remove RPATH on some 3rd party bundled libs
%if !%{with systemlibs} %if !%{with systemlibs}
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwpd-0.10.so.10
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwpg-0.3.so.3
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libetonyek-0.1.so.1
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libmwaw-0.3.so.3 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libmwaw-0.3.so.3
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwps-0.3.so.3 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwps-0.4.so.4
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1.so.1 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1.so.1
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librdf-lo.so.0 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librdf-lo.so.0
chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3
%endif %endif
# Generate python cache files
%if 0%{?suse_version} > 1130
%py3_compile %{buildroot}/%{_libdir}/libreoffice/program/
%py3_compile %{buildroot}/%{_libdir}/libreoffice/share/extensions/
%py3_compile %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/
%py3_compile %{buildroot}/%{_libdir}/libreoffice/sdk/examples/python/
%else
%py_compile %{buildroot}/%{_libdir}/libreoffice/program/
%py_compile %{buildroot}/%{_libdir}/libreoffice/share/extensions/
%py_compile %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/
%py_compile %{buildroot}/%{_libdir}/libreoffice/sdk/examples/python/
%endif
# Move python cache to respective filelist
for i in file-lists/*.txt; do
if [ `cat "${i}" | grep '\.py$' |wc -l` -gt 0 ]; then
cat "${i}" | grep '\.py$' > pyfiles.txt
for j in `cat pyfiles.txt`; do
# python3 has __pycache__ dir while py2 does not
%if %{with newmedia}
pydir="${j%/*}"
pyname="${j##*/}"
echo "%dir ${pydir}/__pycache__/" >> "${i}"
echo "${pydir}/__pycache__/${pyname%.*}*.pyc" >> "${i}"
%else
# just add c to state pyc
echo "${j}c" >> "${i}"
%endif
done
fi
done
rm pyfiles.txt
# Symlink uno.py and unohelper.py so that python can find them
# This is done after the cache files generating on purpose
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
echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt
echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt
# We have ton of duped files so run over it # We have ton of duped files so run over it
%fdupes %{buildroot}%{_prefix} %fdupes %{buildroot}%{_prefix}
@ -1445,7 +1488,7 @@ test -f /usr/bin/update-desktop-database && /usr/bin/update-desktop-database > /
test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || : test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null || :
%endif %endif
%_link_noarch_files icon-theme-crystal %_link_noarch_files icon-theme-breeze
%_link_noarch_files icon-theme-galaxy %_link_noarch_files icon-theme-galaxy
%_link_noarch_files icon-theme-hicontrast %_link_noarch_files icon-theme-hicontrast
%_link_noarch_files icon-theme-oxygen %_link_noarch_files icon-theme-oxygen
@ -1524,12 +1567,12 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null |
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/%{name}/share/extensions/wiki-publisher %{_libdir}/%{name}/share/extensions/wiki-publisher
%files icon-theme-crystal %files icon-theme-breeze
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config %dir %{_datadir}/%{name}/share/config
%{_datadir}/%{name}/share/config/images_crystal.zip %{_datadir}/%{name}/share/config/images_breeze.zip
%files icon-theme-galaxy %files icon-theme-galaxy
%defattr(-,root,root) %defattr(-,root,root)

3
libwps-0.3.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ceb6b1aac4646c641709a00a1bdceb296b30fe8b5e52446f104892e9cc338d4f
size 496436

3
libwps-0.4.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b60d574aefe6a2e446500edb8802f9bc7885fa261e2e47ee3042432a02bb2d35
size 564733

3
mdds_0.12.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d
size 153265

22
old-cairo.patch Normal file
View File

@ -0,0 +1,22 @@
Index: libreoffice-5.0.0.3/vcl/headless/svpgdi.cxx
===================================================================
--- libreoffice-5.0.0.3.orig/vcl/headless/svpgdi.cxx
+++ libreoffice-5.0.0.3/vcl/headless/svpgdi.cxx
@@ -108,7 +108,7 @@ namespace
if (rBuffer->getScanlineFormat() != basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX)
return false;
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
basegfx::B2IVector size = rBuffer->getSize();
sal_Int32 nStride = rBuffer->getScanlineStride();
return (cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, size.getX()) == nStride);
@@ -142,7 +142,7 @@ bool SvpSalGraphics::drawAlphaRect(long
bool bRet = false;
(void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
#if ENABLE_CAIRO_CANVAS
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
if (m_bUseLineColor || !m_bUseFillColor)
return bRet;

14
pack-desktop-files-for-optional-filters.diff
View File

@ -1,14 +0,0 @@
diff -urN libreoffice-4.0.0.0.beta1.old/bin/distro-install-desktop-integration libreoffice-4.0.0.0.beta1/bin/distro-install-desktop-integration
--- libreoffice-4.0.0.0.beta1.old/bin/distro-install-desktop-integration 2012-12-17 12:47:12.343137682 +0100
+++ libreoffice-4.0.0.0.beta1/bin/distro-install-desktop-integration 2012-12-17 12:53:56.520100212 +0100
@@ -168,6 +168,10 @@
# there are two more desktop files for optional filters
test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo "$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples"
+# there are two more desktop files for optional filters
+test -f $DESTDIR/gid_Module_Optional_Binfilter && echo "$PREFIXDIR/share/applications/libreoffice-binfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Binfilter"
+test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo "$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop" >>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples"
+
# $PREFIXDIR/bin/ooffice symlink is necessary by java UNO components to find
# the UNO installation using $PATH, see
# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html