From 2e888090df932366008d6df290291622f9082f92 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Dec 15 2014 10:16:39 +0000 Subject: update rhel6 patches --- diff --git a/libreoffice-rhel6glib.patch b/libreoffice-rhel6glib.patch index 91b3948..45dedd5 100644 --- a/libreoffice-rhel6glib.patch +++ b/libreoffice-rhel6glib.patch @@ -41,7 +41,7 @@ diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 3461381..eb74104 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk -@@ -14,14 +14,6 @@ $(eval $(call gb_Module_add_targets,shell,\ +@@ -14,22 +14,6 @@ $(eval $(call gb_Module_add_targets,shell,\ Library_localebe \ )) @@ -53,9 +53,14 @@ index 3461381..eb74104 100644 -endif -endif - +-ifeq ($(OS),SOLARIS) +-ifeq ($(ENABLE_GIO),TRUE) +-$(eval $(call gb_Module_add_targets,shell,\ +- Library_losessioninstall \ +-)) +-endif +-endif +- ifeq ($(ENABLE_GCONF),TRUE) $(eval $(call gb_Module_add_targets,shell,\ Library_gconfbe \ --- -1.8.5.3 -