[pkgsrc/trunk]: pkgsrc/pkgtools/gnome-packagekit Fix build with gtk-2.16.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/96926fc4c079
branches:  trunk
changeset: 556667:96926fc4c079
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Mar 27 09:24:45 2009 +0000

description:
Fix build with gtk-2.16.
Convert to user-destdir.

diffstat:

 pkgtools/gnome-packagekit/Makefile         |   6 ++--
 pkgtools/gnome-packagekit/distinfo         |   4 ++-
 pkgtools/gnome-packagekit/patches/patch-ad |  13 ++++++++++++
 pkgtools/gnome-packagekit/patches/patch-ae |  31 ++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 4 deletions(-)

diffs (88 lines):

diff -r 4b7cc395f69b -r 96926fc4c079 pkgtools/gnome-packagekit/Makefile
--- a/pkgtools/gnome-packagekit/Makefile        Fri Mar 27 06:54:53 2009 +0000
+++ b/pkgtools/gnome-packagekit/Makefile        Fri Mar 27 09:24:45 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/01/08 00:22:45 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2009/03/27 09:24:45 wiz Exp $
 #
 
 DISTNAME=      gnome-packagekit-0.4.0
@@ -9,9 +9,9 @@
 HOMEPAGE=      http://www.packagekit.org/
 COMMENT=       GNOME frontend for PackageKit
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
-CONFIGURE_ENV+=        GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
-MAKE_ENV+=     GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
 USE_LIBTOOL=   yes
 USE_TOOLS+=    pkg-config gmake intltool perl msgfmt
 USE_DIRS+=     gnome2-1.6
diff -r 4b7cc395f69b -r 96926fc4c079 pkgtools/gnome-packagekit/distinfo
--- a/pkgtools/gnome-packagekit/distinfo        Fri Mar 27 06:54:53 2009 +0000
+++ b/pkgtools/gnome-packagekit/distinfo        Fri Mar 27 09:24:45 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/08 00:22:46 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/03/27 09:24:45 wiz Exp $
 
 SHA1 (gnome-packagekit-0.4.0.tar.gz) = 8a204535c4a219b8987af756db999ec4f3caa84e
 RMD160 (gnome-packagekit-0.4.0.tar.gz) = 9c1de792b00749ea54fe44d7287cf55228df4bdf
@@ -6,3 +6,5 @@
 SHA1 (patch-aa) = e9b6d7a9d8034aad4e418b7c1e6cfe753e560c0a
 SHA1 (patch-ab) = 88522542563043b06358e98fa323eb94b9e34679
 SHA1 (patch-ac) = fb0b16340091eeede5b608645b5aa43a4ab50a9f
+SHA1 (patch-ad) = db285ef99ef8822f6417522a908ef976304d18c2
+SHA1 (patch-ae) = 88fd8a4f3a739af9ce06b3ca60a95a7a6ccc1c83
diff -r 4b7cc395f69b -r 96926fc4c079 pkgtools/gnome-packagekit/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/gnome-packagekit/patches/patch-ad        Fri Mar 27 09:24:45 2009 +0000
@@ -0,0 +1,13 @@
+$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) {
diff -r 4b7cc395f69b -r 96926fc4c079 pkgtools/gnome-packagekit/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgtools/gnome-packagekit/patches/patch-ae        Fri Mar 27 09:24:45 2009 +0000
@@ -0,0 +1,31 @@
+$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);
+               }
+       }