diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-16 07:23:05 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-16 07:23:05 +0800 |
| commit | 1651b7d60da5114355180e637f2f9e6ec4cefead (patch) | |
| tree | 3630d731e28ca19aa28be49feca5494c6f283c53 /devel/libbonobo/files | |
| parent | 604c25d6405334a83ea468f765d91578bf0e850f (diff) | |
| download | marcuscom-ports-1651b7d60da5114355180e637f2f9e6ec4cefead.tar marcuscom-ports-1651b7d60da5114355180e637f2f9e6ec4cefead.tar.gz marcuscom-ports-1651b7d60da5114355180e637f2f9e6ec4cefead.tar.bz2 marcuscom-ports-1651b7d60da5114355180e637f2f9e6ec4cefead.tar.lz marcuscom-ports-1651b7d60da5114355180e637f2f9e6ec4cefead.tar.xz marcuscom-ports-1651b7d60da5114355180e637f2f9e6ec4cefead.tar.zst marcuscom-ports-1651b7d60da5114355180e637f2f9e6ec4cefead.zip | |
- Update to 2.13.0
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5143 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/libbonobo/files')
5 files changed, 75 insertions, 0 deletions
diff --git a/devel/libbonobo/files/patch-Makefile.in b/devel/libbonobo/files/patch-Makefile.in new file mode 100644 index 000000000..e8a60bd28 --- /dev/null +++ b/devel/libbonobo/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Wed May 7 13:42:52 2003 ++++ Makefile.in Wed May 7 13:43:30 2003 +@@ -149,7 +149,7 @@ + SUBDIRS = \ + idl bonobo-activation bonobo \ + activation-server monikers \ +- utils samples tests doc po ++ utils samples doc po + + + libincludedir = $(includedir)/libbonobo-2.0 diff --git a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c new file mode 100644 index 000000000..ced10add3 --- /dev/null +++ b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-fork-server.c @@ -0,0 +1,21 @@ +--- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Sep 9 17:20:15 2005 ++++ bonobo-activation/bonobo-activation-fork-server.c Fri Sep 9 17:31:52 2005 +@@ -359,10 +359,18 @@ + g_source_destroy (source); + g_source_unref (source); + ++ g_io_channel_shutdown (ai.ioc, FALSE, NULL); + g_io_channel_unref (ai.ioc); + + if (use_new_loop) + g_main_context_unref (context); ++ ++ close (iopipes[1]); ++ ++ g_strfreev(newenv); ++ ++ if (fd_arg != 0) ++ g_free ((char *) cmd[fd_arg]); + + return CORBA_OBJECT_NIL; + } diff --git a/devel/libbonobo/files/patch-server::Makefile.in b/devel/libbonobo/files/patch-server::Makefile.in new file mode 100644 index 000000000..f07320f9b --- /dev/null +++ b/devel/libbonobo/files/patch-server::Makefile.in @@ -0,0 +1,11 @@ +--- activation-server/Makefile.in.orig Fri Aug 19 16:24:14 2005 ++++ activation-server/Makefile.in Fri Aug 19 16:25:12 2005 +@@ -225,7 +225,7 @@ + -I$(top_builddir)/bonobo-activation \ + -I$(top_srcdir)/bonobo-activation \ + -DPREFIX=\""$(prefix)"\" \ +- -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" \ ++ -DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \ + -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \ + $(SERVER_CFLAGS) \ + -DSERVER_CONFDIR=\"$(sysconfdir)\" \ diff --git a/devel/libbonobo/files/patch-server::activation-server-main.c b/devel/libbonobo/files/patch-server::activation-server-main.c new file mode 100644 index 000000000..0f7e7cd3f --- /dev/null +++ b/devel/libbonobo/files/patch-server::activation-server-main.c @@ -0,0 +1,11 @@ +--- activation-server/activation-server-main.c.orig Fri Apr 15 20:37:07 2005 ++++ activation-server/activation-server-main.c Fri Aug 19 16:27:59 2005 +@@ -197,7 +197,7 @@ build_src_dir (void) + g_string_append (gnome_od_source_dir, + gnome_dirs[i]); + g_string_append (gnome_od_source_dir, +- "/lib/bonobo/servers" G_SEARCHPATH_SEPARATOR_S); ++ "/libdata/bonobo/servers" G_SEARCHPATH_SEPARATOR_S); + } + g_strfreev (gnome_dirs); + g_string_append (real_od_source_dir, diff --git a/devel/libbonobo/files/patch-utils::bonobo-slay.in b/devel/libbonobo/files/patch-utils::bonobo-slay.in new file mode 100644 index 000000000..44212a041 --- /dev/null +++ b/devel/libbonobo/files/patch-utils::bonobo-slay.in @@ -0,0 +1,21 @@ +--- utils/bonobo-slay.in.orig Mon Mar 11 12:16:43 2002 ++++ utils/bonobo-slay.in Tue Apr 2 18:30:30 2002 +@@ -56,15 +56,15 @@ + + # get Bonobo files + # +-@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" ); ++@bonobo_dirs = ( "@prefix@/libdata/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/lib/bonobo/servers") { +- push @bonobo_dirs, "$dir/lib/bonobo/servers"; ++ if (-d "$dir/libdata/bonobo/servers") { ++ push @bonobo_dirs, "$dir/libdata/bonobo/servers"; + } + } + |