diff options
| author | obache <obache@pkgsrc.org> | 2012-05-29 12:18:57 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-05-29 12:18:57 +0000 |
| commit | 112a4107e725f6ebec946e0178aaeb52b546609a (patch) | |
| tree | 9494831d100b3fc4c21f83f3a89bff3ec552590d /pkgtools | |
| parent | 65ce05aa9806462a05551bc61ab5a370aa63f02a (diff) | |
| download | pkgsrc-112a4107e725f6ebec946e0178aaeb52b546609a.tar.gz | |
Fixes build with recent glib2, PR#46473.
glib2>2.30.0 deprecate g_format_size_for_display, add g_format_size,
so use it instead.
Bump PKGREVISION.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/gnome-packagekit/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/gnome-packagekit/distinfo | 3 | ||||
| -rw-r--r-- | pkgtools/gnome-packagekit/patches/patch-src_gpk-application.c | 15 |
3 files changed, 20 insertions, 3 deletions
diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile index f02c295c354..a1c8a4d5672 100644 --- a/pkgtools/gnome-packagekit/Makefile +++ b/pkgtools/gnome-packagekit/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2012/04/27 12:32:01 obache Exp $ +# $NetBSD: Makefile,v 1.21 2012/05/29 12:18:57 obache Exp $ # DISTNAME= gnome-packagekit-0.4.0 -PKGREVISION= 13 +PKGREVISION= 14 CATEGORIES= pkgtools gnome MASTER_SITES= http://www.packagekit.org/releases/ @@ -26,6 +26,7 @@ BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGDK_PIXBUF_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.30.0 .include "../../devel/GConf/schemas.mk" .include "../../devel/libglade/buildlink3.mk" diff --git a/pkgtools/gnome-packagekit/distinfo b/pkgtools/gnome-packagekit/distinfo index 07dc9bfac6d..eff856d9aff 100644 --- a/pkgtools/gnome-packagekit/distinfo +++ b/pkgtools/gnome-packagekit/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2011/12/21 12:12:53 wiz Exp $ +$NetBSD: distinfo,v 1.4 2012/05/29 12:18:57 obache Exp $ SHA1 (gnome-packagekit-0.4.0.tar.gz) = 8a204535c4a219b8987af756db999ec4f3caa84e RMD160 (gnome-packagekit-0.4.0.tar.gz) = 9c1de792b00749ea54fe44d7287cf55228df4bdf @@ -8,4 +8,5 @@ SHA1 (patch-ab) = 88522542563043b06358e98fa323eb94b9e34679 SHA1 (patch-ac) = fb0b16340091eeede5b608645b5aa43a4ab50a9f SHA1 (patch-ad) = db285ef99ef8822f6417522a908ef976304d18c2 SHA1 (patch-ae) = 88fd8a4f3a739af9ce06b3ca60a95a7a6ccc1c83 +SHA1 (patch-src_gpk-application.c) = 32ec24b11a222a8b77feff38373438779d46a288 SHA1 (patch-src_gpk-update-viewer.c) = 20365e1f3101038b9864eda6dd5b1c0a66191bd1 diff --git a/pkgtools/gnome-packagekit/patches/patch-src_gpk-application.c b/pkgtools/gnome-packagekit/patches/patch-src_gpk-application.c new file mode 100644 index 00000000000..ef5260d4045 --- /dev/null +++ b/pkgtools/gnome-packagekit/patches/patch-src_gpk-application.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_gpk-application.c,v 1.1 2012/05/29 12:18:57 obache Exp $ + +* glib2>=2.30 deprecate g_format_size_for_display, add g_format_size. + +--- src/gpk-application.c.orig 2008-12-09 08:22:40.000000000 +0000 ++++ src/gpk-application.c +@@ -1035,7 +1035,7 @@ gpk_application_details_cb (PkClient *cl + /* if non-zero, set the size */ + if (details->size > 0) { + /* set the size */ +- value = g_format_size_for_display (details->size); ++ value = g_format_size (details->size); + if (egg_strequal (details->id->data, "meta")) + /* TRANSLATORS: the size of the meta package */ + gpk_application_add_detail_item (application, _("Size"), value, NULL); |