update pango to 1.16.1

based on diffs by alek@

ok'd by several, "go ahead" steven@
tested by many, thanks!
This commit is contained in:
jasper 2007-04-23 16:24:18 +00:00
parent e1a1818380
commit a65663389a
8 changed files with 124 additions and 104 deletions

View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.22 2007/04/14 21:20:19 sturm Exp $
# $OpenBSD: Makefile,v 1.23 2007/04/23 16:24:18 jasper Exp $
COMMENT= "library for layout and rendering of text"
DISTNAME= pango-1.12.3
PKGNAME= ${DISTNAME}p1
SHARED_LIBS= pango-1.0 1200.3 \
pangocairo-1.0 1200.3 \
pangoft2-1.0 1200.3 \
pangox-1.0 1200.3 \
pangoxft-1.0 1200.3
DISTNAME= pango-1.16.1
SHARED_LIBS += pango-1.0 1300.0 # .0.0
SHARED_LIBS += pangox-1.0 1300.0 # .0.0
SHARED_LIBS += pangoft2-1.0 1300.0 # .0.0
SHARED_LIBS += pangoxft-1.0 1300.0 # .0.0
SHARED_LIBS += pangocairo-1.0 1300.0 # .0.0
CATEGORIES= devel x11
HOMEPAGE= http://www.gtk.org
@ -19,13 +17,15 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xau Xdmcp Xft Xrender c expat fontconfig freetype \
glitz iconv intl m png z
WANTLIB= X11 Xau Xdmcp Xft Xrender c expat fontconfig freetype \
glitz m png z
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.12/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.16/}
EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= glib-2.0.>=1000.0,gmodule-2.0.>=1000.0,gobject-2.0.>=1000.0::devel/glib2 \
MODULES= devel/gettext
LIB_DEPENDS= glib-2.0.>=1200.0,gmodule-2.0.>=1200.0,gobject-2.0.>=1200.0::devel/glib2 \
cairo.>=3::graphics/cairo
USE_X11= Yes
@ -34,15 +34,15 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ARGS+= --without-qt
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pango; \
cp -Rp ${WRKINST}/${SYSCONFDIR}/pango/* ${PREFIX}/share/examples/pango/
do-regress:
@cd ${WRKSRC}/tests && ${MAKE} check
.include <bsd.port.mk>
# Work around a fontconfig linking issue on static arches

View File

@ -1,5 +1,5 @@
MD5 (pango-1.12.3.tar.bz2) = yBeOEaiVFm2GmQuyw42DGw==
RMD160 (pango-1.12.3.tar.bz2) = dpKCgnbptaVLC4wy+gfX22rEW+0=
SHA1 (pango-1.12.3.tar.bz2) = rUk8RWDA/9nc24oXJNW/8FjvESw=
SHA256 (pango-1.12.3.tar.bz2) = c6wblW/xbfQcQTVSMarj91dQDIOrkSEINw6ntwxD/Rg=
SIZE (pango-1.12.3.tar.bz2) = 1226579
MD5 (pango-1.16.1.tar.bz2) = SqcgYz5TcBplLydwCnlG3Q==
RMD160 (pango-1.16.1.tar.bz2) = yXMVpWhfxvo/xwY43m7yTp0nObk=
SHA1 (pango-1.16.1.tar.bz2) = dbSLH7zwf10mTHBkd9fft8sbJYM=
SHA256 (pango-1.16.1.tar.bz2) = j09LSpNZzeNRIhJNf6hyXgqLxpv/BoggLOfXBkidqks=
SIZE (pango-1.16.1.tar.bz2) = 1354214

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.5 2006/05/22 01:41:52 brad Exp $
--- Makefile.in.orig Fri Apr 7 00:33:30 2006
+++ Makefile.in Wed May 10 18:01:16 2006
@@ -286,7 +286,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = pango modules examples docs tools tests
+SUBDIRS = pango modules examples docs tools
EXTRA_DIST = \
autogen.sh \

View File

@ -1,12 +1,21 @@
$OpenBSD: patch-configure,v 1.11 2006/06/03 18:23:03 brad Exp $
--- configure.orig Fri May 26 16:43:16 2006
+++ configure Thu Jun 1 06:39:08 2006
@@ -23008,7 +23008,7 @@ fi
if test "$pango_os_win32" != yes; then
# libtool option to control which symbols are exported
# right now, symbols starting with _ are not exported
- LIBRARY_LIBTOOL_OPTIONS="-version-info $LT_VERSION_INFO "'-export-symbols-regex "^pango_.*"'
+ LIBRARY_LIBTOOL_OPTIONS='-export-symbols-regex "^pango_.*"'
MODULE_LIBTOOL_OPTIONS="-export-dynamic -avoid-version "'-export-symbols-regex "^script_engine_.*"'
$OpenBSD: patch-configure,v 1.12 2007/04/23 16:24:18 jasper Exp $
--- configure.orig Fri Apr 20 17:58:51 2007
+++ configure Fri Apr 20 18:54:23 2007
@@ -20970,7 +20970,7 @@ if test -n "$PKG_CONFIG"; then
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null`
+ pkg_cv_FONTCONFIG_LIBS="`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null ` -lexpat"
else
# We currently use .def files on Windows
pkg_failed=yes
fi
@@ -21184,7 +21184,7 @@ if test -n "$PKG_CONFIG"; then
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null`
+ pkg_cv_XFT_LIBS="`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null` -lexpat"
else
pkg_failed=yes
fi

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_Makefile_in,v 1.10 2006/05/22 01:41:52 brad Exp $
--- modules/Makefile.in.orig Fri Apr 7 00:33:55 2006
+++ modules/Makefile.in Wed May 10 18:49:30 2006
@@ -604,21 +604,11 @@ uninstall-info: uninstall-info-recursive
$OpenBSD: patch-modules_Makefile_in,v 1.11 2007/04/23 16:24:18 jasper Exp $
--- modules/Makefile.in.orig Mon Mar 12 22:58:18 2007
+++ modules/Makefile.in Sun Mar 18 18:22:38 2007
@@ -655,21 +655,11 @@ uninstall-info: uninstall-info-recursive
@CROSS_COMPILING_FALSE@all-local: pango.modules
install-data-local: $(top_builddir)/pango/pango-querymodules

View File

@ -1,21 +1,21 @@
$OpenBSD: sup-no_shared-configure,v 1.1 2003/08/13 16:57:51 marcm Exp $
--- configure.orig 2003-06-08 21:24:11.000000000 -0700
+++ configure 2003-08-12 15:15:19.000000000 -0700
@@ -19923,7 +19923,7 @@ echo "${ECHO_T}$FONTCONFIG_CFLAGS" >&6
echo "$as_me:$LINENO: checking FONTCONFIG_LIBS" >&5
echo $ECHO_N "checking FONTCONFIG_LIBS... $ECHO_C" >&6
- FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 1.0.1"`
+ FONTCONFIG_LIBS="`$PKG_CONFIG --libs "fontconfig >= 1.0.1"` -lexpat"
echo "$as_me:$LINENO: result: $FONTCONFIG_LIBS" >&5
echo "${ECHO_T}$FONTCONFIG_LIBS" >&6
else
@@ -20145,7 +20145,7 @@ echo "${ECHO_T}$XFT_CFLAGS" >&6
echo "$as_me:$LINENO: checking XFT_LIBS" >&5
echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6
- XFT_LIBS=`$PKG_CONFIG --libs "xft >= 2.0.0"`
+ XFT_LIBS="`$PKG_CONFIG --libs "xft >= 2.0.0"` -lexpat"
echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
echo "${ECHO_T}$XFT_LIBS" >&6
else
$OpenBSD: sup-no_shared-configure,v 1.2 2007/04/23 16:24:18 jasper Exp $
--- configure.orig Fri Apr 20 17:58:51 2007
+++ configure Fri Apr 20 18:54:23 2007
@@ -20970,7 +20970,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null`
+ pkg_cv_FONTCONFIG_LIBS="`$PKG_CONFIG --libs "fontconfig >= 1.0.1" 2>/dev/null ` -lexpat"
else
pkg_failed=yes
fi
@@ -21184,7 +21184,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null`
+ pkg_cv_XFT_LIBS="`$PKG_CONFIG --libs "xft >= 2.0.0 xrender" 2>/dev/null` -lexpat"
else
pkg_failed=yes
fi

View File

@ -1,16 +1,18 @@
@comment $OpenBSD: PFRAG.shared,v 1.13 2006/05/22 01:41:52 brad Exp $
@comment $OpenBSD: PFRAG.shared,v 1.14 2007/04/23 16:24:18 jasper Exp $
@lib lib/libpango-1.0.so.${LIBpango-1.0_VERSION}
@lib lib/libpangocairo-1.0.so.${LIBpangocairo-1.0_VERSION}
@lib lib/libpangoft2-1.0.so.${LIBpangoft2-1.0_VERSION}
@lib lib/libpangox-1.0.so.${LIBpangox-1.0_VERSION}
@lib lib/libpangoxft-1.0.so.${LIBpangoxft-1.0_VERSION}
lib/pango/1.5.0/modules/pango-arabic-fc.so
lib/pango/1.5.0/modules/pango-basic-fc.so
lib/pango/1.5.0/modules/pango-basic-x.so
lib/pango/1.5.0/modules/pango-hangul-fc.so
lib/pango/1.5.0/modules/pango-hebrew-fc.so
lib/pango/1.5.0/modules/pango-indic-fc.so
lib/pango/1.5.0/modules/pango-khmer-fc.so
lib/pango/1.5.0/modules/pango-syriac-fc.so
lib/pango/1.5.0/modules/pango-thai-fc.so
lib/pango/1.5.0/modules/pango-tibetan-fc.so
lib/pango/1.6.0/modules/pango-arabic-fc.so
lib/pango/1.6.0/modules/pango-arabic-lang.so
lib/pango/1.6.0/modules/pango-basic-fc.so
lib/pango/1.6.0/modules/pango-basic-x.so
lib/pango/1.6.0/modules/pango-hangul-fc.so
lib/pango/1.6.0/modules/pango-hebrew-fc.so
lib/pango/1.6.0/modules/pango-indic-fc.so
lib/pango/1.6.0/modules/pango-indic-lang.so
lib/pango/1.6.0/modules/pango-khmer-fc.so
lib/pango/1.6.0/modules/pango-syriac-fc.so
lib/pango/1.6.0/modules/pango-thai-fc.so
lib/pango/1.6.0/modules/pango-tibetan-fc.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2006/06/03 18:23:03 brad Exp $
@comment $OpenBSD: PLIST,v 1.15 2007/04/23 16:24:18 jasper Exp $
bin/pango-querymodules
bin/pango-view
include/pango-1.0/
@ -9,13 +9,16 @@ include/pango-1.0/pango/pango-context.h
include/pango-1.0/pango/pango-coverage.h
include/pango-1.0/pango/pango-engine.h
include/pango-1.0/pango/pango-enum-types.h
include/pango-1.0/pango/pango-features.h
include/pango-1.0/pango/pango-font.h
include/pango-1.0/pango/pango-fontmap.h
include/pango-1.0/pango/pango-fontset.h
include/pango-1.0/pango/pango-glyph-item.h
include/pango-1.0/pango/pango-glyph.h
include/pango-1.0/pango/pango-gravity.h
include/pango-1.0/pango/pango-item.h
include/pango-1.0/pango/pango-layout.h
include/pango-1.0/pango/pango-matrix.h
include/pango-1.0/pango/pango-modules.h
include/pango-1.0/pango/pango-ot.h
include/pango-1.0/pango/pango-renderer.h
@ -43,28 +46,32 @@ lib/libpangox-1.0.la
lib/libpangoxft-1.0.a
lib/libpangoxft-1.0.la
lib/pango/
lib/pango/1.5.0/
lib/pango/1.5.0/modules/
lib/pango/1.5.0/modules/pango-arabic-fc.a
lib/pango/1.5.0/modules/pango-arabic-fc.la
lib/pango/1.5.0/modules/pango-basic-fc.a
lib/pango/1.5.0/modules/pango-basic-fc.la
lib/pango/1.5.0/modules/pango-basic-x.a
lib/pango/1.5.0/modules/pango-basic-x.la
lib/pango/1.5.0/modules/pango-hangul-fc.a
lib/pango/1.5.0/modules/pango-hangul-fc.la
lib/pango/1.5.0/modules/pango-hebrew-fc.a
lib/pango/1.5.0/modules/pango-hebrew-fc.la
lib/pango/1.5.0/modules/pango-indic-fc.a
lib/pango/1.5.0/modules/pango-indic-fc.la
lib/pango/1.5.0/modules/pango-khmer-fc.a
lib/pango/1.5.0/modules/pango-khmer-fc.la
lib/pango/1.5.0/modules/pango-syriac-fc.a
lib/pango/1.5.0/modules/pango-syriac-fc.la
lib/pango/1.5.0/modules/pango-thai-fc.a
lib/pango/1.5.0/modules/pango-thai-fc.la
lib/pango/1.5.0/modules/pango-tibetan-fc.a
lib/pango/1.5.0/modules/pango-tibetan-fc.la
lib/pango/1.6.0/
lib/pango/1.6.0/modules/
lib/pango/1.6.0/modules/pango-arabic-fc.a
lib/pango/1.6.0/modules/pango-arabic-fc.la
lib/pango/1.6.0/modules/pango-arabic-lang.a
lib/pango/1.6.0/modules/pango-arabic-lang.la
lib/pango/1.6.0/modules/pango-basic-fc.a
lib/pango/1.6.0/modules/pango-basic-fc.la
lib/pango/1.6.0/modules/pango-basic-x.a
lib/pango/1.6.0/modules/pango-basic-x.la
lib/pango/1.6.0/modules/pango-hangul-fc.a
lib/pango/1.6.0/modules/pango-hangul-fc.la
lib/pango/1.6.0/modules/pango-hebrew-fc.a
lib/pango/1.6.0/modules/pango-hebrew-fc.la
lib/pango/1.6.0/modules/pango-indic-fc.a
lib/pango/1.6.0/modules/pango-indic-fc.la
lib/pango/1.6.0/modules/pango-indic-lang.a
lib/pango/1.6.0/modules/pango-indic-lang.la
lib/pango/1.6.0/modules/pango-khmer-fc.a
lib/pango/1.6.0/modules/pango-khmer-fc.la
lib/pango/1.6.0/modules/pango-syriac-fc.a
lib/pango/1.6.0/modules/pango-syriac-fc.la
lib/pango/1.6.0/modules/pango-thai-fc.a
lib/pango/1.6.0/modules/pango-thai-fc.la
lib/pango/1.6.0/modules/pango-tibetan-fc.a
lib/pango/1.6.0/modules/pango-tibetan-fc.la
lib/pkgconfig/
lib/pkgconfig/pango.pc
lib/pkgconfig/pangocairo.pc
@ -91,6 +98,15 @@ share/gtk-doc/html/pango/home.png
share/gtk-doc/html/pango/index.html
share/gtk-doc/html/pango/index.sgml
share/gtk-doc/html/pango/ix01.html
share/gtk-doc/html/pango/ix02.html
share/gtk-doc/html/pango/ix03.html
share/gtk-doc/html/pango/ix04.html
share/gtk-doc/html/pango/ix05.html
share/gtk-doc/html/pango/ix06.html
share/gtk-doc/html/pango/ix07.html
share/gtk-doc/html/pango/ix08.html
share/gtk-doc/html/pango/ix09.html
share/gtk-doc/html/pango/ix10.html
share/gtk-doc/html/pango/layout.gif
share/gtk-doc/html/pango/left.png
share/gtk-doc/html/pango/lowlevel.html
@ -102,15 +118,20 @@ share/gtk-doc/html/pango/pango-Fonts.html
share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
share/gtk-doc/html/pango/pango-Glyph-Storage.html
share/gtk-doc/html/pango/pango-Layout-Objects.html
share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
share/gtk-doc/html/pango/pango-Modules.html
share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
share/gtk-doc/html/pango/pango-PangoRenderer.html
share/gtk-doc/html/pango/pango-Scripts.html
share/gtk-doc/html/pango/pango-Tab-Stops.html
share/gtk-doc/html/pango/pango-Text-Attributes.html
share/gtk-doc/html/pango/pango-Text-Processing.html
share/gtk-doc/html/pango/pango-Version-Checking.html
share/gtk-doc/html/pango/pango-Vertical-Text.html
share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html
share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
share/gtk-doc/html/pango/pango-hierarchy.html
share/gtk-doc/html/pango/pango-querymodules.html
share/gtk-doc/html/pango/pango.devhelp
share/gtk-doc/html/pango/pango.devhelp2