diff --git a/devel/pango/Makefile b/devel/pango/Makefile index a1f74fac984..462265043da 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.59 2011/09/28 15:29:48 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.60 2012/03/23 13:20:21 ajacoutot Exp $ COMMENT= library for layout and rendering of text -GNOME_VERSION= 1.29.4 +GNOME_VERSION= 1.29.5 GNOME_PROJECT= pango -SHARED_LIBS += pango-1.0 2903.0 # 2903.0 -SHARED_LIBS += pangox-1.0 2903.0 # 2903.0 -SHARED_LIBS += pangoft2-1.0 2903.0 # 2903.0 -SHARED_LIBS += pangoxft-1.0 2903.0 # 2903.0 -SHARED_LIBS += pangocairo-1.0 2903.0 # 2903.0 +SHARED_LIBS += pango-1.0 2300.0 # 2905.0 +SHARED_LIBS += pangox-1.0 2300.0 # 2905.0 +SHARED_LIBS += pangoft2-1.0 2300.0 # 2905.0 +SHARED_LIBS += pangoxft-1.0 2300.0 # 2905.0 +SHARED_LIBS += pangocairo-1.0 2300.0 # 2905.0 CATEGORIES= devel x11 @@ -24,7 +24,8 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xft Xrender Xxf86vm WANTLIB += c cairo drm expat ffi fontconfig freetype glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 m pcre pixman-1 -WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z +WANTLIB += png pthread pthread-stubs stdc++ xcb xcb-render xcb-shm +WANTLIB += z MODULES= devel/gettext \ x11/gnome @@ -32,7 +33,7 @@ MODULES= devel/gettext \ MODGNOME_TOOLS= goi MODGNOME_CPPFLAGS= -I${X11BASE}/include -LIB_DEPENDS= devel/glib2>=2.29.92 \ +LIB_DEPENDS= devel/glib2>=2.31.20 \ graphics/cairo CONFIGURE_STYLE= gnu diff --git a/devel/pango/distinfo b/devel/pango/distinfo index ff6d8f70c12..abb00e5ab85 100644 --- a/devel/pango/distinfo +++ b/devel/pango/distinfo @@ -1,5 +1,5 @@ -MD5 (pango-1.29.4.tar.xz) = nVq6c4l9Lo6BFbP0/dvArw== -RMD160 (pango-1.29.4.tar.xz) = kPwLcwIvmA6JcZIv7JkGU73bRDE= -SHA1 (pango-1.29.4.tar.xz) = 4fxKcpRAsWigM63eoMKqXOF8blw= -SHA256 (pango-1.29.4.tar.xz) = eujRlT5gmKJwbfWMH4RVXAas5wBrs0wOVKuazZjBEn8= -SIZE (pango-1.29.4.tar.xz) = 1155456 +MD5 (pango-1.29.5.tar.xz) = AUQaWkmVzmVmOsC+NNfMeQ== +RMD160 (pango-1.29.5.tar.xz) = 8jNSBJXLlEt6AKmszl+KYq7YosU= +SHA1 (pango-1.29.5.tar.xz) = sEHr6N6jXSFqohSNiTa8z83AfvI= +SHA256 (pango-1.29.5.tar.xz) = V4w43oRQuqYdZR6WBJ0nEPJCvaPEevwthHc8uv7td1o= +SIZE (pango-1.29.5.tar.xz) = 1165800 diff --git a/devel/pango/patches/patch-pango_opentype_hb-private_h b/devel/pango/patches/patch-pango_opentype_hb-private_h index 5f5787e40b4..6f2e0894116 100644 --- a/devel/pango/patches/patch-pango_opentype_hb-private_h +++ b/devel/pango/patches/patch-pango_opentype_hb-private_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-pango_opentype_hb-private_h,v 1.1 2010/04/03 10:37:06 ajacoutot Exp $ ---- pango/opentype/hb-private.h.orig Mon Mar 29 23:13:20 2010 -+++ pango/opentype/hb-private.h Wed Mar 31 10:34:58 2010 -@@ -168,6 +168,15 @@ typedef GStaticMutex hb_mutex_t; +$OpenBSD: patch-pango_opentype_hb-private_h,v 1.2 2012/03/23 13:20:21 ajacoutot Exp $ +--- pango/opentype/hb-private.h.orig Tue Nov 22 19:59:54 2011 ++++ pango/opentype/hb-private.h Fri Mar 16 15:48:41 2012 +@@ -172,6 +172,15 @@ typedef GStaticMutex hb_mutex_t; #define HB_GNUC_CONST #endif diff --git a/devel/pango/patches/patch-pango_pc_in b/devel/pango/patches/patch-pango_pc_in index 038ee30d2cd..33b77eece33 100644 --- a/devel/pango/patches/patch-pango_pc_in +++ b/devel/pango/patches/patch-pango_pc_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-pango_pc_in,v 1.6 2008/04/09 13:13:40 jasper Exp $ ---- pango.pc.in.orig Tue Jan 29 23:26:57 2008 -+++ pango.pc.in Wed Mar 12 23:31:16 2008 -@@ -9,5 +9,5 @@ Name: Pango - Description: Internationalized text handling +$OpenBSD: patch-pango_pc_in,v 1.7 2012/03/23 13:20:21 ajacoutot Exp $ +--- pango.pc.in.orig Tue Nov 22 20:02:36 2011 ++++ pango.pc.in Fri Mar 16 15:49:05 2012 +@@ -10,5 +10,5 @@ Description: Internationalized text handling Version: @VERSION@ - Requires: glib-2.0,gobject-2.0,gmodule-no-export-2.0 + Requires: glib-2.0 gobject-2.0 + Requires.private: gmodule-no-export-2.0 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ +Libs: -L${libdir} @X_LIBS@ -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@ Cflags: -I${includedir}/pango-1.0 diff --git a/devel/pango/pkg/PLIST b/devel/pango/pkg/PLIST index c9d6350a230..2ed767348bb 100644 --- a/devel/pango/pkg/PLIST +++ b/devel/pango/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.25 2011/09/28 15:29:48 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.26 2012/03/23 13:20:21 ajacoutot Exp $ %%SHARED%% @bin bin/pango-querymodules @bin bin/pango-view @@ -108,24 +108,25 @@ share/gtk-doc/html/pango/PangoFcDecoder.html share/gtk-doc/html/pango/PangoFcFont.html share/gtk-doc/html/pango/PangoFcFontMap.html share/gtk-doc/html/pango/PangoMarkupFormat.html +share/gtk-doc/html/pango/annotation-glossary.html +share/gtk-doc/html/pango/api-index-1-10.html +share/gtk-doc/html/pango/api-index-1-12.html +share/gtk-doc/html/pango/api-index-1-14.html +share/gtk-doc/html/pango/api-index-1-16.html +share/gtk-doc/html/pango/api-index-1-18.html +share/gtk-doc/html/pango/api-index-1-2.html +share/gtk-doc/html/pango/api-index-1-20.html +share/gtk-doc/html/pango/api-index-1-22.html +share/gtk-doc/html/pango/api-index-1-24.html +share/gtk-doc/html/pango/api-index-1-26.html +share/gtk-doc/html/pango/api-index-1-28.html +share/gtk-doc/html/pango/api-index-1-30.html +share/gtk-doc/html/pango/api-index-1-4.html +share/gtk-doc/html/pango/api-index-1-6.html +share/gtk-doc/html/pango/api-index-1-8.html +share/gtk-doc/html/pango/api-index-deprecated.html +share/gtk-doc/html/pango/api-index-full.html share/gtk-doc/html/pango/home.png -share/gtk-doc/html/pango/index-1.10.html -share/gtk-doc/html/pango/index-1.12.html -share/gtk-doc/html/pango/index-1.14.html -share/gtk-doc/html/pango/index-1.16.html -share/gtk-doc/html/pango/index-1.18.html -share/gtk-doc/html/pango/index-1.2.html -share/gtk-doc/html/pango/index-1.20.html -share/gtk-doc/html/pango/index-1.22.html -share/gtk-doc/html/pango/index-1.24.html -share/gtk-doc/html/pango/index-1.26.html -share/gtk-doc/html/pango/index-1.28.html -share/gtk-doc/html/pango/index-1.30.html -share/gtk-doc/html/pango/index-1.4.html -share/gtk-doc/html/pango/index-1.6.html -share/gtk-doc/html/pango/index-1.8.html -share/gtk-doc/html/pango/index-all.html -share/gtk-doc/html/pango/index-deprecated.html share/gtk-doc/html/pango/index.html share/gtk-doc/html/pango/index.sgml share/gtk-doc/html/pango/layout.gif @@ -134,6 +135,7 @@ share/gtk-doc/html/pango/lowlevel.html share/gtk-doc/html/pango/pango-ATSUI-Fonts.html share/gtk-doc/html/pango/pango-Bidirectional-Text.html share/gtk-doc/html/pango/pango-Cairo-Rendering.html +share/gtk-doc/html/pango/pango-CoreText-Fonts.html share/gtk-doc/html/pango/pango-Coverage-Maps.html share/gtk-doc/html/pango/pango-Engines.html share/gtk-doc/html/pango/pango-Fonts.html