Date: Tue, 26 Nov 2002 13:22:02 -0800 From: "Bruce A. Mah" <bmah@FreeBSD.org> To: Joe Marcus Clarke <marcus@FreeBSD.org> Cc: bmah@FreeBSD.org, re@FreeBSD.org, FreeBSD GNOME Users <gnome@FreeBSD.org> Subject: Re: Making GNOME 2 the default for 5.0-RELEASE Message-ID: <200211262122.gAQLM2DK074212@intruder.bmah.org> In-Reply-To: <1038334589.323.21.camel@gyros> References: <1037907947.309.49.camel@gyros> <200211221637.gAMGb2hE024266@intruder.bmah.org> <1037985350.326.12.camel@gyros> <200211261731.gAQHVMPe071314@intruder.bmah.org> <1038334589.323.21.camel@gyros>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
If memory serves me right, Joe Marcus Clarke wrote:
> On Tue, 2002-11-26 at 12:31, Bruce A. Mah wrote:
> > sysinstall is harder. On, say, a 4.7 system, sysinstall has two=20
> > relevant items in the desktop config menu:
> >=20
> > GNOME + Sawfish
> > (Installs gnome and sawfish-gnome)
> > GNOME + Enlightenment
> > (Installs gnomecore and enlightenment)
>
> This should probably be changed to GNOME and GNOME + Enlightenment.=20
> Both would install GNOME (x11/gnome), but the latter would also install
> x11-wm/enlightenment.
OK, we'll fix this up later. :-)
> Yes, one entry for GNOME 2 that installs x11/gnome2. This will give the
> user the choice of either sawfish2 or metacity. I would call this entry
> simply GNOME 2.
Does this look OK to you? If so, I'll commit this, and we can test it
once we get the 5.0-RC1 package set put together.
Bruce.
Index: config.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/config.c,v
retrieving revision 1.204
diff -c -r1.204 config.c
*** config.c 13 Nov 2002 05:39:57 -0000 1.204
--- config.c 26 Nov 2002 18:27:01 -0000
***************
*** 603,623 ****
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde"))
write_root_xprofile("exec startkde\n");
}
! else if (!strcmp(desk, "gnome")) {
! ret = package_add("gnomecore");
! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
! ret = package_add("sawfish-gnome");
! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("sawfish"))
! write_root_xprofile("exec gnome-session\n");
! }
! }
! else if (!strcmp(desk, "enlightenment")) {
! ret = package_add("gnomecore");
! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
! ret = package_add("enlightenment");
! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
! write_root_xprofile("exec gnome-session\n");
! }
}
else if (!strcmp(desk, "afterstep")) {
ret = package_add("afterstep");
--- 603,612 ----
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde"))
write_root_xprofile("exec startkde\n");
}
! else if (!strcmp(desk, "gnome2")) {
! ret = package_add("gnome2");
! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session"))
! write_root_xprofile("exec gnome-session\n");
}
else if (!strcmp(desk, "afterstep")) {
ret = package_add("afterstep");
Index: menus.c
===================================================================
RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v
retrieving revision 1.353
diff -c -r1.353 menus.c
*** menus.c 4 Nov 2002 15:06:09 -0000 1.353
--- menus.c 26 Nov 2002 18:27:02 -0000
***************
*** 1090,1104 ****
NULL, dmenuExit },
{ "2 KDE", "The K Desktop Environment.",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" },
! { "3 GNOME + Sawfish", "GNOME + Sawfish window manager.",
! NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" },
! { "4 GNOME + Enlightenment","GNOME + The E window manager",
! NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" },
! { "5 Afterstep", "The Afterstep window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" },
! { "6 Windowmaker", "The Windowmaker window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" },
! { "7 fvwm", "The fvwm window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm2" },
{ NULL } },
};
--- 1090,1102 ----
NULL, dmenuExit },
{ "2 KDE", "The K Desktop Environment.",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" },
! { "3 GNOME 2", "The GNOME 2 Desktop Environment.",
! NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome2" },
! { "4 Afterstep", "The Afterstep window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" },
! { "5 Windowmaker", "The Windowmaker window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" },
! { "6 fvwm", "The fvwm window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm2" },
{ NULL } },
};
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.0 (FreeBSD)
Comment: Exmh version 2.5+ 20020506
iD8DBQE94+X62MoxcVugUsMRAqr+AJ41qRxZiXV7inxwVBI19Pw9WvCp/ACfX8p3
jsY5lO20ta2xEGQE8/KFrow=
=FNTv
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211262122.gAQLM2DK074212>