|
 |
4fd0213 |
From cb7ad37354e6e189d540d14450cf733942b95da0 Mon Sep 17 00:00:00 2001
|
|
|
4fd0213 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
4fd0213 |
Date: Thu, 20 Feb 2014 11:37:33 +0000
|
|
|
4fd0213 |
Subject: [PATCH] rhel6 glib
|
|
|
4fd0213 |
|
|
|
4fd0213 |
Change-Id: I75ccb56e8eea821bc00dcf14e9852b929a87163e
|
|
|
4fd0213 |
---
|
|
|
4fd0213 |
Repository.mk | 1 -
|
|
|
4fd0213 |
postprocess/Rdb_services.mk | 1 -
|
|
|
4fd0213 |
shell/Module_shell.mk | 8 --------
|
|
|
4fd0213 |
3 files changed, 10 deletions(-)
|
|
|
4fd0213 |
mode change 100755 => 100644 postprocess/Rdb_services.mk
|
|
|
4fd0213 |
|
|
|
6b7a722 |
diff --git a/Repository.mk b/Repository.mk
|
|
|
4fd0213 |
index 3977ac3..14b01ff 100644
|
|
|
6b7a722 |
--- a/Repository.mk
|
|
|
6b7a722 |
+++ b/Repository.mk
|
|
|
4fd0213 |
@@ -193,7 +193,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
|
|
 |
1ed7cb0 |
$(if $(ENABLE_GTK3),vclplug_gtk3) \
|
|
|
1ed7cb0 |
$(if $(ENABLE_GCONF),gconfbe1) \
|
|
|
1ed7cb0 |
$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
|
|
|
1ed7cb0 |
- $(if $(ENABLE_GIO),losessioninstall) \
|
|
|
1ed7cb0 |
$(if $(ENABLE_GIO),ucpgio1) \
|
|
|
1ed7cb0 |
$(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
|
|
|
6b7a722 |
))
|
|
|
6b7a722 |
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
|
|
|
4fd0213 |
old mode 100755
|
|
|
4fd0213 |
new mode 100644
|
|
|
4fd0213 |
index b72f4abc..90e4711
|
|
|
6b7a722 |
--- a/postprocess/Rdb_services.mk
|
|
|
6b7a722 |
+++ b/postprocess/Rdb_services.mk
|
|
|
4fd0213 |
@@ -193,7 +193,6 @@ $(eval $(call gb_Rdb_add_components,services,\
|
|
|
6b7a722 |
shell/source/backends/gconfbe/gconfbe1 \
|
|
|
6b7a722 |
) \
|
|
|
6b7a722 |
$(if $(ENABLE_GIO), \
|
|
|
6b7a722 |
- shell/source/sessioninstall/losessioninstall \
|
|
|
6b7a722 |
ucb/source/ucp/gio/ucpgio \
|
|
|
6b7a722 |
) \
|
|
|
6b7a722 |
$(if $(ENABLE_GNOMEVFS), \
|
|
|
4fd0213 |
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
|
|
|
4fd0213 |
index 3461381..eb74104 100644
|
|
|
4fd0213 |
--- a/shell/Module_shell.mk
|
|
|
4fd0213 |
+++ b/shell/Module_shell.mk
|
|
|
4fd0213 |
@@ -14,14 +14,6 @@ $(eval $(call gb_Module_add_targets,shell,\
|
|
|
4fd0213 |
Library_localebe \
|
|
|
4fd0213 |
))
|
|
|
4fd0213 |
|
|
|
4fd0213 |
-ifeq ($(OS),LINUX)
|
|
|
4fd0213 |
-ifeq ($(ENABLE_GIO),TRUE)
|
|
|
4fd0213 |
-$(eval $(call gb_Module_add_targets,shell,\
|
|
|
4fd0213 |
- Library_losessioninstall \
|
|
|
4fd0213 |
-))
|
|
|
4fd0213 |
-endif
|
|
|
4fd0213 |
-endif
|
|
|
4fd0213 |
-
|
|
|
4fd0213 |
ifeq ($(ENABLE_GCONF),TRUE)
|
|
|
4fd0213 |
$(eval $(call gb_Module_add_targets,shell,\
|
|
|
4fd0213 |
Library_gconfbe \
|
|
|
4fd0213 |
--
|
|
|
4fd0213 |
1.8.5.3
|
|
|
4fd0213 |
|