From 4acc6fb2a411b291c9c210d82bafe7c62e71c77d Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 24 Oct 2007 23:37:25 +0000
Subject: Presenting GNOME 2.20.1 and all related works for FreeBSD.  The
 official GNOME 2.20 release notes can be found at
 http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
 includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338
---
 x11-wm/metacity/files/patch-configure | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'x11-wm/metacity/files/patch-configure')

diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure
index 9c810e0e2c36..f38f1ce514c1 100644
--- a/x11-wm/metacity/files/patch-configure
+++ b/x11-wm/metacity/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Mar 13 23:11:45 2007
-+++ configure	Tue Mar 13 23:13:04 2007
-@@ -29363,7 +29363,6 @@ echo "${ECHO_T}$have_xrender" >&6; }
+--- configure.orig	2007-09-16 11:47:50.000000000 -0400
++++ configure	2007-09-16 11:48:17.000000000 -0400
+@@ -28087,7 +28087,6 @@
  
    if test x$have_xrender = xyes; then
       echo "Building with Render"
@@ -8,10 +8,10 @@
    fi
  fi ## have_composite
  
-@@ -34431,7 +34430,7 @@ metacity-$VERSION:
+@@ -33175,7 +33174,7 @@
  "
  
- METACITY_MINOR_VERSION=18
+ METACITY_MINOR_VERSION=20
 -if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then
 +if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then
     stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2))
-- 
cgit v1.2.3