Blame libreoffice-rhel6glib.patch
|
|
5506cea |
--- a/shell/Module_shell.mk 2013-02-13 15:48:02.880128705 +0000
|
|
|
5506cea |
+++ b/shell/Module_shell.mk 2013-02-13 16:37:33.766353120 +0000
|
|
|
5506cea |
@@ -32,14 +32,6 @@
|
|
|
5506cea |
Library_localebe \
|
|
|
5506cea |
))
|
|
|
5506cea |
|
|
|
5506cea |
-ifeq ($(OS),LINUX)
|
|
|
5506cea |
-ifeq ($(ENABLE_GIO),TRUE)
|
|
|
5506cea |
-$(eval $(call gb_Module_add_targets,shell,\
|
|
|
5506cea |
- Library_losessioninstall \
|
|
|
5506cea |
-))
|
|
|
5506cea |
-endif
|
|
|
5506cea |
-endif
|
|
|
5506cea |
-
|
|
|
5506cea |
ifeq ($(ENABLE_GCONF),TRUE)
|
|
|
5506cea |
$(eval $(call gb_Module_add_targets,shell,\
|
|
|
5506cea |
Library_gconfbe \
|
|
|
5506cea |
--- a/scp2/source/gnome/file_gnome.scp 2013-02-13 16:38:19.475352623 +0000
|
|
|
5506cea |
+++ b/scp2/source/gnome/file_gnome.scp 2013-02-13 16:38:28.799352829 +0000
|
|
|
5506cea |
@@ -33,8 +33,6 @@
|
|
|
5506cea |
Dir = SCP2_OOO_BIN_DIR;
|
|
|
5506cea |
Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
|
|
|
5506cea |
End
|
|
|
5506cea |
-
|
|
|
5506cea |
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno)
|
|
|
5506cea |
#endif
|
|
|
5506cea |
|
|
|
5506cea |
#ifdef ENABLE_GNOMEVFS
|
|
|
5506cea |
--- a/scp2/source/gnome/module_gnome.scp 2013-02-13 16:38:19.475352623 +0000
|
|
|
5506cea |
+++ b/scp2/source/gnome/module_gnome.scp 2013-02-13 16:38:41.308353064 +0000
|
|
|
5506cea |
@@ -55,7 +55,6 @@
|
|
|
5506cea |
#endif
|
|
|
5506cea |
#ifdef ENABLE_GIO
|
|
|
5506cea |
gid_File_Lib_GIO,
|
|
|
5506cea |
- gid_File_Lib_Losessioninstall,
|
|
|
5506cea |
#endif
|
|
|
5506cea |
#ifdef ENABLE_GCONF
|
|
|
5506cea |
gid_File_Lib_Gconfbe,
|
|
|
5506cea |
--- a/postprocess/packcomponents/makefile.mk 2013-02-15 11:29:08.647352823 +0000
|
|
|
5506cea |
+++ b/postprocess/packcomponents/makefile.mk 2013-02-15 11:29:13.594376055 +0000
|
|
|
5506cea |
@@ -246,7 +246,6 @@
|
|
|
5506cea |
|
|
|
5506cea |
.IF "$(ENABLE_GIO)" != ""
|
|
|
5506cea |
my_components += \
|
|
|
5506cea |
- component/shell/source/sessioninstall/losessioninstall \
|
|
|
5506cea |
component/ucb/source/ucp/gio/ucpgio
|
|
|
5506cea |
.END
|
|
|
5506cea |
|