[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/kde4-scp2.diff |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 6abbb7f3b93c5d9b365e78bbf9be8424dd831118
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jun 15 16:05:26 2009 +0200

    Fix installation with KDE4 support disabled
    
    * patches/dev300/kde4-scp2.diff: there was missing #ifdef ENABLE_KDE4

diff --git a/patches/dev300/kde4-scp2.diff b/patches/dev300/kde4-scp2.diff
index c0447ca..b1cfeba 100644
--- a/patches/dev300/kde4-scp2.diff
+++ b/patches/dev300/kde4-scp2.diff
@@ -2,10 +2,21 @@ diff --git scp2/source/kde/file_kde.scp scp2/source/kde/file_kde.scp
 index a6d6db4..9860f29 100644
 --- scp2/source/kde/file_kde.scp
 +++ scp2/source/kde/file_kde.scp
-@@ -38,3 +38,12 @@ File gid_File_Lib_Kdebe
+@@ -29,6 +29,7 @@
+  ************************************************************************/
+ #include "macros.inc"
+ 
++#ifdef ENABLE_KDE
+ File gid_File_Lib_Kdebe
+     TXT_FILE_BODY;
+     Styles = (PACKED);
+@@ -38,4 +38,15 @@ File gid_File_Lib_Kdebe
+     RegistryID = gid_Starregistry_Services_Rdb;
      Regmergefile = "kdebe1-ucd.txt";
  End
++#endif
  
++#ifdef ENABLE_KDE4
 +File gid_File_Lib_Kde4be
 +    TXT_FILE_BODY;
 +    Styles = (PACKED);
@@ -14,7 +25,7 @@ index a6d6db4..9860f29 100644
 +    RegistryID = gid_Starregistry_Services_Rdb;
 +    Regmergefile = "kde4be1-ucd.txt";
 +End
-+
++#endif
 diff --git scp2/source/kde/makefile.mk scp2/source/kde/makefile.mk
 index 0cbf6a4..6ddb301 100644
 --- scp2/source/kde/makefile.mk