Date: 08 Nov 2002 03:29:11 -0500 From: Joe Marcus Clarke <marcus@FreeBSD.org> To: FreeBSD GNOME Users <gnome@FreeBSD.org> Subject: bonobo-activation-1.0.4 Take 2 Message-ID: <1036744151.97220.18.camel@shumai.marcuscom.com>
next in thread | raw e-mail | index | archive | help
--=-krN8vQQUuYdoJSt1T8lo Content-Type: multipart/mixed; boundary="=-/X2MuRHnJ1Gp9T1dmQwn" --=-/X2MuRHnJ1Gp9T1dmQwn Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Okay, I think I have a working version of bonobo-activation 1.0.4.=20 Attached is the diff to the current port. If you can, please test this, and let me know how it goes. I want to avoid submitting another broken version to the tree then bumping PORTEPOCH yet again. Thanks. Joe --=20 Joe Marcus Clarke FreeBSD GNOME Team :: marcus@FreeBSD.org http://www.FreeBSD.org/gnome --=-/X2MuRHnJ1Gp9T1dmQwn Content-Disposition: attachment; filename=bonobo-activation.diff Content-Type: text/x-patch; name=bonobo-activation.diff; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable diff -ruN bonobo-activation.orig/Makefile bonobo-activation/Makefile --- bonobo-activation.orig/Makefile Fri Nov 8 03:24:50 2002 +++ bonobo-activation/Makefile Fri Nov 8 03:18:19 2002 @@ -6,7 +6,7 @@ # =20 PORTNAME=3D bonobo-activation -PORTVERSION=3D 1.0.3 +PORTVERSION=3D 1.0.4 PORTEPOCH=3D 1 CATEGORIES=3D devel MASTER_SITES=3D ${MASTER_SITE_GNOME} diff -ruN bonobo-activation.orig/distinfo bonobo-activation/distinfo --- bonobo-activation.orig/distinfo Fri Nov 8 03:24:50 2002 +++ bonobo-activation/distinfo Fri Nov 8 03:18:22 2002 @@ -1 +1 @@ -MD5 (gnome2/bonobo-activation-1.0.3.tar.bz2) =3D 79b65c0e35fa22eb2b73346b7= 490f25f +MD5 (gnome2/bonobo-activation-1.0.4.tar.bz2) =3D 2b68d7a94d195cbcca15fcb63= e55fb6a diff -ruN bonobo-activation.orig/files/patch-bonobo-activation::bonobo-acti= vation-fork-server.c bonobo-activation/files/patch-bonobo-activation::bonob= o-activation-fork-server.c --- bonobo-activation.orig/files/patch-bonobo-activation::bonobo-activation= -fork-server.c Fri Nov 8 03:24:50 2002 +++ bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork= -server.c Fri Nov 8 03:20:21 2002 @@ -1,11 +1,11 @@ ---- bonobo-activation/bonobo-activation-fork-server.c.orig Wed Jul 24 16:4= 6:27 2002 -+++ bonobo-activation/bonobo-activation-fork-server.c Wed Jul 24 16:47:00 = 2002 -@@ -349,6 +349,8 @@ +--- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Nov 8 03:1= 9:52 2002 ++++ bonobo-activation/bonobo-activation-fork-server.c Fri Nov 8 03:20:04 = 2002 +@@ -396,6 +396,8 @@ } else if ((childpid =3D fork ())) { _exit (0); /* de-zombifier process, just exit */ } else { + sigprocmask (SIG_SETMASK, &omask, NULL); + - if (display !=3D NULL) { - bonobo_activation_setenv ("DISPLAY", display); - } + if (display) + bonobo_activation_setenv ("DISPLAY", display); + if (session_manager) diff -ruN bonobo-activation.orig/files/patch-server::Makefile.in bonobo-act= ivation/files/patch-server::Makefile.in --- bonobo-activation.orig/files/patch-server::Makefile.in Fri Nov 8 03:24= :50 2002 +++ bonobo-activation/files/patch-server::Makefile.in Fri Nov 8 03:19:38 2= 002 @@ -1,11 +1,11 @@ ---- server/Makefile.in.orig Wed Jul 24 16:56:33 2002 -+++ server/Makefile.in Wed Jul 24 16:56:52 2002 -@@ -147,7 +147,7 @@ - bin_PROGRAMS =3D activation-client - libexec_PROGRAMS =3D bonobo-activation-server -=20 --INCLUDES =3D -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir= )/bonobo-activation -I$(top_srcdir)/bonobo-activation -DSERVERINFODIR=3D\= "$(prefix)/libdata/bonobo/servers\" -DSERVER_LOCALEDIR=3D\""${prefi= x}/${DATADIRNAME}/locale"\" $(SERVER_CFLAGS) -DSERVER_CONFDIR=3D\"$(sys= confdir)\" -DG_DISABLE_DEPRECATED $(NULL) -+INCLUDES =3D -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir= )/bonobo-activation -I$(top_srcdir)/bonobo-activation -DSERVERINFODIR=3D\= "$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCAL= BASE}/libdata/bonobo/servers\" -DSERVER_LOCALEDIR=3D\""${prefix}/${= DATADIRNAME}/locale"\" $(SERVER_CFLAGS) -DSERVER_CONFDIR=3D\"$(sysconfd= ir)\" -DG_DISABLE_DEPRECATED $(NULL) -=20 -=20 - bonobo_activation_server_SOURCES =3D activation-server-corba-extensions= .c activation-server-corba-extensions.h activation-context-query.h = activation-context-query.c activation-context-query-lexer.c activa= tion-context-query-parser.c activation-context-query-parser.h activat= ion-context-corba.c object-directory-corba.c object-directory-load.= c object-directory-activate.c object-directory-config-file.c o= bject-directory-config-file.h activation-server-main.c server.h +--- server/Makefile.in.orig Fri Nov 8 03:18:57 2002 ++++ server/Makefile.in Fri Nov 8 03:19:22 2002 +@@ -154,7 +154,7 @@ + -I$(top_builddir) \ + -I$(top_builddir)/bonobo-activation \ + -I$(top_srcdir)/bonobo-activation \ +- -DSERVERINFODIR=3D\"$(prefix)/libdata/bonobo/servers\" \ ++ -DSERVERINFODIR=3D\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/= bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \ + -DSERVER_LOCALEDIR=3D\""${prefix}/${DATADIRNAME}/locale"\" \ + $(SERVER_CFLAGS) \ + -DSERVER_CONFDIR=3D\"$(sysconfdir)\" \ diff -ruN bonobo-activation.orig/files/patch-server::activation-server-main= .c bonobo-activation/files/patch-server::activation-server-main.c --- bonobo-activation.orig/files/patch-server::activation-server-main.c Fri= Nov 8 03:24:50 2002 +++ bonobo-activation/files/patch-server::activation-server-main.c Fri Nov = 8 03:21:20 2002 @@ -1,9 +1,6 @@ - -$FreeBSD: ports/devel/bonobo-activation/files/patch-server::activation-ser= ver-main.c,v 1.2 2002/05/28 16:08:17 marcus Exp $ - ---- server/activation-server-main.c.orig Tue May 14 04:51:55 2002 -+++ server/activation-server-main.c Mon May 27 13:36:25 2002 -@@ -127,7 +127,7 @@ +--- server/activation-server-main.c.orig Tue Oct 29 05:51:19 2002 ++++ server/activation-server-main.c Fri Nov 8 03:21:04 2002 +@@ -131,7 +131,7 @@ g_string_append (gnome_od_source_dir, gnome_dirs[i]); g_string_append (gnome_od_source_dir, @@ -12,3 +9,12 @@ } g_strfreev (gnome_dirs); g_string_append_c (real_od_source_dir, ':'); +@@ -197,6 +197,8 @@ + * terminal, etc. + */ + setsid (); ++ ++ unsetenv ("SESSION_MANAGER"); + =20 + /* internationalization. */ + setlocale (LC_ALL, ""); diff -ruN bonobo-activation.orig/files/patch-temp bonobo-activation/files/p= atch-temp --- bonobo-activation.orig/files/patch-temp Fri Nov 8 03:24:50 2002 +++ bonobo-activation/files/patch-temp Wed Dec 31 19:00:00 1969 @@ -1,15 +0,0 @@ -This patch corrects an incompatibility problem with bison 1.50 and above. -It was taken from bonobo-activation CVS, and can be removed in the next re= lease -of the port. - ---- server/activation-context-query-parser.y.orig Sat Oct 26 16:51:45 2002 -+++ server/activation-context-query-parser.y Sat Oct 26 16:52:00 2002 -@@ -155,7 +155,7 @@ - stringlist: P_CONST_STRING { $$ =3D g_slist_prepend (NULL, $1); } - | stringlist COMMA P_CONST_STRING { $$ =3D g_slist_append ($1, $3); }; -=20 --expr_variable: P_DOLLAR P_CONST_ID { $$ =3D qexp_variable_new ($2); } -+expr_variable: P_DOLLAR P_CONST_ID { $$ =3D qexp_variable_new ($2); }; -=20 - expr_function: P_CONST_ID LPAREN exprlist RPAREN { $$ =3D qexp_function_n= ew ($1, $3); } - | P_CONST_ID LPAREN RPAREN { $$ =3D qexp_function_new ($1, NULL); } --=-/X2MuRHnJ1Gp9T1dmQwn-- --=-krN8vQQUuYdoJSt1T8lo Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.0 (FreeBSD) iD8DBQA9y3XWb2iPiv4Uz4cRAqqFAKCQjZ+nwUA6joH+Ocod+ON1dzfafQCglcYr F7pPdMFNe02gL4c0VwhTdho= =xSab -----END PGP SIGNATURE----- --=-krN8vQQUuYdoJSt1T8lo-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1036744151.97220.18.camel>