[Libreoffice-commits] .: scp2/source

[Michael Meeks]

 scp2/source/gnome/file_gnome.scp      |    9 +++++++++
 scp2/source/gnome/makefile.mk         |    4 ++++
 scp2/source/gnome/module_gnome.scp    |    8 ++++++++
 scp2/source/ooo/makefile.mk           |    4 ----
 scp2/source/ooo/module_hidden_ooo.scp |    5 -----
 5 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit fe3943a0d9234f492f8fd5b2aa27186d68954e6a
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue May 3 21:32:55 2011 +0100

    move all of the gnome and gtk+ related pieces into the -gnome sub package

diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index d489150..7cfd455 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -61,3 +61,12 @@ File gid_File_Lib_Gconfbe
     Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
 End
 #endif
+
+#ifdef ENABLE_SYSTRAY_GTK
+File gid_File_Lib_QStart_Gtk
+    Name = LIBNAME(qstart_gtk);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 1859153..581aae4 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -39,6 +39,10 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
+.IF "$(ENABLE_SYSTRAY_GTK)" != ""
+SCPDEFS+=-DENABLE_SYSTRAY_GTK
+.ENDIF
+
 .IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
 
 .IF "$(ENABLE_GCONF)" != ""
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index f9df5c8..5572a26 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -41,6 +41,14 @@ Module gid_Module_Optional_Gnome
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
     Files = (
+      gid_File_Lib_Evoab_2,
+      gid_File_Lib_Fps_Gnome,
+      gid_File_Lib_Vclplug_Gtk,
+      gid_File_Bin_Gnome_Open_Url,
+      gid_File_Bin_Gnome_Open_Url_Bin,
+#ifdef ENABLE_SYSTRAY_GTK
+      gid_File_Lib_QStart_Gtk,
+#endif
 #ifdef ENABLE_GNOMEVFS
       gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
 #endif
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 86ef48c..1df99f3 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -68,10 +68,6 @@ SCPDEFS+=-DGTK_TWO_FOUR
 .ENDIF
 .ENDIF			# "$(GUI)"=="UNX"
 
-.IF "$(ENABLE_SYSTRAY_GTK)" != ""
-SCPDEFS+=-DENABLE_SYSTRAY_GTK
-.ENDIF
-
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index b9d4546..2331fe9 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -83,8 +83,6 @@ Module gid_Module_Root_Files_2
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Bin_Cde_Open_Url,
-	gid_File_Bin_Gnome_Open_Url,
-	gid_File_Bin_Gnome_Open_Url_Bin,
 	gid_File_Bin_Kde_Open_Url,
 	gid_File_Bin_Open_Url,
 	gid_File_Bin_Pagein,
@@ -279,7 +277,6 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Odfflatxml,
 	gid_File_Lib_Zip,
 	gid_File_Lib_Vclplug_Gen,
-	gid_File_Lib_Vclplug_Gtk,
 	gid_File_Lib_Vclplug_Kde,
 	gid_File_Lib_Vclplug_Kde4,
 	gid_File_Lib_Vclplug_Svp,
@@ -326,7 +323,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Dbpool,
 	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
-	gid_File_Lib_Evoab_2,
 	gid_File_Lib_Kab_1,
     gid_File_Lib_Kab_Drv_1,
 	gid_File_Lib_Macab_1,
@@ -334,7 +330,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Evtatt,
 	gid_File_Lib_Fileacc,
 	gid_File_Lib_Filterconfig1,
-	gid_File_Lib_Fps_Gnome,
 	gid_File_Lib_Dbodbcbase,
 	gid_File_Lib_I18npool,
 	gid_File_Lib_I18npaper,