[ooo-build-commit] patches/dev300

[Jan Holesovsky]

 patches/dev300/apply                          |    3 +++
 patches/dev300/kde4-and-kde3-shell-build.diff |   16 ++++++++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit 0237c2d824a43c73d86736ce5a2be7807158b0c2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Oct 12 15:29:09 2009 +0200

    Fix KDE3 build in shell when KDE4 is installed.
    
    * patches/dev300/apply:
    * patches/dev300/kde4-and-kde3-shell-build.diff: New patch.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3f8ca2c..7cd249f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2111,6 +2111,9 @@ kde4_fpicker_fixes.diff
 # FIXME. Needs update for DEV300, --rengelhard
 #kde4_vcl_fixes.diff
 
+# Fix the KDE3 backend build, when KDE4 is installed
+kde4-and-kde3-shell-build.diff, jholesov
+
 [ KDE4Experimental ]
 # Not yet ported to co-exist with the KDE3 stuff
 kde4-kab.diff
diff --git a/patches/dev300/kde4-and-kde3-shell-build.diff b/patches/dev300/kde4-and-kde3-shell-build.diff
new file mode 100644
index 0000000..70a02b8
--- /dev/null
+++ b/patches/dev300/kde4-and-kde3-shell-build.diff
@@ -0,0 +1,16 @@
+--- shell/source/backends/kdebe/makefile.mk	2009-10-12 15:26:10.000000000 +0200
++++ shell/source/backends/kdebe/makefile.mk	2009-10-12 15:26:07.000000000 +0200
+@@ -77,11 +77,11 @@ SHL1OBJS=$(SLOFILES)
+ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+ 
+ SHL1IMPLIB=i$(SHL1TARGET)
++SHL1LINKFLAGS+=$(KDE_LIBS) -lkio
+ SHL1STDLIBS=    \
+         $(CPPUHELPERLIB) \
+         $(CPPULIB) \
+-        $(SALLIB) \
+-        $(KDE_LIBS) -lkio
++        $(SALLIB)
+         
+ SHL1VERSIONMAP=exports.map
+ SHL1DEF=$(MISC)$/$(SHL1TARGET).def