diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-06-23 07:48:51 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-06-23 07:48:51 +0800 |
| commit | cf591ac9ebd272f5575e950fea53d7003cfa5bf6 (patch) | |
| tree | 616948d34698787d975e047949d4354993783583 /devel/libbonobo/files | |
| parent | f0b7b93e02a500950ba6020a31049da5aef33170 (diff) | |
| download | marcuscom-ports-cf591ac9ebd272f5575e950fea53d7003cfa5bf6.tar.gz marcuscom-ports-cf591ac9ebd272f5575e950fea53d7003cfa5bf6.tar.zst marcuscom-ports-cf591ac9ebd272f5575e950fea53d7003cfa5bf6.zip | |
Update to 2.19.4.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9066 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/libbonobo/files')
5 files changed, 69 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-activation-server_object-directory-corba.c b/devel/libbonobo/files/patch-activation-server_object-directory-corba.c new file mode 100644 index 000000000..3fa67848d --- /dev/null +++ b/devel/libbonobo/files/patch-activation-server_object-directory-corba.c @@ -0,0 +1,15 @@ +--- activation-server/object-directory-corba.c.orig Mon Aug 14 14:27:54 2006 ++++ activation-server/object-directory-corba.c Thu Oct 26 09:25:50 2006 +@@ -732,8 +732,10 @@ + g_object_set_data ( + G_OBJECT (cnx), "object_count", GUINT_TO_POINTER (1)); + +- ORBit_small_listen_for_broken +- (object, G_CALLBACK (active_server_cnx_broken), NULL); ++ g_signal_connect ( ++ cnx, "broken", ++ G_CALLBACK (active_server_cnx_broken), ++ NULL); + } + } else + g_assert (!strcmp (iid, NAMING_CONTEXT_IID) || 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"; + } + } + |