From 5e8d8f18cc63873f7a52072be0da9b701f8189ac Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Sat, 20 Sep 2003 18:51:15 +0000 Subject: [PATCH] Remove instructions for differentiating between the GNOME 1 and GNOME 2 desktops. --- en/gnome/docs/porting.sgml | 54 ++++++++++++++------------------------ 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/en/gnome/docs/porting.sgml b/en/gnome/docs/porting.sgml index 27f9e98052..8e83d76aaa 100644 --- a/en/gnome/docs/porting.sgml +++ b/en/gnome/docs/porting.sgml @@ -1,6 +1,6 @@ - + %gnomeincludes; %includes; @@ -92,40 +92,26 @@ USE_GNOME= gnomehack gnomeprefix libgnomeui atspi libwnck

GNOME 1 Desktop vs. GNOME 2 Desktop

-

Certain aspects of the GNOME 1 desktop environment are - incompatible with certain aspects of the GNOME 2 desktop - environment. To ensure that a user does not compile a GNOME 2 - component against their GNOME 1 environment (or vice versa), - the user may set GNOME_DESKTOP_VERSION in their - /etc/make.conf. Even if a user has not explicitly set - GNOME_DESKTOP_VERSION, the FreeBSD GNOME architecture will - attempt to automatically deduce the desktop currently installed by - examining which components are already installed.

- -

If compilation of a GNOME 2 port is attempted on a - GNOME_DESKTOP_VERSION=1 system, the compilation will - immediately abort and the user will be informed of the incompatability.

+

In the beginning, there was only GNOME 1. When the + GNOME 2 desktop came around, maximum backwards compatability + was ensured, within reason. GNOME 1 applications can run + fine under the GNOME 2 desktop, provided that the applications + do not utilize functionality specific to the GNOME 1 desktop + environment.

+ +

The GNOME 1 desktop, and all applications that will not run + under the GNOME 2 desktop, have been removed from the ports + tree.

+ +

What this means for you, as an application porter, is simply that + you should not add GNOME 1-specific applications to the + ports tree.

-

If your application can handle both GNOME 1 and GNOME 2 - compilation, you may check the value of GNOME_DESKTOP_VERSION to - determine for which desktop your port is compiling. For example:

- - 
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack
-
-.if (${GNOME_DESKTOP_VERSION} == "1")
-	CONFIGURE_ARGS+=		--with-gnome
-	USE_GNOME+=		gtk12 libpanel
-.else
-	CONFIGURE_ARGS+=		--with-gnome2
-	USE_GNOME+=		gtk20 gnomepanel
-.endif
-
- -

In this example, specific CONFIGURE_ARGS and USE_GNOME - components are set depending upon which GNOME_DESKTOP_VERSION is - installed or preferred by the user.

+

If you wish to determine which version of the GNOME desktop + environment is present on a user's machine, you can check the value + of GNOME_DESKTOP_VERSION. This variable is set to either + "1" or "2" depending upon whether the + GNOME 1 or GNOME 2 desktop is installed.

Optional GNOME Dependencies

If your port can optionally use GNOME, you must set