File libbonobo-lib64.patch of Package libbonobo

Overview Repositories Revisions Requests Users Attributes Meta

File libbonobo-lib64.patch of Package libbonobo

Index: libbonobo-2.32.0/bonobo-activation-config.xml
===================================================================
--- libbonobo-2.32.0.orig/bonobo-activation-config.xml
+++ libbonobo-2.32.0/bonobo-activation-config.xml
@@ -3,6 +3,7 @@
 <oafconfig>
 
 <searchpath>
+    <item>/usr/local/lib64/bonobo/servers</item>
     <item>/usr/local/lib/bonobo/servers</item>
     
     
Index: libbonobo-2.32.0/activation-server/Makefile.am
===================================================================
--- libbonobo-2.32.0.orig/activation-server/Makefile.am
+++ libbonobo-2.32.0/activation-server/Makefile.am
@@ -12,7 +12,8 @@ INCLUDES=					\
 	-I$(top_builddir)/bonobo-activation	\
 	-I$(top_srcdir)/bonobo-activation	\
 	-DPREFIX=\""$(prefix)"\"		\
-	-DSERVERINFODIR=\"$(libdir)/bonobo/servers\" \
+	-DSERVERINFODIR=\"$(libexecdir)/bonobo/servers\" \
+	-DSERVERINFO64DIR=\"$(libdir)/bonobo/servers\" \
         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
 	$(SERVER_CFLAGS)			\
 	$(WARN_CFLAGS)				\
Index: libbonobo-2.32.0/activation-server/Makefile.in
===================================================================
--- libbonobo-2.32.0.orig/activation-server/Makefile.in
+++ libbonobo-2.32.0/activation-server/Makefile.in
@@ -336,7 +336,8 @@ INCLUDES = \
 	-I$(top_builddir)/bonobo-activation	\
 	-I$(top_srcdir)/bonobo-activation	\
 	-DPREFIX=\""$(prefix)"\"		\
-	-DSERVERINFODIR=\"$(libdir)/bonobo/servers\" \
+	-DSERVERINFODIR=\"$(libexecdir)/bonobo/servers\" \
+	-DSERVERINFO64DIR=\"$(libdir)/bonobo/servers\" \
         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
 	$(SERVER_CFLAGS)			\
 	$(WARN_CFLAGS)				\
Index: libbonobo-2.32.0/activation-server/activation-server-main.c
===================================================================
--- libbonobo-2.32.0.orig/activation-server/activation-server-main.c
+++ libbonobo-2.32.0/activation-server/activation-server-main.c
@@ -239,6 +239,10 @@ build_src_dir (void)
                         g_string_append (gnome_od_source_dir,
                                          gnome_dirs[i]);
                         g_string_append (gnome_od_source_dir,
+                                         "/lib64/bonobo/servers" G_SEARCHPATH_SEPARATOR_S);
+                        g_string_append (gnome_od_source_dir,
+                                         gnome_dirs[i]);
+                        g_string_append (gnome_od_source_dir,
                                          "/lib/bonobo/servers" G_SEARCHPATH_SEPARATOR_S);
                 }
                 g_strfreev (gnome_dirs);
@@ -248,6 +252,8 @@ build_src_dir (void)
 		g_string_free (gnome_od_source_dir, TRUE);
         }
 
+        g_string_append (real_od_source_dir, SERVERINFO64DIR);
+        g_string_append_c (real_od_source_dir, G_SEARCHPATH_SEPARATOR);
         g_string_append (real_od_source_dir, SERVERINFODIR);
 
         return real_od_source_dir;
Index: libbonobo-2.32.0/activation-server/bonobo-activation-server.1
===================================================================
--- libbonobo-2.32.0.orig/activation-server/bonobo-activation-server.1
+++ libbonobo-2.32.0/activation-server/bonobo-activation-server.1
@@ -7,7 +7,7 @@ bonobo-activation-server \- GNOME compon
 This application tracks information about installed components and brokers
 components, in conjunction with its client library; libbonobo-activation.
 
-It reads the component descriptions from ${prefix}/lib/bonobo/servers/*.server.
+It reads the component descriptions from ${prefix}/lib64/bonobo/servers/*.server and ${prefix}/lib/bonobo/servers/*.server.
 These files provide an XML description of a components capabilities which can be
 queried and manipulated by clients from the client library.
 
Index: libbonobo-2.32.0/utils/bonobo-slay.in
===================================================================
--- libbonobo-2.32.0.orig/utils/bonobo-slay.in
+++ libbonobo-2.32.0/utils/bonobo-slay.in
@@ -64,13 +64,16 @@ chomp($username);
 
 # get Bonobo files
 #
-@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" );
+@bonobo_dirs = ( "@prefix@/lib64/bonobo/servers", "@prefix@/lib/bonobo/servers" );
 foreach $dir (split(':', $ENV{'BONOBO_ACTIVATION_INFO_PATH'})) {
 	if (-d $dir) {
 		push @bonobo_dirs, $dir;
 	}
 }
 foreach $dir (split(':', $ENV{'GNOME2_PATH'})) {
+	if (-d "$dir/lib64/bonobo/servers") {
+		push @bonobo_dirs, "$dir/lib64/bonobo/servers";
+	}
 	if (-d "$dir/lib/bonobo/servers") {
 		push @bonobo_dirs, "$dir/lib/bonobo/servers";
 	}

Places

File libbonobo-lib64.patch of Package libbonobo

Places