SHA256
1
0
forked from pool/libreoffice

- Drop upstreamed patch:

* kde4filepicker.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=335
This commit is contained in:
Tomáš Chvátal 2015-10-16 08:11:46 +00:00 committed by Git OBS Bridge
parent 94ffc85701
commit 704b227927
3 changed files with 2 additions and 23 deletions

View File

@ -1,20 +0,0 @@
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 <cstdlib>
#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 <cstdlib>
#include "tst_exclude_posted_events.moc"
int main(int argc, char *argv[])

View File

@ -2,6 +2,8 @@
Fri Oct 16 08:04:32 UTC 2015 - tchvatal@suse.com
- Version update to 5.0.3RC1 as it should fix i586 test failure
- Drop upstreamed patch:
* kde4filepicker.patch
-------------------------------------------------------------------
Fri Oct 16 07:26:33 UTC 2015 - meissner@suse.com

View File

@ -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: 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
@ -996,7 +994,6 @@ Provides additional %{langname} translations and resources for %{project}. \
%if !%{with systemlibs}
%patch7 -p1
%endif
%patch8 -p1
%patch990 -p1
# 256x256 icons
tar -xjf %{SOURCE20}