diff options
Diffstat (limited to 'devel/libbonobo/files')
8 files changed, 154 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..db8d816a8 --- /dev/null +++ b/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c @@ -0,0 +1,11 @@ +--- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Oct 18 06:15:11 2002 ++++ bonobo-activation/bonobo-activation-fork-server.c Sat Oct 19 15:35:03 2002 +@@ -364,6 +364,8 @@ + } else if ((childpid = fork ())) { + _exit (0); /* de-zombifier process, just exit */ + } else { ++ sigprocmask (SIG_SETMASK, &omask, NULL); ++ + setenv_activation_environment (environment); + + if (od_iorstr != NULL) { diff --git a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-client.c b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-client.c new file mode 100644 index 000000000..f6e093454 --- /dev/null +++ b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-client.c @@ -0,0 +1,20 @@ +--- bonobo-activation/bonobo-activation-client.c.orig Wed Dec 10 11:53:32 2003 ++++ bonobo-activation/bonobo-activation-client.c Wed Dec 10 12:00:19 2003 +@@ -197,6 +197,8 @@ + return result; + } + ++extern char **environ; ++ + void + bonobo_activation_register_client (Bonobo_ActivationContext context, + CORBA_Environment *ev) +@@ -217,7 +219,7 @@ + bonobo_activation_hostname_get ()); + + /* send environment to activation server */ +- client_env._buffer = __environ; ++ client_env._buffer = environ; + if (client_env._buffer) { + for (i = 0; client_env._buffer[i]; ++i); + client_env._length = i; diff --git a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c new file mode 100644 index 000000000..52cfebcd9 --- /dev/null +++ b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c @@ -0,0 +1,18 @@ +--- bonobo-activation/bonobo-activation-init.c.orig Sat Jun 14 02:09:52 2003 ++++ bonobo-activation/bonobo-activation-init.c Sat Jun 14 02:10:13 2003 +@@ -34,6 +34,7 @@ + #include "bonobo-activation-private.h" + #include "bonobo-activation-register.h" + #include "bonobo-activation-version.h" ++#include <sys/types.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <fcntl.h> +@@ -44,7 +45,6 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/socket.h> +-#include <sys/types.h> + #include <sys/wait.h> + #include <unistd.h> + diff --git a/devel/libbonobo/files/patch-ltmain.sh b/devel/libbonobo/files/patch-ltmain.sh new file mode 100644 index 000000000..2719aeb6c --- /dev/null +++ b/devel/libbonobo/files/patch-ltmain.sh @@ -0,0 +1,51 @@ +--- ltmain.sh.orig Thu Jun 5 08:09:04 2003 ++++ ltmain.sh Sat Jun 14 01:36:34 2003 +@@ -1280,7 +1280,7 @@ + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd* | *-*-freebsd*) ++ *-*-openbsd* | *-*-freebsd4*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1290,8 +1290,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -3000,6 +3008,9 @@ + # problems, so we reset it completely + verstring= + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + verstring="0.0" + ;; +@@ -5428,10 +5439,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/devel/libbonobo/files/patch-server::Makefile.in b/devel/libbonobo/files/patch-server::Makefile.in new file mode 100644 index 000000000..c821efc8e --- /dev/null +++ b/devel/libbonobo/files/patch-server::Makefile.in @@ -0,0 +1,11 @@ +--- activation-server/Makefile.in.orig Wed May 7 16:36:09 2003 ++++ activation-server/Makefile.in Wed May 7 16:36:51 2003 +@@ -159,7 +159,7 @@ + -I$(top_builddir) \ + -I$(top_builddir)/bonobo-activation \ + -I$(top_srcdir)/bonobo-activation \ +- -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..f1a74a4a3 --- /dev/null +++ b/devel/libbonobo/files/patch-server::activation-server-main.c @@ -0,0 +1,11 @@ +--- activation-server/activation-server-main.c.orig Fri Oct 18 06:15:12 2002 ++++ activation-server/activation-server-main.c Sat Nov 9 01:50:36 2002 +@@ -127,7 +127,7 @@ + g_string_append (gnome_od_source_dir, + gnome_dirs[i]); + g_string_append (gnome_od_source_dir, +- "/lib/bonobo/servers:"); ++ "/libdata/bonobo/servers:"); + } + g_strfreev (gnome_dirs); + g_string_append_c (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"; + } + } + |