summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorobache <obache>2012-12-19 03:02:50 +0000
committerobache <obache>2012-12-19 03:02:50 +0000
commit9b9ba0748b4436b785688d35fe9632ebaebc3136 (patch)
treed77a0ba5a2fbcac24822d4f5fb8ef8f6b733ac62 /devel
parent6e9165f53d483b1d876e973007f08bfd18da41e9 (diff)
downloadpkgsrc-9b9ba0748b4436b785688d35fe9632ebaebc3136.tar.gz
Drop use of deprecated G_CONST_RETURN (from upstream).
fixes build failure of depending packages using G_DISABLE_DEPRECATED. Bump PKGREVISION.
Diffstat (limited to 'devel')
-rw-r--r--devel/pango/Makefile3
-rw-r--r--devel/pango/distinfo3
-rw-r--r--devel/pango/patches/patch-pango_pango-fontmap.h16
3 files changed, 20 insertions, 2 deletions
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 98e09b38c56..1e677700a33 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.173 2012/12/14 19:19:03 drochner Exp $
+# $NetBSD: Makefile,v 1.174 2012/12/19 03:02:50 obache Exp $
DISTNAME= pango-1.32.4
+PKGREVISION= 1
CATEGORIES= devel fonts
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
diff --git a/devel/pango/distinfo b/devel/pango/distinfo
index 5aadb828d94..10ad7125f94 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.97 2012/12/14 19:19:03 drochner Exp $
+$NetBSD: distinfo,v 1.98 2012/12/19 03:02:50 obache Exp $
SHA1 (pango-1.32.4.tar.xz) = 335f3bf6111eb107486a68b6b0abea87d08b97c6
RMD160 (pango-1.32.4.tar.xz) = 213ca6e80f1bf187b0c86d11d716a165c7c8f6c3
Size (pango-1.32.4.tar.xz) = 988976 bytes
+SHA1 (patch-pango_pango-fontmap.h) = 8d917581f3cff87ba920081973b81a141787c4c9
SHA1 (patch-pango_pangocoretext.h) = f842e66a712d24f4f221be5fcdae18cc13c8b84b
SHA1 (patch-pangocairo-coretext.h) = 2f7c8efad48b58398070f48e71c16d99d3d59f57
diff --git a/devel/pango/patches/patch-pango_pango-fontmap.h b/devel/pango/patches/patch-pango_pango-fontmap.h
new file mode 100644
index 00000000000..e2d0785b89a
--- /dev/null
+++ b/devel/pango/patches/patch-pango_pango-fontmap.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-pango_pango-fontmap.h,v 1.1 2012/12/19 03:02:50 obache Exp $
+
+* Drop last use of deprecated G_CONST_RETURN
+ http://git.gnome.org/browse/pango/commit/?id=13bc45cdc7de772cde80dc4d5f58fef251229e1b
+
+--- pango/pango-fontmap.h.orig 2012-12-06 15:36:19.000000000 +0000
++++ pango/pango-fontmap.h
+@@ -89,7 +89,7 @@ struct _PangoFontMapClass
+ void (*_pango_reserved3) (void);
+ };
+
+-G_CONST_RETURN char *pango_font_map_get_shape_engine_type (PangoFontMap *fontmap);
++const char *pango_font_map_get_shape_engine_type (PangoFontMap *fontmap);
+
+ #endif /* PANGO_ENABLE_BACKEND */
+