diff options
| author | Petr Mladek <pmladek@suse.cz> | 2009-05-21 17:43:49 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2009-05-21 17:43:49 +0200 |
| commit | f7e5a20847b87e23714f447e18d07090020351d2 (patch) | |
| tree | 9e4e2606f80e0b6d4a2726ca45bebe3c550197c0 | |
| parent | 11bc234785c17f64cd0a53bda15236105d3157cb (diff) | |
Fix build with gcc-4.4 in openSUSE-factory
* patches/dev300/fpicker-kde-modal.diff: add #include <stdio.h>
* patches/dev300/apply: apply the section Gcc44 for SUSE
| -rw-r--r-- | patches/dev300/apply | 2 | ||||
| -rw-r--r-- | patches/dev300/fpicker-kde-modal.diff | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 297176a15..a46681bf4 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -66,7 +66,7 @@ SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14, GCC41 SUSE-11.0 : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, PostgreSQL SUSE-11.1 : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL -SUSE : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL +SUSE : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, ImpressFontSize, PostgreSQL, Gcc44 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults # Slackware Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess, CairoFonts diff --git a/patches/dev300/fpicker-kde-modal.diff b/patches/dev300/fpicker-kde-modal.diff index 7f28ca628..d8a62729e 100644 --- a/patches/dev300/fpicker-kde-modal.diff +++ b/patches/dev300/fpicker-kde-modal.diff @@ -53,7 +53,7 @@ diff --git a/fpicker/source/unx/kde_unx/UnxFilePicker.cxx b/fpicker/source/unx/k index 9d3da56..4590b74 100644 --- fpicker/source/unx/kde_unx/UnxFilePicker.cxx +++ fpicker/source/unx/kde_unx/UnxFilePicker.cxx -@@ -127,6 +127,11 @@ +@@ -127,9 +127,15 @@ #include <UnxNotifyThread.hxx> #endif @@ -65,6 +65,10 @@ index 9d3da56..4590b74 100644 #include <sys/wait.h> #include <unistd.h> #include <fcntl.h> ++#include <stdio.h> + + #include <iostream> + @@ -528,7 +533,7 @@ void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUStri sendCommand( aBuffer.makeStringAndClear() ); } |