update to 2.28.1

This switches to the gnome-2.28 release branch.

5 files changed, 59 insertions, 14 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 62456d2927e..875614079f0 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.96 2009/08/26 19:56:57 sno Exp $
+# $NetBSD: Makefile,v 1.97 2009/10/22 17:15:35 drochner Exp $
 #
 
-DISTNAME=		gnome-desktop-2.26.3
-PKGREVISION=		1
+DISTNAME=		gnome-desktop-2.28.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -16,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake intltool msgfmt perl:run pkg-config
-USE_TOOLS+=		automake autoconf aclocal autoreconf m4
 USE_LIBTOOL=		yes
 
 AUTOCONF_REQD=		2.62
@@ -25,10 +23,6 @@ CONFIGURE_ARGS+=	--with-gnome-distributor="The NetBSD Foundation"
 
 BUILD_DEPENDS+=		gettext-m4>=0.14.6:../../devel/gettext-m4
 
-pre-configure:
-	cd ${WRKSRC} && autoconf -f
-	cd ${WRKSRC} && autoheader -f
-
 post-install:
 .for f in netbsd-logo-icon.png netbsd-logo-icon-transparent.png
 	${INSTALL_DATA} ${FILESDIR}/${f} ${DESTDIR}${PREFIX}/share/pixmaps/${f}
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index 349b43dd14b..87e42d50058 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2009/07/09 17:50:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.39 2009/10/22 17:15:35 drochner Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
 include/gnome-desktop-2.0/libgnome/gnome-desktop-utils.h
@@ -36,6 +36,7 @@ share/gnome/help/fdl/fr/fdl.xml
 share/gnome/help/fdl/hu/fdl.xml
 share/gnome/help/fdl/ko/fdl.xml
 share/gnome/help/fdl/oc/fdl.xml
+share/gnome/help/fdl/pl/fdl.xml
 share/gnome/help/fdl/sv/fdl.xml
 share/gnome/help/fdl/uk/fdl.xml
 share/gnome/help/fdl/vi/fdl.xml
@@ -79,6 +80,7 @@ share/gtk-doc/html/gnome-desktop/GnomeRRLabeler.html
 share/gtk-doc/html/gnome-desktop/background.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-GnomeDesktopItem.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-Miscellaneous-Functions.html
+share/gtk-doc/html/gnome-desktop/gnome-desktop-Miscellaneous-Thumbnail-Functions.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-config.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-crtc.html
 share/gtk-doc/html/gnome-desktop/gnome-desktop-gnome-rr-mode.html
@@ -97,6 +99,7 @@ share/gtk-doc/html/gnome-desktop/right.png
 share/gtk-doc/html/gnome-desktop/style.css
 share/gtk-doc/html/gnome-desktop/thumbnail.html
 share/gtk-doc/html/gnome-desktop/up.png
+share/libgnome-desktop/pnp.ids
 share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -161,6 +164,7 @@ share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/nds/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -212,6 +216,7 @@ share/omf/fdl/fdl-fr.omf
 share/omf/fdl/fdl-hu.omf
 share/omf/fdl/fdl-ko.omf
 share/omf/fdl/fdl-oc.omf
+share/omf/fdl/fdl-pl.omf
 share/omf/fdl/fdl-sv.omf
 share/omf/fdl/fdl-uk.omf
 share/omf/fdl/fdl-vi.omf
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 1c8a1c796e5..a6392ef138c 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.47 2009/07/09 17:50:16 drochner Exp $
+$NetBSD: distinfo,v 1.48 2009/10/22 17:15:35 drochner Exp $
 
-SHA1 (gnome-desktop-2.26.3.tar.bz2) = 5b1090354ee775392d8faf4ee667a84c9c7a9e79
-RMD160 (gnome-desktop-2.26.3.tar.bz2) = 04e0de4e9e31e2994e1a3220f2183f25ac780399
-Size (gnome-desktop-2.26.3.tar.bz2) = 3107987 bytes
+SHA1 (gnome-desktop-2.28.1.tar.bz2) = 27909d67d4f8d1116d106ef65f612cf673d6802a
+RMD160 (gnome-desktop-2.28.1.tar.bz2) = 4bcbb7e3c743e864afa1895c363427586b70be19
+Size (gnome-desktop-2.28.1.tar.bz2) = 1639948 bytes
+SHA1 (patch-aa) = ca45f4cb5c1fabdb911034d1f32a823c5d0eb8f2
+SHA1 (patch-ab) = 2d6e3f7da1c53ea1d5c3c8011c2f649e33fa7710
diff --git a/x11/gnome-desktop/patches/patch-aa b/x11/gnome-desktop/patches/patch-aa
new file mode 100644
index 00000000000..4a132440b15
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.5 2009/10/22 17:15:35 drochner Exp $
+
+--- libgnome-desktop/gnome-desktop-thumbnail.c.orig	2009-07-27 13:38:54.000000000 +0200
++++ libgnome-desktop/gnome-desktop-thumbnail.c
+@@ -1049,7 +1049,7 @@ gnome_desktop_thumbnail_factory_save_thu
+     }
+   close (tmp_fd);
+   
+-  g_snprintf (mtime_str, 21, "%ld",  original_mtime);
++  g_snprintf (mtime_str, 21, "%lld",  (long long)original_mtime);
+   width = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Width");
+   height = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Height");
+ 
+@@ -1151,7 +1151,7 @@ gnome_desktop_thumbnail_factory_create_f
+     }
+   close (tmp_fd);
+   
+-  g_snprintf (mtime_str, 21, "%ld",  mtime);
++  g_snprintf (mtime_str, 21, "%lld",  (long long)mtime);
+   pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
+   saved_ok  = gdk_pixbuf_save (pixbuf,
+ 			       tmp_path,
+@@ -1281,7 +1281,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
+   thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
+   if (!thumb_mtime_str)
+     return FALSE;
+-  thumb_mtime = atol (thumb_mtime_str);
++  thumb_mtime = atoll (thumb_mtime_str);
+   if (mtime != thumb_mtime)
+     return FALSE;
+   
diff --git a/x11/gnome-desktop/patches/patch-ab b/x11/gnome-desktop/patches/patch-ab
new file mode 100644
index 00000000000..c16072a1edf
--- /dev/null
+++ b/x11/gnome-desktop/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2009/10/22 17:15:35 drochner Exp $
+
+--- configure.orig	2009-10-22 16:05:04.000000000 +0200
++++ configure
+@@ -12385,7 +12385,7 @@ fi
+ 
+ GNOME_PLATFORM=2
+ GNOME_MINOR=28
+-GNOME_MICRO=0
++GNOME_MICRO=1
+ GNOME_DISTRIBUTOR="GNOME.Org"
+ GNOME_DATE=`date +"%Y-%m-%d"`
+