File 834-mozilla-no-xul-scp2.diff of Package libreoffice-branding-upstream.385

Overview Repositories Revisions Requests Users Attributes Meta

File 834-mozilla-no-xul-scp2.diff of Package libreoffice-branding-upstream.385

--- scp2/source/ooo/makefile.mk.old	2011-08-23 18:42:11.000000000 +0200
+++ scp2/source/ooo/makefile.mk	2011-08-29 15:18:24.000000000 +0200
@@ -127,6 +127,10 @@ SCPDEFS+=-DSYSTEM_DB
 SCPDEFS+=-DWITHOUT_MOZILLA
 .ENDIF
 
+.IF "$(WITH_MOZILLA_XUL)" == "YES"
+SCPDEFS+=-DWITH_MOZILLA_XUL
+.ENDIF
+
 .IF "$(WITH_MYSPELL_DICTS)" == "NO"
 SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
 .ENDIF
--- scp2/source/ooo/file_library_ooo.scp.old	2011-08-23 18:42:11.000000000 +0200
+++ scp2/source/ooo/file_library_ooo.scp	2011-08-29 15:19:43.000000000 +0200
@@ -1086,7 +1086,7 @@ End
 
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 
-#ifndef WITHOUT_MOZILLA
+#if ! defined(WITHOUT_MOZILLA) && defined (WITH_MOZILLA_XUL)
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
--- scp2/source/ooo/common_brand.scp.old	2011-08-25 18:51:45.000000000 +0200
+++ scp2/source/ooo/common_brand.scp	2011-08-29 16:42:11.000000000 +0200
@@ -618,7 +618,7 @@ File gid_Brand_File_Bin_Libxml2
 End
 #endif
 
-#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK)
+#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK) && defined WITH_MOZILLA_XUL
 File gid_Brand_File_Lib_Npsoplugin
     BIN_FILE_BODY;
     Name = SPECIAL_NAME(npsoplugin);
--- scp2/source/ooo/file_ooo.scp.old	2011-08-25 18:51:45.000000000 +0200
+++ scp2/source/ooo/file_ooo.scp	2011-08-29 16:44:15.000000000 +0200
@@ -122,6 +122,7 @@ End
 #ifndef WITHOUT_MOZILLA
 
 #if !defined(UNX) || defined(ENABLE_GTK)
+#if defined(WITH_MOZILLA_XUL)
 File gid_File_Exe_Nsplugin
         BIN_FILE_BODY;
         Styles          = (PACKED);
@@ -134,6 +135,7 @@ File gid_File_Exe_Nsplugin
 End
 #endif
 #endif
+#endif
 
 File gid_File_Bin_Gengal
     BIN_FILE_BODY;
@@ -164,7 +166,7 @@ File gid_File_Profile_Gengal
     Name = PROFILENAME(gengal);
 End
 
-#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
+#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ) && defined(WITH_MOZILLA_XUL)
 
 File gid_File_Bin_Pluginapp
     BIN_FILE_BODY;

Places

File 834-mozilla-no-xul-scp2.diff of Package libreoffice-branding-upstream.385

Places