From f351e22c4f0bddb005372ec7ac978c9b0d8858ebea81aefb4e1b038416658b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 3 Jun 2015 12:09:23 +0000 Subject: [PATCH 01/22] - Generate python cache files wrt bnc#929793 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=283 --- libreoffice.changes | 5 +++++ libreoffice.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 650afcf..ffafa38 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 801002a..69dd8ed 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -756,7 +756,7 @@ if [ -f %{_datadir}/libreoffice/%{1}_list.txt ] ; then \ fi \ \ %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 \ rm -f %{_datadir}/libreoffice/%{1}_list.txt 2> /dev/null || true \ fi \ @@ -1313,6 +1313,10 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librdf-lo.so.0 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 %endif +# Generate python cache files +%{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/program/ +%{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/extensions/ + # We have ton of duped files so run over it %fdupes %{buildroot}%{_prefix} From dd35a886f8ead10a8419f3c74928b62a9b7d3608fdc8710e7d82ac2dc2bd6965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 4 Jun 2015 10:51:03 +0000 Subject: [PATCH 02/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=284 --- libreoffice.spec | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index 69dd8ed..a9e883f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1316,6 +1316,28 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 # Generate python cache files %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/program/ %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/extensions/ +# pyuno links to pysitedir +%{python_type} -m compileall %{buildroot}/%{python3_sitelib} + +# 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 # We have ton of duped files so run over it %fdupes %{buildroot}%{_prefix} From 60dcfb24a41bd0fa1416f3cf05c68d785c85e13482d6f3ec493f3b0e1a56405d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 9 Jun 2015 14:40:27 +0000 Subject: [PATCH 03/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=285 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index a9e883f..1ed6bcb 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1321,8 +1321,8 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 # 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 + 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} From 885bff26c0497a611cc1f36d098f4cbc5f56446b12d92b50a81bce0c340a15dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 10 Jun 2015 14:31:48 +0000 Subject: [PATCH 04/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=286 --- libreoffice.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 1ed6bcb..3979edc 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1316,8 +1316,11 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 # Generate python cache files %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/program/ %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/extensions/ +%{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/ # pyuno links to pysitedir -%{python_type} -m compileall %{buildroot}/%{python3_sitelib} +pushd %{buildroot}/%{python3_sitelib} +%{python_type} -m compileall . +popd # Move python cache to respective filelist for i in file-lists/*.txt; do From dc75791f4586f14e1d9fd08961be02bbaac1acffce3bfadd75c7c91452bd1527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 11 Jun 2015 08:43:41 +0000 Subject: [PATCH 05/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=287 --- libreoffice.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 3979edc..c96af51 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1278,13 +1278,6 @@ for file in $files; do echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt 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) # 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 @@ -1317,10 +1310,6 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/program/ %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/extensions/ %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/ -# pyuno links to pysitedir -pushd %{buildroot}/%{python3_sitelib} -%{python_type} -m compileall . -popd # Move python cache to respective filelist for i in file-lists/*.txt; do @@ -1342,6 +1331,14 @@ for i in file-lists/*.txt; do 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 %fdupes %{buildroot}%{_prefix} From 6330122b3b8f710c1777e28a3ddfd22b5ac5770f43632f6bba186ba847afbd98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 11 Jun 2015 15:26:16 +0000 Subject: [PATCH 06/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=288 --- libreoffice.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libreoffice.spec b/libreoffice.spec index c96af51..56dde3b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1310,6 +1310,7 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/program/ %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/extensions/ %{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/ +%{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/sdk/examples/python/ # Move python cache to respective filelist for i in file-lists/*.txt; do From 7594182ba709aec6cbe076b8644101bba531ecab5341772303f7d13fef407f33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 12 Jun 2015 18:17:44 +0000 Subject: [PATCH 07/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=289 --- libreoffice.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 56dde3b..889cc34 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1307,10 +1307,17 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 %endif # Generate python cache files -%{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/program/ -%{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/extensions/ -%{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/share/Scripts/python/ -%{python_type} -m compileall %{buildroot}/%{_libdir}/libreoffice/sdk/examples/python/ +%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 From 4f835706b452f2f6d2eb959dc02ebf0cdb3a23b2848eb3643bb79a328e5da654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 13 Jun 2015 13:25:44 +0000 Subject: [PATCH 08/22] - 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 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=290 --- ...pp-poppler-version.h-header-optional.patch | 102 ------------------ ...054e4205cd956910672b83-mdds_0.12.0.tar.bz2 | 3 + ...dfef197608d1f69300919b9-icu4c-53_1-src.tgz | 3 - ...3c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 | 3 - ...f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz | 3 + ...84aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz | 3 - ...4d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip | 3 + harfbuzz-0.9.23.tar.bz2 | 3 - harfbuzz-0.9.40.tar.bz2 | 3 + libetonyek-0.1.1.tar.bz2 | 3 - libetonyek-0.1.2.tar.bz2 | 3 + libmwaw-0.3.4.tar.bz2 | 3 - libmwaw-0.3.5.tar.bz2 | 3 + libodfgen-0.1.3.tar.bz2 | 3 - libodfgen-0.1.4.tar.bz2 | 3 + libreoffice-4.4.3.2.tar.xz | 3 - libreoffice-5.0.0.0.beta3.tar.xz | 3 + libreoffice-help-4.4.3.2.tar.xz | 3 - libreoffice-help-5.0.0.0.beta3.tar.xz | 3 + libreoffice-translations-4.4.3.2.tar.xz | 3 - libreoffice-translations-5.0.0.0.beta3.tar.xz | 3 + libreoffice.changes | 8 ++ libreoffice.spec | 37 +++---- libwps-0.3.1.tar.bz2 | 3 - libwps-0.4.0.tar.bz2 | 3 + 25 files changed, 58 insertions(+), 155 deletions(-) delete mode 100644 0001-Make-cpp-poppler-version.h-header-optional.patch create mode 100644 17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 delete mode 100644 b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz delete mode 100644 cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 create mode 100644 e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz delete mode 100644 ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz create mode 100644 ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip delete mode 100644 harfbuzz-0.9.23.tar.bz2 create mode 100644 harfbuzz-0.9.40.tar.bz2 delete mode 100644 libetonyek-0.1.1.tar.bz2 create mode 100644 libetonyek-0.1.2.tar.bz2 delete mode 100644 libmwaw-0.3.4.tar.bz2 create mode 100644 libmwaw-0.3.5.tar.bz2 delete mode 100644 libodfgen-0.1.3.tar.bz2 create mode 100644 libodfgen-0.1.4.tar.bz2 delete mode 100644 libreoffice-4.4.3.2.tar.xz create mode 100644 libreoffice-5.0.0.0.beta3.tar.xz delete mode 100644 libreoffice-help-4.4.3.2.tar.xz create mode 100644 libreoffice-help-5.0.0.0.beta3.tar.xz delete mode 100644 libreoffice-translations-4.4.3.2.tar.xz create mode 100644 libreoffice-translations-5.0.0.0.beta3.tar.xz delete mode 100644 libwps-0.3.1.tar.bz2 create mode 100644 libwps-0.4.0.tar.bz2 diff --git a/0001-Make-cpp-poppler-version.h-header-optional.patch b/0001-Make-cpp-poppler-version.h-header-optional.patch deleted file mode 100644 index 3531bdf..0000000 --- a/0001-Make-cpp-poppler-version.h-header-optional.patch +++ /dev/null @@ -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?= -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 -+#include - - #if defined __GNUC__ - # pragma GCC diagnostic push -@@ -50,7 +51,14 @@ - class GfxPath; - class GfxFont; - class PDFDoc; -+#if HAVE_POPPLER_VERSION_H - #include -+#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 - diff --git a/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 b/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 new file mode 100644 index 0000000..9bb6ece --- /dev/null +++ b/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a22de23ca828886625120e9d40fccd6333458a1934a13d2c982b6f9403e5981 +size 152285 diff --git a/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz b/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz deleted file mode 100644 index ea7eda1..0000000 --- a/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28 -size 23218952 diff --git a/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 b/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 deleted file mode 100644 index 6e843ad..0000000 --- a/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab -size 154444 diff --git a/e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz b/e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz new file mode 100644 index 0000000..116a7cc --- /dev/null +++ b/e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 +size 25485678 diff --git a/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz b/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz deleted file mode 100644 index 3d41a21..0000000 --- a/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:648f10fb764d000d6a68b2d4e008117900e853c197a024d1f91dbba9b91012ca -size 726942 diff --git a/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip b/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip new file mode 100644 index 0000000..e0edf43 --- /dev/null +++ b/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513 +size 1982036 diff --git a/harfbuzz-0.9.23.tar.bz2 b/harfbuzz-0.9.23.tar.bz2 deleted file mode 100644 index bdd1935..0000000 --- a/harfbuzz-0.9.23.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7 -size 1027508 diff --git a/harfbuzz-0.9.40.tar.bz2 b/harfbuzz-0.9.40.tar.bz2 new file mode 100644 index 0000000..f99fb1c --- /dev/null +++ b/harfbuzz-0.9.40.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f +size 1182989 diff --git a/libetonyek-0.1.1.tar.bz2 b/libetonyek-0.1.1.tar.bz2 deleted file mode 100644 index 90a1a05..0000000 --- a/libetonyek-0.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:716edf726ba3896fe85eea9a75786948d5ddeda63a54c00f3308658cc3bbd9e4 -size 423556 diff --git a/libetonyek-0.1.2.tar.bz2 b/libetonyek-0.1.2.tar.bz2 new file mode 100644 index 0000000..d07b093 --- /dev/null +++ b/libetonyek-0.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3f9342a34514a02c8a8c6d2a7957ee29cdb94ee69c67fe37b214fba50f49abf +size 430157 diff --git a/libmwaw-0.3.4.tar.bz2 b/libmwaw-0.3.4.tar.bz2 deleted file mode 100644 index c54ef32..0000000 --- a/libmwaw-0.3.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:444e15e3e60e9fcc7d859b201571d9612a5347cefd6e753ce4710f638514da67 -size 1170238 diff --git a/libmwaw-0.3.5.tar.bz2 b/libmwaw-0.3.5.tar.bz2 new file mode 100644 index 0000000..4a0df4f --- /dev/null +++ b/libmwaw-0.3.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe71b7f120aca311a977569f51ffb258e824616db6afbb29ea0072398fc4c9b4 +size 1304580 diff --git a/libodfgen-0.1.3.tar.bz2 b/libodfgen-0.1.3.tar.bz2 deleted file mode 100644 index 8755395..0000000 --- a/libodfgen-0.1.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66d1f350fb9c0e8c9eec1b8c644d8531b8d6777ae7b8507f8abc4783b6d2981c -size 406636 diff --git a/libodfgen-0.1.4.tar.bz2 b/libodfgen-0.1.4.tar.bz2 new file mode 100644 index 0000000..ee51890 --- /dev/null +++ b/libodfgen-0.1.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f74999d2c93ac0cc077a0a9c36340daff29dc772992160ae81dd010345f72b80 +size 435590 diff --git a/libreoffice-4.4.3.2.tar.xz b/libreoffice-4.4.3.2.tar.xz deleted file mode 100644 index c4e8a71..0000000 --- a/libreoffice-4.4.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad6154c157e07adee2271cfc722a116065a2e7261ee7d93fc796f76703e88966 -size 164320100 diff --git a/libreoffice-5.0.0.0.beta3.tar.xz b/libreoffice-5.0.0.0.beta3.tar.xz new file mode 100644 index 0000000..9b487a6 --- /dev/null +++ b/libreoffice-5.0.0.0.beta3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33023369a892e369023727b233505eaf076549fb71d394e78ed26fdf9a94a4a7 +size 164938212 diff --git a/libreoffice-help-4.4.3.2.tar.xz b/libreoffice-help-4.4.3.2.tar.xz deleted file mode 100644 index 074fa9d..0000000 --- a/libreoffice-help-4.4.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e10d43de0478d2aa939131e46cb8f7144e0302ee61e06a60732da9b9a03e3526 -size 1875884 diff --git a/libreoffice-help-5.0.0.0.beta3.tar.xz b/libreoffice-help-5.0.0.0.beta3.tar.xz new file mode 100644 index 0000000..9e0539e --- /dev/null +++ b/libreoffice-help-5.0.0.0.beta3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7df61c17e7267694b1267b4d76d0e5fb07f45240fd9be6d2adcab91abbd585b2 +size 1882532 diff --git a/libreoffice-translations-4.4.3.2.tar.xz b/libreoffice-translations-4.4.3.2.tar.xz deleted file mode 100644 index 7cb3557..0000000 --- a/libreoffice-translations-4.4.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:393e1fc8c91f1addc5a90795b23c2ee03ba6f3ad0f21664067859dcbf8b28e9f -size 127857520 diff --git a/libreoffice-translations-5.0.0.0.beta3.tar.xz b/libreoffice-translations-5.0.0.0.beta3.tar.xz new file mode 100644 index 0000000..d792a2e --- /dev/null +++ b/libreoffice-translations-5.0.0.0.beta3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e518873140290a61a9175dd6a1860bd11402986d44a9b569d13fe3fc5b62b797 +size 127767644 diff --git a/libreoffice.changes b/libreoffice.changes index ffafa38..815ae02 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 889cc34..9ed807d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -23,7 +23,7 @@ %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/4.4.3 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.0.0 # Old Make and bundle or not %if 0%{?suse_version} > 1230 %bcond_with oldmake @@ -63,7 +63,7 @@ %endif # This is used due to the need for beta releases Name: libreoffice -Version: 4.4.3.2 +Version: 5.0.0.0.beta3 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 @@ -98,36 +98,36 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi Source2006: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz Source2007: %{external_url}/librevenge-0.0.2.tar.bz2 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.2.tar.bz2 Source2010: %{external_url}/libe-book-0.1.2.tar.bz2 Source2011: %{external_url}/libfreehand-0.1.0.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 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 Source2017: %{external_url}/libvisio-0.1.1.tar.bz2 Source2018: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz Source2019: %{external_url}/libwpd-0.10.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 Source2023: %{external_url}/lcms2-2.6.tar.gz Source2024: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -Source2025: %{external_url}/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 +Source2025: %{external_url}/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 Source2026: %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz Source2027: %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz Source2028: %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 Source2029: %{external_url}/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.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 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 Source2036: %{external_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 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 Source2040: %{external_url}/Firebird-2.5.2.26540-0.tar.bz2 Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz @@ -160,14 +160,12 @@ Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2 Patch1: scp2-user-config-suse.diff # pack new desktop files Patch2: pack-desktop-files-for-optional-filters.diff -# correctly bootstrap python stuff with system python (deb#501028, i#90701) +# 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 -# 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 Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch # try to save space by using hardlinks @@ -271,7 +269,7 @@ BuildRequires: libbase BuildRequires: libcdr-devel >= 0.1 BuildRequires: libcmis-devel >= 0.5.0 BuildRequires: libe-book-devel >= 0.1.1 -BuildRequires: libetonyek-devel >= 0.1.1 +BuildRequires: libetonyek-devel >= 0.1.2 BuildRequires: libexif BuildRequires: libexttextcat-devel >= 3.1.1 BuildRequires: libfbembed-devel @@ -284,10 +282,10 @@ BuildRequires: liblayout BuildRequires: liblcms2-devel BuildRequires: libloader BuildRequires: libmspub-devel >= 0.1 -BuildRequires: libmwaw-devel >= 0.3.4 +BuildRequires: libmwaw-devel >= 0.3.5 BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel >= 1.0.6 -BuildRequires: libodfgen-devel >= 0.1 +BuildRequires: libodfgen-devel >= 0.1.4 BuildRequires: liborcus-devel >= 0.7.0 BuildRequires: libpagemaker-devel BuildRequires: libredland-devel @@ -298,11 +296,11 @@ BuildRequires: libserializer BuildRequires: libvisio-devel >= 0.1 BuildRequires: libwpd-devel >= 0.10 BuildRequires: libwpg-devel -BuildRequires: libwps-devel +BuildRequires: libwps-devel >= 0.4.0 BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: lpsolve-devel -BuildRequires: mdds-devel >= 0.11.2 +BuildRequires: mdds-devel >= 0.12.0 BuildRequires: npapi-sdk BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine @@ -964,7 +962,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch3 -p1 %patch4 %patch5 -%patch6 -p1 %if !%{with systemlibs} %patch7 -p1 %endif @@ -1300,7 +1297,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ # Remove RPATH on some 3rd party bundled libs %if !%{with systemlibs} 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/librdf-lo.so.0 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 diff --git a/libwps-0.3.1.tar.bz2 b/libwps-0.3.1.tar.bz2 deleted file mode 100644 index 4c82096..0000000 --- a/libwps-0.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ceb6b1aac4646c641709a00a1bdceb296b30fe8b5e52446f104892e9cc338d4f -size 496436 diff --git a/libwps-0.4.0.tar.bz2 b/libwps-0.4.0.tar.bz2 new file mode 100644 index 0000000..cbc4bf8 --- /dev/null +++ b/libwps-0.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b60d574aefe6a2e446500edb8802f9bc7885fa261e2e47ee3042432a02bb2d35 +size 564733 From 071b897e7cfda5d99dd6eacc8a9f82bb5f9294250361ae203e46109fa318388a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 Jun 2015 06:55:43 +0000 Subject: [PATCH 09/22] - Fix breeze icons handling, drop crystal icons. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=291 --- libreoffice.changes | 5 +++++ libreoffice.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 815ae02..efab3da 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 9ed807d..07fd2e2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -377,20 +377,22 @@ BuildArch: noarch %description branding-upstream This package includes the original branding for the LibreOffice office suite. -%package icon-theme-crystal -Summary: Crystal LibreOffice Icon Theme (KDE3 default) +%package icon-theme-breeze +Summary: Breeze LibreOffice Icon Theme (KDE Frameworks default) License: LGPL-2.1 Group: Productivity/Office/Suite Requires(post): %{name}-share-linker Requires(postun): %{name}-share-linker +Supplements: packageand(libreoffice:plasma5-workspace) Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} %if %{with noarch_subpkgs} BuildArch: noarch %endif -%description icon-theme-crystal -This package provides Crystal LibreOffice icon theme. It is used in KDE3 by default. +%description icon-theme-breeze +This package provides Breeze LibreOffice icon theme. It is used in KDE +Frameworks by default. %package icon-theme-galaxy Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default) @@ -1555,12 +1557,12 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %defattr(-,root,root) %{_libdir}/%{name}/share/extensions/wiki-publisher -%files icon-theme-crystal +%files icon-theme-breeze %defattr(-,root,root) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config -%{_datadir}/%{name}/share/config/images_crystal.zip +%{_datadir}/%{name}/share/config/images_breeze.zip %files icon-theme-galaxy %defattr(-,root,root) From 4df94ea244450de5226d593e75fc5dfa7b0b3e406f62d398582556c01ffddf58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 17 Jun 2015 10:59:09 +0000 Subject: [PATCH 10/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=292 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 07fd2e2..e856c5f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1478,7 +1478,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 || : %endif -%_link_noarch_files icon-theme-crystal +%_link_noarch_files icon-theme-breeze %_link_noarch_files icon-theme-galaxy %_link_noarch_files icon-theme-hicontrast %_link_noarch_files icon-theme-oxygen From 2e33986a905a8534bf60e1b5827d9669746988a581711ff99cefd1c7211a96fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 Jun 2015 09:41:48 +0000 Subject: [PATCH 11/22] - 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 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=293 --- ...nvert-.-const-char-to-const-rtl-OUSt.patch | 65 ++++++++++ 0001-writerperfect-fix-gcc-4.7-build.patch | 118 ++++++++++++++++++ fix-old-poppler.patch | 14 +++ libreoffice.changes | 10 ++ libreoffice.spec | 10 ++ 5 files changed, 217 insertions(+) create mode 100644 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch create mode 100644 0001-writerperfect-fix-gcc-4.7-build.patch create mode 100644 fix-old-poppler.patch diff --git a/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch b/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch new file mode 100644 index 0000000..cafc0e5 --- /dev/null +++ b/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch @@ -0,0 +1,65 @@ +From a44b770b59d322083cac6ac22cef20ce17a89e6d Mon Sep 17 00:00:00 2001 +From: Tor Lillqvist +Date: Fri, 5 Jun 2015 16:45:45 +0300 +Subject: [PATCH] =?UTF-8?q?Fix:=20could=20not=20convert=20[...]=20?= + =?UTF-8?q?=E2=80=98const=20char*=E2=80=99=20to=20=E2=80=98const=20rtl::OU?= + =?UTF-8?q?String=E2=80=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: Ib94c9f5eed0da67e846705f5c2c233c10583c791 +--- + svx/source/form/fmdmod.cxx | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx +index 447ad5a..bb63fed 100644 +--- a/svx/source/form/fmdmod.cxx ++++ b/svx/source/form/fmdmod.cxx +@@ -65,25 +65,25 @@ SAL_WNOUNREACHABLE_CODE_POP + { + static const OUString aSvxComponentServiceNameList[] = + { +- FM_SUN_COMPONENT_TEXTFIELD, +- FM_SUN_COMPONENT_FORM, +- FM_SUN_COMPONENT_LISTBOX, +- FM_SUN_COMPONENT_COMBOBOX, +- FM_SUN_COMPONENT_RADIOBUTTON, +- FM_SUN_COMPONENT_GROUPBOX, +- FM_SUN_COMPONENT_FIXEDTEXT, +- FM_SUN_COMPONENT_COMMANDBUTTON, ++ OUString(FM_SUN_COMPONENT_TEXTFIELD), ++ OUString(FM_SUN_COMPONENT_FORM), ++ OUString(FM_SUN_COMPONENT_LISTBOX), ++ OUString(FM_SUN_COMPONENT_COMBOBOX), ++ OUString(FM_SUN_COMPONENT_RADIOBUTTON), ++ OUString(FM_SUN_COMPONENT_GROUPBOX), ++ OUString(FM_SUN_COMPONENT_FIXEDTEXT), ++ OUString(FM_SUN_COMPONENT_COMMANDBUTTON), + OUString(FM_SUN_COMPONENT_CHECKBOX), +- FM_SUN_COMPONENT_GRIDCONTROL, +- FM_SUN_COMPONENT_IMAGEBUTTON, +- FM_SUN_COMPONENT_FILECONTROL, +- FM_SUN_COMPONENT_TIMEFIELD, +- FM_SUN_COMPONENT_DATEFIELD, ++ OUString(FM_SUN_COMPONENT_GRIDCONTROL), ++ OUString(FM_SUN_COMPONENT_IMAGEBUTTON), ++ OUString(FM_SUN_COMPONENT_FILECONTROL), ++ OUString(FM_SUN_COMPONENT_TIMEFIELD), ++ OUString(FM_SUN_COMPONENT_DATEFIELD), + OUString(FM_SUN_COMPONENT_NUMERICFIELD), +- FM_SUN_COMPONENT_CURRENCYFIELD, +- FM_SUN_COMPONENT_PATTERNFIELD, +- FM_SUN_COMPONENT_HIDDENCONTROL, +- FM_SUN_COMPONENT_IMAGECONTROL ++ OUString(FM_SUN_COMPONENT_CURRENCYFIELD), ++ OUString(FM_SUN_COMPONENT_PATTERNFIELD), ++ OUString(FM_SUN_COMPONENT_HIDDENCONTROL), ++ OUString(FM_SUN_COMPONENT_IMAGECONTROL) + }; + + static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] ); +-- +2.4.3 + diff --git a/0001-writerperfect-fix-gcc-4.7-build.patch b/0001-writerperfect-fix-gcc-4.7-build.patch new file mode 100644 index 0000000..bb1d7da --- /dev/null +++ b/0001-writerperfect-fix-gcc-4.7-build.patch @@ -0,0 +1,118 @@ +From 72833e22fcb2914fc422ff84d8e853d3e99c6c44 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Wed, 10 Jun 2015 09:12:12 +0200 +Subject: [PATCH] writerperfect: fix gcc-4.7 build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + error: could not convert '(const char*)"..."' from 'const char*' to 'const rtl::OUString' + +Change-Id: Ia8569aed46e571bd98489fd91b9708d0fe5df4c0 +Signed-off-by: Tomáš Chvátal +--- + writerperfect/source/common/WPFTEncodingDialog.cxx | 88 +++++++++++----------- + 1 file changed, 44 insertions(+), 44 deletions(-) + +diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx +index de521c6..dec775b 100644 +--- a/writerperfect/source/common/WPFTEncodingDialog.cxx ++++ b/writerperfect/source/common/WPFTEncodingDialog.cxx +@@ -38,50 +38,50 @@ struct EncodingImplementation + + OUString const(EncodingImplementation::s_encodings[])= + { +- "MacArabic", "Arabic (Apple Macintosh)", +- "CP864", "Arabic (DOS/OS2-864)", +- "CP1006", "Arabic (IBM-1006)", +- "CP1256", "Arabic (Windows-1256)", +- "CP775", "Baltic (DOS/OS2-775)", +- "CP1257", "Baltic (Windows-1257)", +- "MacCeltic", "Celtic (Apple Macintosh)", +- "MacCyrillic", "Cyrillic (Apple Macintosh)", +- "CP855", "Cyrillic (DOS/OS2-855)", +- "CP866", "Cyrillic (DOS/OS2-866/Russian)", +- "CP1251", "Cyrillic (Windows-1251)", +- "MacCEurope", "Eastern Europe (Apple Macintosh)", +- "MacCroatian", "Eastern Europe (Apple Macintosh/Croatian)", +- "MacRomanian", "Eastern Europe (Apple Macintosh/Romanian)", +- "CP852", "Eastern Europe (DOS/OS2-852)", +- "CP1250", "Eastern Europe (Windows-1250/WinLatin 2)", +- "MacGreek", "Greek (Apple Macintosh)", +- "CP737", "Greek (DOS/OS2-737)", +- "CP869", "Greek (DOS/OS2-869/Greek-2)", +- "CP875", "Greek (DOS/OS2-875)", +- "CP1253", "Greek (Windows-1253)", +- "MacHebrew", "Hebrew (Apple Macintosh)", +- "CP424", "Hebrew (DOS/OS2-424)", +- "CP856", "Hebrew (DOS/OS2-856)", +- "CP862", "Hebrew (DOS/OS2-862)", +- "CP1255", "Hebrew (Windows-1255)", +- "CP500", "International (DOS/OS2-500)", +- "MacThai", "Thai (Apple Macintosh)", +- "CP874", "Thai (DOS/OS2-874)", +- "MacTurkish", "Turkish (Apple Macintosh)", +- "CP857", "Turkish (DOS/OS2-857)", +- "CP1026", "Turkish (DOS/OS2-1026)", +- "CP1254", "Turkish (Windows-1254)", +- "CP1258", "Vietnamese (Windows-1258)", +- "MacRoman", "Western Europe (Apple Macintosh)", +- "MacIceland", "Western Europe (Apple Macintosh/Icelandic)", +- "CP037", "Western Europe (DOS/OS2-037/US-Canada)", +- "CP437", "Western Europe (DOS/OS2-437/US)", +- "CP850", "Western Europe (DOS/OS2-850)", +- "CP860", "Western Europe (DOS/OS2-860/Portuguese)", +- "CP861", "Western Europe (DOS/OS2-861/Icelandic)", +- "CP863", "Western Europe (DOS/OS2-863/French)", +- "CP865", "Western Europe (DOS/OS2-865/Nordic)", +- "CP1252", "Western Europe (Windows-1252/WinLatin 1)" ++ OUString("MacArabic"), OUString("Arabic (Apple Macintosh)"), ++ OUString("CP864"), OUString("Arabic (DOS/OS2-864)"), ++ OUString("CP1006"), OUString("Arabic (IBM-1006)"), ++ OUString("CP1256"), OUString("Arabic (Windows-1256)"), ++ OUString("CP775"), OUString("Baltic (DOS/OS2-775)"), ++ OUString("CP1257"), OUString("Baltic (Windows-1257)"), ++ OUString("MacCeltic"), OUString("Celtic (Apple Macintosh)"), ++ OUString("MacCyrillic"), OUString("Cyrillic (Apple Macintosh)"), ++ OUString("CP855"), OUString("Cyrillic (DOS/OS2-855)"), ++ OUString("CP866"), OUString("Cyrillic (DOS/OS2-866/Russian)"), ++ OUString("CP1251"), OUString("Cyrillic (Windows-1251)"), ++ OUString("MacCEurope"), OUString("Eastern Europe (Apple Macintosh)"), ++ OUString("MacCroatian"), OUString("Eastern Europe (Apple Macintosh/Croatian)"), ++ OUString("MacRomanian"), OUString("Eastern Europe (Apple Macintosh/Romanian)"), ++ OUString("CP852"), OUString("Eastern Europe (DOS/OS2-852)"), ++ OUString("CP1250"), OUString("Eastern Europe (Windows-1250/WinLatin 2)"), ++ OUString("MacGreek"), OUString("Greek (Apple Macintosh)"), ++ OUString("CP737"), OUString("Greek (DOS/OS2-737)"), ++ OUString("CP869"), OUString("Greek (DOS/OS2-869/Greek-2)"), ++ OUString("CP875"), OUString("Greek (DOS/OS2-875)"), ++ OUString("CP1253"), OUString("Greek (Windows-1253)"), ++ OUString("MacHebrew"), OUString("Hebrew (Apple Macintosh)"), ++ OUString("CP424"), OUString("Hebrew (DOS/OS2-424)"), ++ OUString("CP856"), OUString("Hebrew (DOS/OS2-856)"), ++ OUString("CP862"), OUString("Hebrew (DOS/OS2-862)"), ++ OUString("CP1255"), OUString("Hebrew (Windows-1255)"), ++ OUString("CP500"), OUString("International (DOS/OS2-500)"), ++ OUString("MacThai"), OUString("Thai (Apple Macintosh)"), ++ OUString("CP874"), OUString("Thai (DOS/OS2-874)"), ++ OUString("MacTurkish"), OUString("Turkish (Apple Macintosh)"), ++ OUString("CP857"), OUString("Turkish (DOS/OS2-857)"), ++ OUString("CP1026"), OUString("Turkish (DOS/OS2-1026)"), ++ OUString("CP1254"), OUString("Turkish (Windows-1254)"), ++ OUString("CP1258"), OUString("Vietnamese (Windows-1258)"), ++ OUString("MacRoman"), OUString("Western Europe (Apple Macintosh)"), ++ OUString("MacIceland"), OUString("Western Europe (Apple Macintosh/Icelandic)"), ++ OUString("CP037"), OUString("Western Europe (DOS/OS2-037/US-Canada)"), ++ OUString("CP437"), OUString("Western Europe (DOS/OS2-437/US)"), ++ OUString("CP850"), OUString("Western Europe (DOS/OS2-850)"), ++ OUString("CP860"), OUString("Western Europe (DOS/OS2-860/Portuguese)"), ++ OUString("CP861"), OUString("Western Europe (DOS/OS2-861/Icelandic)"), ++ OUString("CP863"), OUString("Western Europe (DOS/OS2-863/French)"), ++ OUString("CP865"), OUString("Western Europe (DOS/OS2-865/Nordic)"), ++ OUString("CP1252"), OUString("Western Europe (Windows-1252/WinLatin 1)") + }; + + int EncodingImplementation::numEncodings() +-- +2.4.3 + diff --git a/fix-old-poppler.patch b/fix-old-poppler.patch new file mode 100644 index 0000000..b76e5ef --- /dev/null +++ b/fix-old-poppler.patch @@ -0,0 +1,14 @@ +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index cc64db4..d2602c1 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -114,7 +114,7 @@ namespace pdfi + + bool operator==(const FontAttributes& rFont) const + { +- return familyName.cmp( ++ return const_cast(&familyName)->cmp( + const_cast(&rFont.familyName))==0 && + isEmbedded == rFont.isEmbedded && + isBold == rFont.isBold && + diff --git a/libreoffice.changes b/libreoffice.changes index efab3da..852bf04 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index e856c5f..aa88b7b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -168,6 +168,11 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-SUSE: do not declare java6 available for without system libs build Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch +# PATCH-FIX-UPSTREAM: old poppler is broken without this +Patch8: fix-old-poppler.patch +# PATCH-FIX-UPSTREAM: old gcc compat +Patch9: 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch +Patch10: 0001-writerperfect-fix-gcc-4.7-build.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -246,6 +251,8 @@ Provides: %{name}-l10n-prebuild = %{version} Obsoletes: %{name}-l10n-prebuild < %{version} Provides: %{name}-ure = %{version} Obsoletes: %{name}-ure < %{version} +Provides: %{name}-icon-theme-breeze = %{version} +Obsoletes: %{name}-icon-theme-breeze < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %arm %ix86 x86_64 ppc ppc64 %if %{with systemlibs} @@ -967,6 +974,9 @@ Provides additional %{langname} translations and resources for %{project}. \ %if !%{with systemlibs} %patch7 -p1 %endif +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} From edd09aa364754bc8ab418aa9f2202e9abf487173e1fac05916a431bbd33ec3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 Jun 2015 10:33:33 +0000 Subject: [PATCH 12/22] - Add python-importlib to build/requirements on py2 distros OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=294 --- libreoffice.changes | 5 +++++ libreoffice.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 852bf04..7f5b955 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index aa88b7b..267ae8a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -60,6 +60,8 @@ %else %global python_type python %global python3_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +BuildRequires: python-importlib +Requires: python-importlib %endif # This is used due to the need for beta releases Name: libreoffice From 1894e6faa825206bfe5d6170fb429dfd12039e3d4c06d9dccb32e426745f52de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 22 Jun 2015 09:15:50 +0000 Subject: [PATCH 13/22] - More chrpat love for sle11 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=295 --- libreoffice.changes | 5 +++++ libreoffice.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 7f5b955..a719e09 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 267ae8a..f42a54c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1310,6 +1310,9 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ # Remove RPATH on some 3rd party bundled libs %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/libwps-0.4.so.4 chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1.so.1 From 4bebc2c50f3b651c27450a43adb8c8ae1bb8c193129e07a0bae3c7f25a362b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jun 2015 08:20:52 +0000 Subject: [PATCH 14/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=296 --- libreoffice.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index f42a54c..0efae84 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -253,8 +253,8 @@ Provides: %{name}-l10n-prebuild = %{version} Obsoletes: %{name}-l10n-prebuild < %{version} Provides: %{name}-ure = %{version} Obsoletes: %{name}-ure < %{version} -Provides: %{name}-icon-theme-breeze = %{version} -Obsoletes: %{name}-icon-theme-breeze < %{version} +Provides: %{name}-icon-theme-crystal = %{version} +Obsoletes: %{name}-icon-theme-crystal < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %arm %ix86 x86_64 ppc ppc64 %if %{with systemlibs} From 07fc79dd681281b5a18c8429a148cd3c036ec985a1a741abb21171bb8d50058c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jun 2015 13:26:53 +0000 Subject: [PATCH 15/22] - 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 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=297 --- ...nvert-.-const-char-to-const-rtl-OUSt.patch | 65 ---------- 0001-writerperfect-fix-gcc-4.7-build.patch | 118 ------------------ libreoffice-5.0.0.0.beta3.tar.xz | 3 - libreoffice-5.0.0.1.tar.xz | 3 + libreoffice-help-5.0.0.0.beta3.tar.xz | 3 - libreoffice-help-5.0.0.1.tar.xz | 3 + libreoffice-translations-5.0.0.0.beta3.tar.xz | 3 - libreoffice-translations-5.0.0.1.tar.xz | 3 + libreoffice.changes | 7 ++ libreoffice.spec | 7 +- 10 files changed, 17 insertions(+), 198 deletions(-) delete mode 100644 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch delete mode 100644 0001-writerperfect-fix-gcc-4.7-build.patch delete mode 100644 libreoffice-5.0.0.0.beta3.tar.xz create mode 100644 libreoffice-5.0.0.1.tar.xz delete mode 100644 libreoffice-help-5.0.0.0.beta3.tar.xz create mode 100644 libreoffice-help-5.0.0.1.tar.xz delete mode 100644 libreoffice-translations-5.0.0.0.beta3.tar.xz create mode 100644 libreoffice-translations-5.0.0.1.tar.xz diff --git a/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch b/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch deleted file mode 100644 index cafc0e5..0000000 --- a/0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch +++ /dev/null @@ -1,65 +0,0 @@ -From a44b770b59d322083cac6ac22cef20ce17a89e6d Mon Sep 17 00:00:00 2001 -From: Tor Lillqvist -Date: Fri, 5 Jun 2015 16:45:45 +0300 -Subject: [PATCH] =?UTF-8?q?Fix:=20could=20not=20convert=20[...]=20?= - =?UTF-8?q?=E2=80=98const=20char*=E2=80=99=20to=20=E2=80=98const=20rtl::OU?= - =?UTF-8?q?String=E2=80=99?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: Ib94c9f5eed0da67e846705f5c2c233c10583c791 ---- - svx/source/form/fmdmod.cxx | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx -index 447ad5a..bb63fed 100644 ---- a/svx/source/form/fmdmod.cxx -+++ b/svx/source/form/fmdmod.cxx -@@ -65,25 +65,25 @@ SAL_WNOUNREACHABLE_CODE_POP - { - static const OUString aSvxComponentServiceNameList[] = - { -- FM_SUN_COMPONENT_TEXTFIELD, -- FM_SUN_COMPONENT_FORM, -- FM_SUN_COMPONENT_LISTBOX, -- FM_SUN_COMPONENT_COMBOBOX, -- FM_SUN_COMPONENT_RADIOBUTTON, -- FM_SUN_COMPONENT_GROUPBOX, -- FM_SUN_COMPONENT_FIXEDTEXT, -- FM_SUN_COMPONENT_COMMANDBUTTON, -+ OUString(FM_SUN_COMPONENT_TEXTFIELD), -+ OUString(FM_SUN_COMPONENT_FORM), -+ OUString(FM_SUN_COMPONENT_LISTBOX), -+ OUString(FM_SUN_COMPONENT_COMBOBOX), -+ OUString(FM_SUN_COMPONENT_RADIOBUTTON), -+ OUString(FM_SUN_COMPONENT_GROUPBOX), -+ OUString(FM_SUN_COMPONENT_FIXEDTEXT), -+ OUString(FM_SUN_COMPONENT_COMMANDBUTTON), - OUString(FM_SUN_COMPONENT_CHECKBOX), -- FM_SUN_COMPONENT_GRIDCONTROL, -- FM_SUN_COMPONENT_IMAGEBUTTON, -- FM_SUN_COMPONENT_FILECONTROL, -- FM_SUN_COMPONENT_TIMEFIELD, -- FM_SUN_COMPONENT_DATEFIELD, -+ OUString(FM_SUN_COMPONENT_GRIDCONTROL), -+ OUString(FM_SUN_COMPONENT_IMAGEBUTTON), -+ OUString(FM_SUN_COMPONENT_FILECONTROL), -+ OUString(FM_SUN_COMPONENT_TIMEFIELD), -+ OUString(FM_SUN_COMPONENT_DATEFIELD), - OUString(FM_SUN_COMPONENT_NUMERICFIELD), -- FM_SUN_COMPONENT_CURRENCYFIELD, -- FM_SUN_COMPONENT_PATTERNFIELD, -- FM_SUN_COMPONENT_HIDDENCONTROL, -- FM_SUN_COMPONENT_IMAGECONTROL -+ OUString(FM_SUN_COMPONENT_CURRENCYFIELD), -+ OUString(FM_SUN_COMPONENT_PATTERNFIELD), -+ OUString(FM_SUN_COMPONENT_HIDDENCONTROL), -+ OUString(FM_SUN_COMPONENT_IMAGECONTROL) - }; - - static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] ); --- -2.4.3 - diff --git a/0001-writerperfect-fix-gcc-4.7-build.patch b/0001-writerperfect-fix-gcc-4.7-build.patch deleted file mode 100644 index bb1d7da..0000000 --- a/0001-writerperfect-fix-gcc-4.7-build.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 72833e22fcb2914fc422ff84d8e853d3e99c6c44 Mon Sep 17 00:00:00 2001 -From: Miklos Vajna -Date: Wed, 10 Jun 2015 09:12:12 +0200 -Subject: [PATCH] writerperfect: fix gcc-4.7 build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - error: could not convert '(const char*)"..."' from 'const char*' to 'const rtl::OUString' - -Change-Id: Ia8569aed46e571bd98489fd91b9708d0fe5df4c0 -Signed-off-by: Tomáš Chvátal ---- - writerperfect/source/common/WPFTEncodingDialog.cxx | 88 +++++++++++----------- - 1 file changed, 44 insertions(+), 44 deletions(-) - -diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx -index de521c6..dec775b 100644 ---- a/writerperfect/source/common/WPFTEncodingDialog.cxx -+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx -@@ -38,50 +38,50 @@ struct EncodingImplementation - - OUString const(EncodingImplementation::s_encodings[])= - { -- "MacArabic", "Arabic (Apple Macintosh)", -- "CP864", "Arabic (DOS/OS2-864)", -- "CP1006", "Arabic (IBM-1006)", -- "CP1256", "Arabic (Windows-1256)", -- "CP775", "Baltic (DOS/OS2-775)", -- "CP1257", "Baltic (Windows-1257)", -- "MacCeltic", "Celtic (Apple Macintosh)", -- "MacCyrillic", "Cyrillic (Apple Macintosh)", -- "CP855", "Cyrillic (DOS/OS2-855)", -- "CP866", "Cyrillic (DOS/OS2-866/Russian)", -- "CP1251", "Cyrillic (Windows-1251)", -- "MacCEurope", "Eastern Europe (Apple Macintosh)", -- "MacCroatian", "Eastern Europe (Apple Macintosh/Croatian)", -- "MacRomanian", "Eastern Europe (Apple Macintosh/Romanian)", -- "CP852", "Eastern Europe (DOS/OS2-852)", -- "CP1250", "Eastern Europe (Windows-1250/WinLatin 2)", -- "MacGreek", "Greek (Apple Macintosh)", -- "CP737", "Greek (DOS/OS2-737)", -- "CP869", "Greek (DOS/OS2-869/Greek-2)", -- "CP875", "Greek (DOS/OS2-875)", -- "CP1253", "Greek (Windows-1253)", -- "MacHebrew", "Hebrew (Apple Macintosh)", -- "CP424", "Hebrew (DOS/OS2-424)", -- "CP856", "Hebrew (DOS/OS2-856)", -- "CP862", "Hebrew (DOS/OS2-862)", -- "CP1255", "Hebrew (Windows-1255)", -- "CP500", "International (DOS/OS2-500)", -- "MacThai", "Thai (Apple Macintosh)", -- "CP874", "Thai (DOS/OS2-874)", -- "MacTurkish", "Turkish (Apple Macintosh)", -- "CP857", "Turkish (DOS/OS2-857)", -- "CP1026", "Turkish (DOS/OS2-1026)", -- "CP1254", "Turkish (Windows-1254)", -- "CP1258", "Vietnamese (Windows-1258)", -- "MacRoman", "Western Europe (Apple Macintosh)", -- "MacIceland", "Western Europe (Apple Macintosh/Icelandic)", -- "CP037", "Western Europe (DOS/OS2-037/US-Canada)", -- "CP437", "Western Europe (DOS/OS2-437/US)", -- "CP850", "Western Europe (DOS/OS2-850)", -- "CP860", "Western Europe (DOS/OS2-860/Portuguese)", -- "CP861", "Western Europe (DOS/OS2-861/Icelandic)", -- "CP863", "Western Europe (DOS/OS2-863/French)", -- "CP865", "Western Europe (DOS/OS2-865/Nordic)", -- "CP1252", "Western Europe (Windows-1252/WinLatin 1)" -+ OUString("MacArabic"), OUString("Arabic (Apple Macintosh)"), -+ OUString("CP864"), OUString("Arabic (DOS/OS2-864)"), -+ OUString("CP1006"), OUString("Arabic (IBM-1006)"), -+ OUString("CP1256"), OUString("Arabic (Windows-1256)"), -+ OUString("CP775"), OUString("Baltic (DOS/OS2-775)"), -+ OUString("CP1257"), OUString("Baltic (Windows-1257)"), -+ OUString("MacCeltic"), OUString("Celtic (Apple Macintosh)"), -+ OUString("MacCyrillic"), OUString("Cyrillic (Apple Macintosh)"), -+ OUString("CP855"), OUString("Cyrillic (DOS/OS2-855)"), -+ OUString("CP866"), OUString("Cyrillic (DOS/OS2-866/Russian)"), -+ OUString("CP1251"), OUString("Cyrillic (Windows-1251)"), -+ OUString("MacCEurope"), OUString("Eastern Europe (Apple Macintosh)"), -+ OUString("MacCroatian"), OUString("Eastern Europe (Apple Macintosh/Croatian)"), -+ OUString("MacRomanian"), OUString("Eastern Europe (Apple Macintosh/Romanian)"), -+ OUString("CP852"), OUString("Eastern Europe (DOS/OS2-852)"), -+ OUString("CP1250"), OUString("Eastern Europe (Windows-1250/WinLatin 2)"), -+ OUString("MacGreek"), OUString("Greek (Apple Macintosh)"), -+ OUString("CP737"), OUString("Greek (DOS/OS2-737)"), -+ OUString("CP869"), OUString("Greek (DOS/OS2-869/Greek-2)"), -+ OUString("CP875"), OUString("Greek (DOS/OS2-875)"), -+ OUString("CP1253"), OUString("Greek (Windows-1253)"), -+ OUString("MacHebrew"), OUString("Hebrew (Apple Macintosh)"), -+ OUString("CP424"), OUString("Hebrew (DOS/OS2-424)"), -+ OUString("CP856"), OUString("Hebrew (DOS/OS2-856)"), -+ OUString("CP862"), OUString("Hebrew (DOS/OS2-862)"), -+ OUString("CP1255"), OUString("Hebrew (Windows-1255)"), -+ OUString("CP500"), OUString("International (DOS/OS2-500)"), -+ OUString("MacThai"), OUString("Thai (Apple Macintosh)"), -+ OUString("CP874"), OUString("Thai (DOS/OS2-874)"), -+ OUString("MacTurkish"), OUString("Turkish (Apple Macintosh)"), -+ OUString("CP857"), OUString("Turkish (DOS/OS2-857)"), -+ OUString("CP1026"), OUString("Turkish (DOS/OS2-1026)"), -+ OUString("CP1254"), OUString("Turkish (Windows-1254)"), -+ OUString("CP1258"), OUString("Vietnamese (Windows-1258)"), -+ OUString("MacRoman"), OUString("Western Europe (Apple Macintosh)"), -+ OUString("MacIceland"), OUString("Western Europe (Apple Macintosh/Icelandic)"), -+ OUString("CP037"), OUString("Western Europe (DOS/OS2-037/US-Canada)"), -+ OUString("CP437"), OUString("Western Europe (DOS/OS2-437/US)"), -+ OUString("CP850"), OUString("Western Europe (DOS/OS2-850)"), -+ OUString("CP860"), OUString("Western Europe (DOS/OS2-860/Portuguese)"), -+ OUString("CP861"), OUString("Western Europe (DOS/OS2-861/Icelandic)"), -+ OUString("CP863"), OUString("Western Europe (DOS/OS2-863/French)"), -+ OUString("CP865"), OUString("Western Europe (DOS/OS2-865/Nordic)"), -+ OUString("CP1252"), OUString("Western Europe (Windows-1252/WinLatin 1)") - }; - - int EncodingImplementation::numEncodings() --- -2.4.3 - diff --git a/libreoffice-5.0.0.0.beta3.tar.xz b/libreoffice-5.0.0.0.beta3.tar.xz deleted file mode 100644 index 9b487a6..0000000 --- a/libreoffice-5.0.0.0.beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33023369a892e369023727b233505eaf076549fb71d394e78ed26fdf9a94a4a7 -size 164938212 diff --git a/libreoffice-5.0.0.1.tar.xz b/libreoffice-5.0.0.1.tar.xz new file mode 100644 index 0000000..41a4d67 --- /dev/null +++ b/libreoffice-5.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0070883377219be34a5961761576c953e18ef0aa6b5f8f6dc7c126d4ff80bad +size 164983572 diff --git a/libreoffice-help-5.0.0.0.beta3.tar.xz b/libreoffice-help-5.0.0.0.beta3.tar.xz deleted file mode 100644 index 9e0539e..0000000 --- a/libreoffice-help-5.0.0.0.beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7df61c17e7267694b1267b4d76d0e5fb07f45240fd9be6d2adcab91abbd585b2 -size 1882532 diff --git a/libreoffice-help-5.0.0.1.tar.xz b/libreoffice-help-5.0.0.1.tar.xz new file mode 100644 index 0000000..1fc037e --- /dev/null +++ b/libreoffice-help-5.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31ea2d01550a72cdf3a8bd76c404ad20ee44e57c37e3af7aaa1a4f7eb7067e7f +size 1881864 diff --git a/libreoffice-translations-5.0.0.0.beta3.tar.xz b/libreoffice-translations-5.0.0.0.beta3.tar.xz deleted file mode 100644 index d792a2e..0000000 --- a/libreoffice-translations-5.0.0.0.beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e518873140290a61a9175dd6a1860bd11402986d44a9b569d13fe3fc5b62b797 -size 127767644 diff --git a/libreoffice-translations-5.0.0.1.tar.xz b/libreoffice-translations-5.0.0.1.tar.xz new file mode 100644 index 0000000..a0e8515 --- /dev/null +++ b/libreoffice-translations-5.0.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:365c92029bc3703c802063b853f17d50917795087b6aa1b9ee8bc1540d4b4215 +size 128482040 diff --git a/libreoffice.changes b/libreoffice.changes index a719e09..a73047a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 0efae84..af7f7d4 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -65,7 +65,7 @@ Requires: python-importlib %endif # This is used due to the need for beta releases Name: libreoffice -Version: 5.0.0.0.beta3 +Version: 5.0.0.1 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 @@ -172,9 +172,6 @@ Patch5: mediawiki-no-broken-help.diff Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch # PATCH-FIX-UPSTREAM: old poppler is broken without this Patch8: fix-old-poppler.patch -# PATCH-FIX-UPSTREAM: old gcc compat -Patch9: 0001-Fix-could-not-convert-.-const-char-to-const-rtl-OUSt.patch -Patch10: 0001-writerperfect-fix-gcc-4.7-build.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -977,8 +974,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch7 -p1 %endif %patch8 -p1 -%patch9 -p1 -%patch10 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} From f5b92ed283dba4dd88fa01d794e29b47e9f54cbafb26b54407e8a584308cf51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 1 Jul 2015 09:22:21 +0000 Subject: [PATCH 16/22] - Update to 5.0 rc2: * Few small fixes and updates in internal libraries OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=298 --- 17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 | 3 --- libetonyek-0.1.2.tar.bz2 | 3 --- libetonyek-0.1.3.tar.bz2 | 3 +++ libfreehand-0.1.0.tar.bz2 | 3 --- libfreehand-0.1.1.tar.bz2 | 3 +++ libreoffice-5.0.0.1.tar.xz | 3 --- libreoffice-5.0.0.2.tar.xz | 3 +++ libreoffice-help-5.0.0.1.tar.xz | 3 --- libreoffice-help-5.0.0.2.tar.xz | 3 +++ libreoffice-translations-5.0.0.1.tar.xz | 3 --- libreoffice-translations-5.0.0.2.tar.xz | 3 +++ libreoffice.changes | 6 ++++++ libreoffice.spec | 8 ++++---- mdds_0.12.1.tar.bz2 | 3 +++ 14 files changed, 28 insertions(+), 22 deletions(-) delete mode 100644 17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 delete mode 100644 libetonyek-0.1.2.tar.bz2 create mode 100644 libetonyek-0.1.3.tar.bz2 delete mode 100644 libfreehand-0.1.0.tar.bz2 create mode 100644 libfreehand-0.1.1.tar.bz2 delete mode 100644 libreoffice-5.0.0.1.tar.xz create mode 100644 libreoffice-5.0.0.2.tar.xz delete mode 100644 libreoffice-help-5.0.0.1.tar.xz create mode 100644 libreoffice-help-5.0.0.2.tar.xz delete mode 100644 libreoffice-translations-5.0.0.1.tar.xz create mode 100644 libreoffice-translations-5.0.0.2.tar.xz create mode 100644 mdds_0.12.1.tar.bz2 diff --git a/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 b/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 deleted file mode 100644 index 9bb6ece..0000000 --- a/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a22de23ca828886625120e9d40fccd6333458a1934a13d2c982b6f9403e5981 -size 152285 diff --git a/libetonyek-0.1.2.tar.bz2 b/libetonyek-0.1.2.tar.bz2 deleted file mode 100644 index d07b093..0000000 --- a/libetonyek-0.1.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3f9342a34514a02c8a8c6d2a7957ee29cdb94ee69c67fe37b214fba50f49abf -size 430157 diff --git a/libetonyek-0.1.3.tar.bz2 b/libetonyek-0.1.3.tar.bz2 new file mode 100644 index 0000000..812631f --- /dev/null +++ b/libetonyek-0.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9963d8a2b0125390fa259fe872ab707a6642817d2aa1e667e9f97a1ba3510d1f +size 460867 diff --git a/libfreehand-0.1.0.tar.bz2 b/libfreehand-0.1.0.tar.bz2 deleted file mode 100644 index 0d264b9..0000000 --- a/libfreehand-0.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c69962d5947561afeefeee71bc78ba7419e9d9b0fea8bcef2f625be867afe307 -size 340549 diff --git a/libfreehand-0.1.1.tar.bz2 b/libfreehand-0.1.1.tar.bz2 new file mode 100644 index 0000000..756feb9 --- /dev/null +++ b/libfreehand-0.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877 +size 597212 diff --git a/libreoffice-5.0.0.1.tar.xz b/libreoffice-5.0.0.1.tar.xz deleted file mode 100644 index 41a4d67..0000000 --- a/libreoffice-5.0.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0070883377219be34a5961761576c953e18ef0aa6b5f8f6dc7c126d4ff80bad -size 164983572 diff --git a/libreoffice-5.0.0.2.tar.xz b/libreoffice-5.0.0.2.tar.xz new file mode 100644 index 0000000..51cec10 --- /dev/null +++ b/libreoffice-5.0.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe1e4c276a34e76690cfaa964ebd14e794eef7dd2ef307ebef29a51209ebfb57 +size 165300184 diff --git a/libreoffice-help-5.0.0.1.tar.xz b/libreoffice-help-5.0.0.1.tar.xz deleted file mode 100644 index 1fc037e..0000000 --- a/libreoffice-help-5.0.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31ea2d01550a72cdf3a8bd76c404ad20ee44e57c37e3af7aaa1a4f7eb7067e7f -size 1881864 diff --git a/libreoffice-help-5.0.0.2.tar.xz b/libreoffice-help-5.0.0.2.tar.xz new file mode 100644 index 0000000..775c6b8 --- /dev/null +++ b/libreoffice-help-5.0.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5151feab547244f64a8241f7868327e191b4f093151b8073fea861baa8b37171 +size 1881608 diff --git a/libreoffice-translations-5.0.0.1.tar.xz b/libreoffice-translations-5.0.0.1.tar.xz deleted file mode 100644 index a0e8515..0000000 --- a/libreoffice-translations-5.0.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:365c92029bc3703c802063b853f17d50917795087b6aa1b9ee8bc1540d4b4215 -size 128482040 diff --git a/libreoffice-translations-5.0.0.2.tar.xz b/libreoffice-translations-5.0.0.2.tar.xz new file mode 100644 index 0000000..4f6a93b --- /dev/null +++ b/libreoffice-translations-5.0.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5f88491b0ecf2f4f32ab398515569c4247e54ee3ed7a6acd179b8aec3b654b9 +size 129624260 diff --git a/libreoffice.changes b/libreoffice.changes index a73047a..587e217 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index af7f7d4..5a0fb6d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -65,7 +65,7 @@ Requires: python-importlib %endif # This is used due to the need for beta releases Name: libreoffice -Version: 5.0.0.1 +Version: 5.0.0.2 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 @@ -100,9 +100,9 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi Source2006: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz Source2007: %{external_url}/librevenge-0.0.2.tar.bz2 Source2008: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -Source2009: %{external_url}/libetonyek-0.1.2.tar.bz2 +Source2009: %{external_url}/libetonyek-0.1.3.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.4.tar.bz2 Source2013: %{external_url}/libcdr-0.1.1.tar.bz2 Source2014: %{external_url}/libmspub-0.1.2.tar.bz2 @@ -116,7 +116,7 @@ Source2021: %{external_url}/libwps-0.4.0.tar.bz2 Source2022: %{external_url}/libabw-0.1.1.tar.bz2 Source2023: %{external_url}/lcms2-2.6.tar.gz Source2024: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -Source2025: %{external_url}/17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 +Source2025: %{external_url}/mdds_0.12.1.tar.bz2 Source2026: %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz Source2027: %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz Source2028: %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 diff --git a/mdds_0.12.1.tar.bz2 b/mdds_0.12.1.tar.bz2 new file mode 100644 index 0000000..7e776d7 --- /dev/null +++ b/mdds_0.12.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d +size 153265 From c874467e33d7ee51fa7c6bf16bec98a0bac4fb2aa86771107b90d921adb98262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 3 Jul 2015 07:05:26 +0000 Subject: [PATCH 17/22] - Try to fix build on SLE11 and remove obsolete patch: * A mdds-old-gcc.patch * D pack-desktop-files-for-optional-filters.diff OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=299 --- libreoffice.changes | 7 ++ libreoffice.spec | 6 +- mdds-old-gcc.patch | 83 ++++++++++++++++++++ pack-desktop-files-for-optional-filters.diff | 14 ---- 4 files changed, 93 insertions(+), 17 deletions(-) create mode 100644 mdds-old-gcc.patch delete mode 100644 pack-desktop-files-for-optional-filters.diff diff --git a/libreoffice.changes b/libreoffice.changes index 587e217..03b40f8 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 5a0fb6d..592e407 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -160,8 +160,6 @@ Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2 # to avoid BerkleyDB incompatibility with the plain build # FIXME: make it configurable and push upstream Patch1: scp2-user-config-suse.diff -# pack new desktop files -Patch2: pack-desktop-files-for-optional-filters.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 @@ -172,6 +170,8 @@ Patch5: mediawiki-no-broken-help.diff Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch # PATCH-FIX-UPSTREAM: old poppler is broken without this Patch8: fix-old-poppler.patch +# PATCH-FIX-UPSTREAM: old gcc needs patch for mdds to work +Patch9: mdds-old-gcc.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -966,7 +966,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %prep %setup -q -b1 -b2 %patch1 -%patch2 -p1 %patch3 -p1 %patch4 %patch5 @@ -974,6 +973,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch7 -p1 %endif %patch8 -p1 +%patch9 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} diff --git a/mdds-old-gcc.patch b/mdds-old-gcc.patch new file mode 100644 index 0000000..97cc48c --- /dev/null +++ b/mdds-old-gcc.patch @@ -0,0 +1,83 @@ +From 18ebffdb0e1c2fb40f15065f289172c2903a90ab Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 29 Jun 2015 14:31:57 +0200 +Subject: fix build of libetonyek with older versions of gcc + +Change-Id: I19586eaae36fac7fa750614e6e31eff1a1e8440c + +diff --git a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 +new file mode 100644 +index 0000000..0c5b928 +--- /dev/null ++++ b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 +@@ -0,0 +1,55 @@ ++From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001 ++From: David Tardon ++Date: Mon, 29 Jun 2015 14:28:42 +0200 ++Subject: [PATCH] another step to allow fst to use any value type ++ ++For some reason this is not a problem on modern compilers... ++--- ++ include/mdds/flat_segment_tree.hpp | 1 - ++ include/mdds/flat_segment_tree_def.inl | 2 +- ++ src/flat_segment_tree_test.cpp | 4 ++++ ++ 3 files changed, 5 insertions(+), 2 deletions(-) ++ ++diff --git a/include/mdds/flat_segment_tree.hpp b/include/mdds/flat_segment_tree.hpp ++index b656bc3..02cf87e 100644 ++--- a/include/mdds/flat_segment_tree.hpp +++++ b/include/mdds/flat_segment_tree.hpp ++@@ -32,7 +32,6 @@ ++ #include ++ #include ++ #include ++-#include ++ ++ #include "mdds/node.hpp" ++ #include "mdds/flat_segment_tree_itr.hpp" ++diff --git a/include/mdds/flat_segment_tree_def.inl b/include/mdds/flat_segment_tree_def.inl ++index ebfee99..5fef1c3 100644 ++--- a/include/mdds/flat_segment_tree_def.inl +++++ b/include/mdds/flat_segment_tree_def.inl ++@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_segment_tree(key_type min_val, key_type ma ++ // We don't ever use the value of the right leaf node, but we need the ++ // value to be always the same, to make it easier to check for ++ // equality. ++- m_right_leaf->value_leaf.value = ::std::numeric_limits::max(); +++ m_right_leaf->value_leaf.value = init_val; ++ } ++ ++ template ++diff --git a/src/flat_segment_tree_test.cpp b/src/flat_segment_tree_test.cpp ++index 81858f5..f7aead7 100644 ++--- a/src/flat_segment_tree_test.cpp +++++ b/src/flat_segment_tree_test.cpp ++@@ -1943,6 +1943,10 @@ void fst_test_non_numeric_value() ++ db.search(1, result); ++ ++ assert(result == "hello world"); +++ +++ db_type db2(db); +++ +++ assert(db == db2); ++ } ++ ++ int main (int argc, char **argv) ++-- ++2.4.2 ++ +diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk +index 974a8e1..504406b 100644 +--- a/external/mdds/UnpackedTarball_mdds.mk ++++ b/external/mdds/UnpackedTarball_mdds.mk +@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) + $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ + external/mdds/mdds_0.6.0.patch \ + external/mdds/mdds-c++98.patch.0 \ ++ external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 \ + )) + + # vim: set noet sw=4 ts=4: +-- +cgit v0.10.2 + diff --git a/pack-desktop-files-for-optional-filters.diff b/pack-desktop-files-for-optional-filters.diff deleted file mode 100644 index a0ddda3..0000000 --- a/pack-desktop-files-for-optional-filters.diff +++ /dev/null @@ -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 From 11d646fe487b305793e5bb6c47ed1e28a462aef03395e224899b6542b3ff3a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 14 Jul 2015 09:14:44 +0000 Subject: [PATCH 18/22] - 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 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=300 --- fix-old-poppler.patch | 14 ---- language-subtag-registry-2014-12-03.tar.bz2 | 3 - language-subtag-registry-2015-06-08.tar.bz2 | 3 + libreoffice-5.0.0.2.tar.xz | 3 - libreoffice-5.0.0.3.tar.xz | 3 + libreoffice-help-5.0.0.2.tar.xz | 3 - libreoffice-help-5.0.0.3.tar.xz | 3 + libreoffice-translations-5.0.0.2.tar.xz | 3 - libreoffice-translations-5.0.0.3.tar.xz | 3 + libreoffice.changes | 9 +++ libreoffice.spec | 10 +-- mdds-old-gcc.patch | 83 --------------------- 12 files changed, 23 insertions(+), 117 deletions(-) delete mode 100644 fix-old-poppler.patch delete mode 100644 language-subtag-registry-2014-12-03.tar.bz2 create mode 100644 language-subtag-registry-2015-06-08.tar.bz2 delete mode 100644 libreoffice-5.0.0.2.tar.xz create mode 100644 libreoffice-5.0.0.3.tar.xz delete mode 100644 libreoffice-help-5.0.0.2.tar.xz create mode 100644 libreoffice-help-5.0.0.3.tar.xz delete mode 100644 libreoffice-translations-5.0.0.2.tar.xz create mode 100644 libreoffice-translations-5.0.0.3.tar.xz delete mode 100644 mdds-old-gcc.patch diff --git a/fix-old-poppler.patch b/fix-old-poppler.patch deleted file mode 100644 index b76e5ef..0000000 --- a/fix-old-poppler.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index cc64db4..d2602c1 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -114,7 +114,7 @@ namespace pdfi - - bool operator==(const FontAttributes& rFont) const - { -- return familyName.cmp( -+ return const_cast(&familyName)->cmp( - const_cast(&rFont.familyName))==0 && - isEmbedded == rFont.isEmbedded && - isBold == rFont.isBold && - diff --git a/language-subtag-registry-2014-12-03.tar.bz2 b/language-subtag-registry-2014-12-03.tar.bz2 deleted file mode 100644 index 66fb3b3..0000000 --- a/language-subtag-registry-2014-12-03.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25a590bab49352b655ea7ad4ac4b7758b3a541124f4eec268733ab435f71c5f4 -size 72082 diff --git a/language-subtag-registry-2015-06-08.tar.bz2 b/language-subtag-registry-2015-06-08.tar.bz2 new file mode 100644 index 0000000..f3805b9 --- /dev/null +++ b/language-subtag-registry-2015-06-08.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c079b7cbcfbe9517585f8234187741ca79e6ee900fb13642869db5295eef31b +size 72992 diff --git a/libreoffice-5.0.0.2.tar.xz b/libreoffice-5.0.0.2.tar.xz deleted file mode 100644 index 51cec10..0000000 --- a/libreoffice-5.0.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe1e4c276a34e76690cfaa964ebd14e794eef7dd2ef307ebef29a51209ebfb57 -size 165300184 diff --git a/libreoffice-5.0.0.3.tar.xz b/libreoffice-5.0.0.3.tar.xz new file mode 100644 index 0000000..5778afa --- /dev/null +++ b/libreoffice-5.0.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c290a4f1911e96a5851f9e4e354264c69c86fde222f79a363419ea782b4a44a +size 165377132 diff --git a/libreoffice-help-5.0.0.2.tar.xz b/libreoffice-help-5.0.0.2.tar.xz deleted file mode 100644 index 775c6b8..0000000 --- a/libreoffice-help-5.0.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5151feab547244f64a8241f7868327e191b4f093151b8073fea861baa8b37171 -size 1881608 diff --git a/libreoffice-help-5.0.0.3.tar.xz b/libreoffice-help-5.0.0.3.tar.xz new file mode 100644 index 0000000..a74a8fd --- /dev/null +++ b/libreoffice-help-5.0.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f656f97c9903fe89652de5cac4269cfb07fd19d23d92baf1663261650846d500 +size 1882452 diff --git a/libreoffice-translations-5.0.0.2.tar.xz b/libreoffice-translations-5.0.0.2.tar.xz deleted file mode 100644 index 4f6a93b..0000000 --- a/libreoffice-translations-5.0.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5f88491b0ecf2f4f32ab398515569c4247e54ee3ed7a6acd179b8aec3b654b9 -size 129624260 diff --git a/libreoffice-translations-5.0.0.3.tar.xz b/libreoffice-translations-5.0.0.3.tar.xz new file mode 100644 index 0000000..1f2f6b2 --- /dev/null +++ b/libreoffice-translations-5.0.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34f76fac859d7f5b3c34b5cfe81404e9ab4d5d771dc551d8507fa2757ebbd0e1 +size 129775160 diff --git a/libreoffice.changes b/libreoffice.changes index 03b40f8..73b967a 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index 592e407..e0e9166 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -65,7 +65,7 @@ Requires: python-importlib %endif # This is used due to the need for beta releases Name: libreoffice -Version: 5.0.0.2 +Version: 5.0.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 @@ -153,7 +153,7 @@ Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5. Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 Source2060: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.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 Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse @@ -168,10 +168,6 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-SUSE: do not declare java6 available for without system libs build Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch -# PATCH-FIX-UPSTREAM: old poppler is broken without this -Patch8: fix-old-poppler.patch -# PATCH-FIX-UPSTREAM: old gcc needs patch for mdds to work -Patch9: mdds-old-gcc.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -972,8 +968,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %if !%{with systemlibs} %patch7 -p1 %endif -%patch8 -p1 -%patch9 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} diff --git a/mdds-old-gcc.patch b/mdds-old-gcc.patch deleted file mode 100644 index 97cc48c..0000000 --- a/mdds-old-gcc.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 18ebffdb0e1c2fb40f15065f289172c2903a90ab Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 29 Jun 2015 14:31:57 +0200 -Subject: fix build of libetonyek with older versions of gcc - -Change-Id: I19586eaae36fac7fa750614e6e31eff1a1e8440c - -diff --git a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 -new file mode 100644 -index 0000000..0c5b928 ---- /dev/null -+++ b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 -@@ -0,0 +1,55 @@ -+From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001 -+From: David Tardon -+Date: Mon, 29 Jun 2015 14:28:42 +0200 -+Subject: [PATCH] another step to allow fst to use any value type -+ -+For some reason this is not a problem on modern compilers... -+--- -+ include/mdds/flat_segment_tree.hpp | 1 - -+ include/mdds/flat_segment_tree_def.inl | 2 +- -+ src/flat_segment_tree_test.cpp | 4 ++++ -+ 3 files changed, 5 insertions(+), 2 deletions(-) -+ -+diff --git a/include/mdds/flat_segment_tree.hpp b/include/mdds/flat_segment_tree.hpp -+index b656bc3..02cf87e 100644 -+--- a/include/mdds/flat_segment_tree.hpp -++++ b/include/mdds/flat_segment_tree.hpp -+@@ -32,7 +32,6 @@ -+ #include -+ #include -+ #include -+-#include -+ -+ #include "mdds/node.hpp" -+ #include "mdds/flat_segment_tree_itr.hpp" -+diff --git a/include/mdds/flat_segment_tree_def.inl b/include/mdds/flat_segment_tree_def.inl -+index ebfee99..5fef1c3 100644 -+--- a/include/mdds/flat_segment_tree_def.inl -++++ b/include/mdds/flat_segment_tree_def.inl -+@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_segment_tree(key_type min_val, key_type ma -+ // We don't ever use the value of the right leaf node, but we need the -+ // value to be always the same, to make it easier to check for -+ // equality. -+- m_right_leaf->value_leaf.value = ::std::numeric_limits::max(); -++ m_right_leaf->value_leaf.value = init_val; -+ } -+ -+ template -+diff --git a/src/flat_segment_tree_test.cpp b/src/flat_segment_tree_test.cpp -+index 81858f5..f7aead7 100644 -+--- a/src/flat_segment_tree_test.cpp -++++ b/src/flat_segment_tree_test.cpp -+@@ -1943,6 +1943,10 @@ void fst_test_non_numeric_value() -+ db.search(1, result); -+ -+ assert(result == "hello world"); -++ -++ db_type db2(db); -++ -++ assert(db == db2); -+ } -+ -+ int main (int argc, char **argv) -+-- -+2.4.2 -+ -diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk -index 974a8e1..504406b 100644 ---- a/external/mdds/UnpackedTarball_mdds.mk -+++ b/external/mdds/UnpackedTarball_mdds.mk -@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) - $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ - external/mdds/mdds_0.6.0.patch \ - external/mdds/mdds-c++98.patch.0 \ -+ external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 \ - )) - - # vim: set noet sw=4 ts=4: --- -cgit v0.10.2 - From ead3a716add3465a095fd42879ed391ffa80cbb4528276b90c7bee1da3aa3190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 14 Jul 2015 14:56:39 +0000 Subject: [PATCH 19/22] - Add patch to build with old cairo (sle11): * old-cairo.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=301 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 3 +++ old-cairo.patch | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 old-cairo.patch diff --git a/libreoffice.changes b/libreoffice.changes index 73b967a..1275220 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index e0e9166..5673db8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -168,6 +168,8 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-SUSE: do not declare java6 available for without system libs build Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch +# PATCH-FIX-UPSTREAM: properly detect cairo version +Patch8: old-cairo.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -968,6 +970,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %if !%{with systemlibs} %patch7 -p1 %endif +%patch8 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} diff --git a/old-cairo.patch b/old-cairo.patch new file mode 100644 index 0000000..190a05c --- /dev/null +++ b/old-cairo.patch @@ -0,0 +1,23 @@ +From b51fe01f7c8853c353401001bdd417b9ed27fb87 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 25 Jun 2015 15:10:37 +0100 +Subject: WaE: error: 'CAIRO_VERSION' is not defined + +Change-Id: I9e4f0d0af541226089a6295962a91ca09debb418 + +diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx +index f5dbaf4..d29a956 100644 +--- a/vcl/headless/svpgdi.cxx ++++ b/vcl/headless/svpgdi.cxx +@@ -141,7 +141,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight, + #if !ENABLE_CAIRO_CANVAS + (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency; + return false; +-#elif CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) ++#elif defined(CAIRO_VERSION) && defined(CAIRO_VERSION_ENCODE) && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) + if (m_bUseLineColor || !m_bUseFillColor) + return false; + +-- +cgit v0.10.2 + From 4760dee09f6ba5d21bbfc1dd9ab7d2e693714297dda1029e5e13f8a924bf12c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Jul 2015 09:33:47 +0000 Subject: [PATCH 20/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=302 --- libreoffice.spec | 3 --- old-cairo.patch | 23 ----------------------- 2 files changed, 26 deletions(-) delete mode 100644 old-cairo.patch diff --git a/libreoffice.spec b/libreoffice.spec index 5673db8..e0e9166 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -168,8 +168,6 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-SUSE: do not declare java6 available for without system libs build Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch -# PATCH-FIX-UPSTREAM: properly detect cairo version -Patch8: old-cairo.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -970,7 +968,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %if !%{with systemlibs} %patch7 -p1 %endif -%patch8 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} diff --git a/old-cairo.patch b/old-cairo.patch deleted file mode 100644 index 190a05c..0000000 --- a/old-cairo.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b51fe01f7c8853c353401001bdd417b9ed27fb87 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 25 Jun 2015 15:10:37 +0100 -Subject: WaE: error: 'CAIRO_VERSION' is not defined - -Change-Id: I9e4f0d0af541226089a6295962a91ca09debb418 - -diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx -index f5dbaf4..d29a956 100644 ---- a/vcl/headless/svpgdi.cxx -+++ b/vcl/headless/svpgdi.cxx -@@ -141,7 +141,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight, - #if !ENABLE_CAIRO_CANVAS - (void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency; - return false; --#elif CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) -+#elif defined(CAIRO_VERSION) && defined(CAIRO_VERSION_ENCODE) && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0) - if (m_bUseLineColor || !m_bUseFillColor) - return false; - --- -cgit v0.10.2 - From 89023d5a7d04ff6d1fb1fa8b8ef7299856970783747247b75f24271e91852f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Jul 2015 08:35:11 +0000 Subject: [PATCH 21/22] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=303 --- libreoffice.spec | 3 +++ old-cairo.patch | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 old-cairo.patch diff --git a/libreoffice.spec b/libreoffice.spec index e0e9166..ab43854 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -168,6 +168,8 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-SUSE: do not declare java6 available for without system libs build 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 Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -968,6 +970,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %if !%{with systemlibs} %patch7 -p1 %endif +%patch8 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} diff --git a/old-cairo.patch b/old-cairo.patch new file mode 100644 index 0000000..bd93991 --- /dev/null +++ b/old-cairo.patch @@ -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; + From b6599aeac942e64b90a6a9519c1eed0ffca1870611a10e5d828579a522078acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 22 Jul 2015 12:12:46 +0000 Subject: [PATCH 22/22] - Add explicit requires over libmysqlclient_r18, should cover bnc#829430 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=304 --- libreoffice.changes | 5 +++++ libreoffice.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 1275220..237c3ab 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/libreoffice.spec b/libreoffice.spec index ab43854..a6fa63d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -688,6 +688,9 @@ Summary: MySQL Database Driver for LibreOffice License: GPL-2.0 and LGPL-3.0 Group: Productivity/Office/Suite Requires: libreoffice-base = %{version} +# This mysql thing is just dlopened +# WARNING: the soname might change! +Requires: libmysqlclient_r18 Requires(pre): libreoffice = %{version} Supplements: packageand(libreoffice-base:mysql-client)