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] - 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