applied_patches/0549-kde4-scp2.diff

   1 diff --git scp2/source/kde/file_kde.scp scp2/source/kde/file_kde.scp
   2 index a6d6db4..9860f29 100644
   3 --- scp2/source/kde/file_kde.scp
   4 +++ scp2/source/kde/file_kde.scp
   5 @@ -29,6 +29,7 @@
   6   ************************************************************************/
   7  #include "macros.inc"
   8
   9 +#ifdef ENABLE_KDE
  10  File gid_File_Lib_Kdebe
  11      TXT_FILE_BODY;
  12      Styles = (PACKED);
  13 @@ -38,4 +38,15 @@ File gid_File_Lib_Kdebe
  14      RegistryID = gid_Starregistry_Services_Rdb;
  15      Regmergefile = "kdebe1-ucd.txt";
  16  End
  17 +#endif
  18
  19 +#ifdef ENABLE_KDE4
  20 +File gid_File_Lib_Kde4be
  21 +    TXT_FILE_BODY;
  22 +    Styles = (PACKED);
  23 +    Dir = gid_Dir_Program;
  24 +    Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
  25 +    RegistryID = gid_Starregistry_Services_Rdb;
  26 +    Regmergefile = "kde4be1-ucd.txt";
  27 +End
  28 +#endif
  29 diff --git scp2/source/kde/makefile.mk scp2/source/kde/makefile.mk
  30 index 0cbf6a4..6ddb301 100644
  31 --- scp2/source/kde/makefile.mk
  32 +++ scp2/source/kde/makefile.mk
  33 @@ -43,7 +43,16 @@ TARGETTYPE=CUI
  34
  35  SCP_PRODUCT_TYPE=osl
  36
  37 -.IF "$(ENABLE_KDE)" == "TRUE"
  38 +.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_KDE4)" == "TRUE"
  39 +
  40 +.IF "$(ENABLE_KDE)" != ""
  41 +SCPDEFS+=-DENABLE_KDE
  42 +.ENDIF
  43 +
  44 +.IF "$(ENABLE_KDE4)" != ""
  45 +SCPDEFS+=-DENABLE_KDE4
  46 +.ENDIF
  47 +
  48  PARFILES =                   \
  49          module_kde.par     \
  50          file_kde.par
  51 diff --git scp2/source/kde/module_kde.scp scp2/source/kde/module_kde.scp
  52 index 1dce456..28dacbe 100644
  53 --- scp2/source/kde/module_kde.scp
  54 +++ scp2/source/kde/module_kde.scp
  55 @@ -30,12 +30,24 @@
  56
  57  #include "macros.inc"
  58
  59 +#if defined( ENABLE_KDE ) || defined( ENABLE_KDE4 )
  60  Module gid_Module_Optional_Kde
  61      ParentID = gid_Module_Optional;
  62      Default = YES;
  63      PackageInfo = "packinfo_office.txt";
  64      MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
  65      Styles = (DONTSHOWINUSERINSTALL);
  66 -    Files = (gid_File_Lib_Kdebe);
  67 +    Files = (
  68 +#ifdef ENABLE_KDE
  69 +    gid_File_Lib_Kdebe
  70 +#ifdef ENABLE_KDE4
  71 +    ,
  72 +#endif // ENABLE_KDE4
  73 +#endif // ENABLE_KDE
  74 +#ifdef ENABLE_KDE4
  75 +    gid_File_Lib_Kde4be
  76 +#endif // ENABLE_KDE4
  77 +    );
  78  End
  79 +#endif
  80
  81 diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
  82 index eeba4ff..9242bae 100644
  83 --- scp2/source/ooo/file_library_ooo.scp
  84 +++ scp2/source/ooo/file_library_ooo.scp
  85 @@ -630,6 +630,18 @@ File gid_File_Bin_KdeFilePicker
  86  End
  87  #endif
  88  #endif
  89 +#ifdef ENABLE_KDE4
  90 +#ifndef MACOSX
  91 +File gid_File_Lib_Fps_Kde4
  92 +    TXT_FILE_BODY;
  93 +    Styles = (PACKED,UNO_COMPONENT);
  94 +    RegistryID = gid_Starregistry_Services_Rdb;
  95 +    Dir = gid_Dir_Program;
  96 +    Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
  97 +    Regmergefile = "fps-kde4-ucd.txt";
  98 +End
  99 +#endif
 100 +#endif
 101  #endif
 102
 103  #ifdef MACOSX
 104 @@ -1202,6 +1214,16 @@ File gid_File_Lib_Vclplug_Kde
 105  End
 106  #endif
 107  #endif
 108 +#ifdef ENABLE_KDE4
 109 +#ifndef MACOSX
 110 +File gid_File_Lib_Vclplug_Kde4
 111 +    Name = LIBNAME(vclplug_kde4);
 112 +    TXT_FILE_BODY;
 113 +    Styles = (PACKED);
 114 +    Dir = gid_Dir_Program;
 115 +End
 116 +#endif
 117 +#endif
 118  #endif
 119
 120  #if defined(QUARTZ)
 121 diff --git scp2/source/ooo/makefile.mk scp2/source/ooo/makefile.mk
 122 index 3140056..6b289e5 100644
 123 --- scp2/source/ooo/makefile.mk
 124 +++ scp2/source/ooo/makefile.mk
 125 @@ -79,6 +79,10 @@ SCPDEFS+=-DENABLE_SYSTRAY_GTK
 126  SCPDEFS+=-DENABLE_KDE
 127  .ENDIF
 128
 129 +.IF "$(ENABLE_KDE4)" != ""
 130 +SCPDEFS+=-DENABLE_KDE4
 131 +.ENDIF
 132 +
 133  .IF "$(ENABLE_KAB)" != ""
 134  SCPDEFS+=-DENABLE_KAB
 135  .ENDIF
 136 diff --git scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp
 137 index 2b93f24..51942be 100644
 138 --- scp2/source/ooo/module_hidden_ooo.scp
 139 +++ scp2/source/ooo/module_hidden_ooo.scp
 140 @@ -242,6 +242,7 @@ Module gid_Module_Root_Files_4
 141         gid_File_Lib_Vclplug_Gen,
 142         gid_File_Lib_Vclplug_Gtk,
 143         gid_File_Lib_Vclplug_Kde,
 144 +       gid_File_Lib_Vclplug_Kde4,
 145         gid_File_Lib_Vclplug_Svp,
 146         gid_File_Lib_Basctl,
 147         gid_File_Lib_CanvasTools,