Fri Mar 27 09:24:45 2009 UTC ()
Fix build with gtk-2.16.
Convert to user-destdir.


(wiz)
diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/gnome-packagekit/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/gnome-packagekit/distinfo
diff -r0 -r1.1 pkgsrc/pkgtools/gnome-packagekit/patches/patch-ad
diff -r0 -r1.1 pkgsrc/pkgtools/gnome-packagekit/patches/patch-ae
cvs diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/gnome-packagekit/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/gnome-packagekit/Makefile 2009/01/08 00:22:45 1.1.1.1
+++ pkgsrc/pkgtools/gnome-packagekit/Makefile 2009/03/27 09:24:45 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.1.1.1 2009/01/08 00:22:45 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.2 2009/03/27 09:24:45 wiz Exp $
2# 2#
3 3
4DISTNAME= gnome-packagekit-0.4.0 4DISTNAME= gnome-packagekit-0.4.0
5CATEGORIES= pkgtools gnome 5CATEGORIES= pkgtools gnome
6MASTER_SITES= http://www.packagekit.org/releases/ 6MASTER_SITES= http://www.packagekit.org/releases/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.packagekit.org/ 9HOMEPAGE= http://www.packagekit.org/
10COMMENT= GNOME frontend for PackageKit 10COMMENT= GNOME frontend for PackageKit
11 11
 12PKG_DESTDIR_SUPPORT= user-destdir
 13
12GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
13CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ 
14MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/ 
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= pkg-config gmake intltool perl msgfmt 16USE_TOOLS+= pkg-config gmake intltool perl msgfmt
17USE_DIRS+= gnome2-1.6 17USE_DIRS+= gnome2-1.6
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19 19
20GCONF_SCHEMAS+= gnome-packagekit.schemas 20GCONF_SCHEMAS+= gnome-packagekit.schemas
21 21
22.include "../../devel/GConf/schemas.mk" 22.include "../../devel/GConf/schemas.mk"
23.include "../../devel/libglade/buildlink3.mk" 23.include "../../devel/libglade/buildlink3.mk"
24.include "../../devel/libsexy/buildlink3.mk" 24.include "../../devel/libsexy/buildlink3.mk"
25.include "../../pkgtools/packagekit/buildlink3.mk" 25.include "../../pkgtools/packagekit/buildlink3.mk"
26.include "../../graphics/gnome-icon-theme/buildlink3.mk" 26.include "../../graphics/gnome-icon-theme/buildlink3.mk"
27.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 27.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/pkgtools/gnome-packagekit/distinfo (expand / switch to unified diff)

--- pkgsrc/pkgtools/gnome-packagekit/distinfo 2009/01/08 00:22:46 1.1.1.1
+++ pkgsrc/pkgtools/gnome-packagekit/distinfo 2009/03/27 09:24:45 1.2
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.1.1.1 2009/01/08 00:22:46 jmcneill Exp $ 1$NetBSD: distinfo,v 1.2 2009/03/27 09:24:45 wiz Exp $
2 2
3SHA1 (gnome-packagekit-0.4.0.tar.gz) = 8a204535c4a219b8987af756db999ec4f3caa84e 3SHA1 (gnome-packagekit-0.4.0.tar.gz) = 8a204535c4a219b8987af756db999ec4f3caa84e
4RMD160 (gnome-packagekit-0.4.0.tar.gz) = 9c1de792b00749ea54fe44d7287cf55228df4bdf 4RMD160 (gnome-packagekit-0.4.0.tar.gz) = 9c1de792b00749ea54fe44d7287cf55228df4bdf
5Size (gnome-packagekit-0.4.0.tar.gz) = 2732798 bytes 5Size (gnome-packagekit-0.4.0.tar.gz) = 2732798 bytes
6SHA1 (patch-aa) = e9b6d7a9d8034aad4e418b7c1e6cfe753e560c0a 6SHA1 (patch-aa) = e9b6d7a9d8034aad4e418b7c1e6cfe753e560c0a
7SHA1 (patch-ab) = 88522542563043b06358e98fa323eb94b9e34679 7SHA1 (patch-ab) = 88522542563043b06358e98fa323eb94b9e34679
8SHA1 (patch-ac) = fb0b16340091eeede5b608645b5aa43a4ab50a9f 8SHA1 (patch-ac) = fb0b16340091eeede5b608645b5aa43a4ab50a9f
 9SHA1 (patch-ad) = db285ef99ef8822f6417522a908ef976304d18c2
 10SHA1 (patch-ae) = 88fd8a4f3a739af9ce06b3ca60a95a7a6ccc1c83
File Added: pkgsrc/pkgtools/gnome-packagekit/patches/patch-ad
$NetBSD: patch-ad,v 1.1 2009/03/27 09:24:45 wiz Exp $

--- src/gpk-check-update.c.orig	2008-11-24 16:33:50.000000000 +0000
+++ src/gpk-check-update.c
@@ -766,7 +766,7 @@ gpk_check_update_query_updates (GpkCheck
 	/* TRANSLATORS: tooltip: how many updates are waiting to be applied */
 	g_string_append_printf (status_tooltip, ngettext ("There is %d update pending",
 							  "There are %d updates pending", length), length);
-	gtk_status_icon_set_tooltip (GTK_STATUS_ICON (cupdate->priv->sicon), status_tooltip->str);
+	gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (cupdate->priv->sicon), status_tooltip->str);
 
 	/* is policy none? */
 	if (update == GPK_UPDATE_ENUM_NONE) {
File Added: pkgsrc/pkgtools/gnome-packagekit/patches/patch-ae
$NetBSD: patch-ae,v 1.1 2009/03/27 09:24:45 wiz Exp $

--- src/gpk-watch.c.orig	2008-11-24 16:34:22.000000000 +0000
+++ src/gpk-watch.c
@@ -109,7 +109,7 @@ gpk_watch_refresh_tooltip (GpkWatch *wat
 	length = pk_task_list_get_size (watch->priv->tlist);
 	egg_debug ("refresh tooltip %i", length);
 	if (length == 0) {
-		gtk_status_icon_set_tooltip (GTK_STATUS_ICON (watch->priv->sicon), "Doing nothing...");
+		gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (watch->priv->sicon), "Doing nothing...");
 		return TRUE;
 	}
 	status = g_string_new ("");
@@ -143,7 +143,7 @@ gpk_watch_refresh_tooltip (GpkWatch *wat
 	else
 		g_string_set_size (status, status->len-1);
 
-	gtk_status_icon_set_tooltip (GTK_STATUS_ICON (watch->priv->sicon), status->str);
+	gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (watch->priv->sicon), status->str);
 	g_string_free (status, TRUE);
 	return TRUE;
 }
@@ -321,7 +321,7 @@ gpk_watch_finished_cb (PkTaskList *tlist
 		    restart == PK_RESTART_ENUM_SESSION) {
 			restart_message = gpk_restart_enum_to_localised_text (restart);
 			icon_name = gpk_restart_enum_to_icon_name (restart);
-			gtk_status_icon_set_tooltip (GTK_STATUS_ICON (watch->priv->sicon_restart), restart_message);
+			gtk_status_icon_set_tooltip_text (GTK_STATUS_ICON (watch->priv->sicon_restart), restart_message);
 			gpk_smart_icon_set_icon_name (watch->priv->sicon_restart, icon_name);
 		}
 	}