summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2013-01-06 00:40:48 +0000
committerwiz <wiz@pkgsrc.org>2013-01-06 00:40:48 +0000
commit01b51c0948696888a58c61ee0562b963f4aa6af1 (patch)
tree1b4416454b6456bc0da9b87deba3e06c79deea0d
parent51bbe430e236f597584aeb17ab320dff370a29fb (diff)
downloadpkgsrc-01b51c0948696888a58c61ee0562b963f4aa6af1.tar.gz
Update to 1.32.5:
Overview of changes between 1.32.4 and 1.32.5 ============================================= - 689843 - Drop last ues of G_CONST_RETURN - 689864 - build failure - 689882 - pango-font.h:381: error: comma at end of enumerator list - 686512 - pango_cairo_font_get_scaled_font failed under wine - 690081 - pangofc-fontmap: Remove bad use of the comma operator - 679299 - Allow incrementally parsing pango markup
-rw-r--r--devel/pango/Makefile5
-rw-r--r--devel/pango/distinfo9
-rw-r--r--devel/pango/patches/patch-pango_pango-fontmap.h16
3 files changed, 6 insertions, 24 deletions
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 1e677700a33..623c5f2abd0 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.174 2012/12/19 03:02:50 obache Exp $
+# $NetBSD: Makefile,v 1.175 2013/01/06 00:40:48 wiz Exp $
-DISTNAME= pango-1.32.4
-PKGREVISION= 1
+DISTNAME= pango-1.32.5
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 10ad7125f94..af8f228bca5 100644
--- a/devel/pango/distinfo
+++ b/devel/pango/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.98 2012/12/19 03:02:50 obache Exp $
+$NetBSD: distinfo,v 1.99 2013/01/06 00:40:48 wiz 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 (pango-1.32.5.tar.xz) = 0f390c43ba51e851d35e8dd9eb7eb8f72eef4035
+RMD160 (pango-1.32.5.tar.xz) = 809f009543426ec5153394e261fdb2faf16d259b
+Size (pango-1.32.5.tar.xz) = 999156 bytes
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
deleted file mode 100644
index e2d0785b89a..00000000000
--- a/devel/pango/patches/patch-pango_pango-fontmap.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$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 */
-