diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-03-24 03:52:36 +0000 |
commit | 6f32add9a75efb180e462ffbdb0b080bc88088e3 (patch) | |
tree | 0fc7af36e22fc0dc7c1dc8aacabf6fe117e881da /devel/pkg-config/files | |
parent | b8d245fedd5842fb6d68d0bdc6539885555a84e3 (diff) | |
download | ports-6f32add9a75efb180e462ffbdb0b080bc88088e3.tar.gz ports-6f32add9a75efb180e462ffbdb0b080bc88088e3.zip |
The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for
FreeBSD. The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ . On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media. Work
is also underway to tie webkit more closely into GNOME. As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.
This release would not have been possible without the contributions and
testing efforts of the following people:
Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon
Notes
Notes:
svn path=/head/; revision=209647
Diffstat (limited to 'devel/pkg-config/files')
-rw-r--r-- | devel/pkg-config/files/patch-glib-1.2.10_Makefile.in (renamed from devel/pkg-config/files/patch-glib-1.2.8::Makefile.in) | 4 | ||||
-rw-r--r-- | devel/pkg-config/files/patch-pkg.c | 14 | ||||
-rw-r--r-- | devel/pkg-config/files/patch-pkg_conflicts | 29 |
3 files changed, 16 insertions, 31 deletions
diff --git a/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in b/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in index 330415ed6f92..0031087c84c1 100644 --- a/devel/pkg-config/files/patch-glib-1.2.8::Makefile.in +++ b/devel/pkg-config/files/patch-glib-1.2.10_Makefile.in @@ -1,5 +1,5 @@ ---- glib-1.2.8/Makefile.in.orig Tue Apr 12 13:51:56 2005 -+++ glib-1.2.8/Makefile.in Tue Apr 12 13:52:41 2005 +--- glib-1.2.10/Makefile.in.orig Tue Apr 12 13:51:56 2005 ++++ glib-1.2.10/Makefile.in Tue Apr 12 13:52:41 2005 @@ -727,7 +727,6 @@ installdirs-am: diff --git a/devel/pkg-config/files/patch-pkg.c b/devel/pkg-config/files/patch-pkg.c new file mode 100644 index 000000000000..48315feb9589 --- /dev/null +++ b/devel/pkg-config/files/patch-pkg.c @@ -0,0 +1,14 @@ +diff -Naur pkg-config-0.23-old/pkg.c pkg-config-0.23-new/pkg.c +--- pkg-config-0.23-old/pkg.c 2008-01-16 13:59:49.000000000 -0800 ++++ pkg.c 2008-01-22 15:00:55.000000000 -0800 +@@ -483,6 +483,10 @@ + g_string_append (str, pcsysrootdir); + g_string_append (str, tmpstr+2); + } ++ else ++ { ++ g_string_append (str, tmpstr); ++ } + } + else + { diff --git a/devel/pkg-config/files/patch-pkg_conflicts b/devel/pkg-config/files/patch-pkg_conflicts deleted file mode 100644 index 471fd02b24bc..000000000000 --- a/devel/pkg-config/files/patch-pkg_conflicts +++ /dev/null @@ -1,29 +0,0 @@ -diff -up pkg-config-0.22/pkg.c.conflicts pkg-config-0.22/pkg.c ---- pkg.c.conflicts 2007-11-15 23:56:26.000000000 -0500 -+++ pkg.c 2007-11-15 23:57:26.000000000 -0500 -@@ -821,7 +821,7 @@ verify_package (Package *pkg) - */ - - recursive_fill_list (pkg, get_requires_private, &requires); -- recursive_fill_list (pkg, get_conflicts, &conflicts); -+ conflicts = get_conflicts (pkg); - - requires_iter = requires; - while (requires_iter != NULL) -@@ -843,7 +843,7 @@ verify_package (Package *pkg) - req->version, req->name, - ver->name, - comparison_to_str (ver->comparison), -- ver->version, -+ ver->version ? ver->version : "(any)", - ver->owner->name, - ver->owner->version); - -@@ -857,7 +857,6 @@ verify_package (Package *pkg) - } - - g_slist_free (requires); -- g_slist_free (conflicts); - - /* We make a list of system directories that gcc expects so we can remove - * them. |