diff --git a/kde4filepicker.patch b/kde4filepicker.patch new file mode 100644 index 0000000..03352ea --- /dev/null +++ b/kde4filepicker.patch @@ -0,0 +1,20 @@ +Index: libreoffice-5.0.2.1/configure.ac +=================================================================== +--- libreoffice-5.0.2.1.orig/configure.ac ++++ libreoffice-5.0.2.1/configure.ac +@@ -11318,6 +11318,7 @@ int main(int argc, char **argv) { + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #define SAL_OVERRIDE ++#include + #include "tst_exclude_socket_notifiers.moc" + + int main(int argc, char *argv[]) +@@ -11351,6 +11352,7 @@ int main(int argc, char *argv[]) + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #define SAL_OVERRIDE ++#include + #include "tst_exclude_posted_events.moc" + + int main(int argc, char *argv[]) diff --git a/libreoffice.changes b/libreoffice.changes index 872d146..eb23f27 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -3,6 +3,12 @@ Thu Sep 17 08:20:21 UTC 2015 - tchvatal@suse.com - Fix chrpath call after the libs got -lo suffixing +------------------------------------------------------------------- +Tue Sep 15 09:47:21 UTC 2015 - tchvatal@suse.com + +- Add patch to fix qt4 features detection: + * kde4filepicker.patch + ------------------------------------------------------------------- Fri Sep 11 11:56:03 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 50c0ed4..8375b1e 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: detect kde4 filepicker properly with old compilers +Patch8: kde4filepicker.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -984,6 +986,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %if !%{with systemlibs} %patch7 -p1 %endif +%patch8 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}