Update pango to 1.10.1. Part of the update to the GTK 2.8 series.

Pango 1.10 release notes here:
http://mail.gnome.org/archives/gnome-announce-list/2005-August/msg00058.html

NOTE: Pango now uses the Cairo vector graphic library.  This will
necessitate changes to depending ports!
This commit is contained in:
marcm 2005-11-13 06:22:59 +00:00
parent 69aea10936
commit 8dcdfda0ef
9 changed files with 43 additions and 111 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2005/06/14 01:58:56 kevlo Exp $
# $OpenBSD: Makefile,v 1.14 2005/11/13 06:22:59 marcm Exp $
COMMENT= "library for layout and rendering of text"
DISTNAME= pango-1.8.1
DISTNAME= pango-1.10.1
CATEGORIES= devel x11
HOMEPAGE= http://www.gtk.org
@ -13,17 +13,20 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xft Xrender c fontconfig freetype iconv intl m
WANTLIB= X11 Xext Xft Xrender c fontconfig freetype \
glitz iconv intl m png z
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.6/ \
${MASTER_SITE_GNOME:=sources/pango/1.8/}
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.8/ \
${MASTER_SITE_GNOME:=sources/pango/1.10/}
EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= glib-2.0.600.0,gmodule-2.0.600.0,gobject-2.0.600.0::devel/glib2
LIB_DEPENDS= glib-2.0.800.0,gmodule-2.0.800.0,gobject-2.0.800.0::devel/glib2 \
cairo.3::graphics/cairo
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}

View File

@ -1,4 +1,4 @@
MD5 (pango-1.8.1.tar.bz2) = 88aa6bf1876766db6864f3b93577887c
RMD160 (pango-1.8.1.tar.bz2) = a65832954fa495fdb1f72076f15d61116ebd91ed
SHA1 (pango-1.8.1.tar.bz2) = 46d6992cd5782a3ca7623f0d91f31b6bdffb0346
SIZE (pango-1.8.1.tar.bz2) = 996389
MD5 (pango-1.10.1.tar.bz2) = 1ff4c96982f61ea6f390d09a4febdf18
RMD160 (pango-1.10.1.tar.bz2) = 62594e874338e334519c7161a742753a8fa50b31
SHA1 (pango-1.10.1.tar.bz2) = bb409d61f5e236b473b2b619843d7f754050b81d
SIZE (pango-1.10.1.tar.bz2) = 1186783

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2005/05/24 21:27:29 marcm Exp $
--- Makefile.in.orig Fri Mar 4 12:08:21 2005
+++ Makefile.in Wed Mar 30 21:02:52 2005
@@ -235,7 +235,7 @@ target_alias = @target_alias@
$OpenBSD: patch-Makefile_in,v 1.3 2005/11/13 06:22:59 marcm Exp $
--- Makefile.in.orig Mon Oct 3 06:12:52 2005
+++ Makefile.in Sun Oct 30 11:32:42 2005
@@ -253,7 +253,7 @@ target_alias = @target_alias@
AUTOMAKE_OPTIONS = 1.7
@ -9,4 +9,4 @@ $OpenBSD: patch-Makefile_in,v 1.2 2005/05/24 21:27:29 marcm Exp $
+SUBDIRS = pango modules examples docs tools
EXTRA_DIST = \
pango.pc.in \
pango.pc.in \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.7 2005/05/24 21:27:29 marcm Exp $
--- configure.orig Fri Mar 4 12:08:24 2005
+++ configure Wed Mar 30 21:02:53 2005
@@ -8371,7 +8371,7 @@ nto-qnx*)
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-examples_Makefile_in,v 1.10 2005/05/24 21:27:29 marcm Exp $
--- examples/Makefile.in.orig Fri Mar 4 12:08:21 2005
+++ examples/Makefile.in Wed Mar 30 21:02:53 2005
@@ -619,7 +619,7 @@ pango.modules: $(top_builddir)/pango/pan
$OpenBSD: patch-examples_Makefile_in,v 1.11 2005/11/13 06:22:59 marcm Exp $
--- examples/Makefile.in.orig Mon Oct 3 06:12:52 2005
+++ examples/Makefile.in Sun Oct 30 11:32:42 2005
@@ -719,7 +719,7 @@ pango.modules: $(top_builddir)/pango/pan
if find ../modules -name '*.so' | grep 'so' > /dev/null ; then \
echo "Writing a pango.modules file to use when running examples before installing Pango."; \
(cd ../modules && \

View File

@ -1,70 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.5 2004/08/08 17:13:58 marcm Exp $
--- ltmain.sh.orig Sun Apr 11 19:01:57 2004
+++ ltmain.sh Sat Aug 7 16:23:53 2004
@@ -1857,9 +1857,12 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
+ continue
fi
+ if test "$linkmode" = "lib"; then
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ deplibs="$deplib $deplibs"
continue
;;
-l*)
@@ -2274,10 +2277,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
# This is a shared library
# Warn about portability, can't link against -module's on
@@ -5827,40 +5826,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
;;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_Makefile_in,v 1.7 2005/05/24 21:27:29 marcm Exp $
--- modules/Makefile.in.orig Fri Mar 4 12:08:21 2005
+++ modules/Makefile.in Wed Mar 30 21:02:53 2005
@@ -543,21 +543,11 @@ uninstall-info: uninstall-info-recursive
$OpenBSD: patch-modules_Makefile_in,v 1.8 2005/11/13 06:22:59 marcm Exp $
--- modules/Makefile.in.orig Mon Oct 3 06:12:52 2005
+++ modules/Makefile.in Sun Oct 30 11:32:42 2005
@@ -561,21 +561,11 @@ uninstall-info: uninstall-info-recursive
install-data-local:

View File

@ -1,14 +1,16 @@
@comment $OpenBSD: PFRAG.shared,v 1.9 2005/05/24 21:27:29 marcm Exp $
@lib lib/libpango-1.0.so.800.1
@lib lib/libpangoft2-1.0.so.800.1
@lib lib/libpangox-1.0.so.800.1
@lib lib/libpangoxft-1.0.so.800.1
@comment $OpenBSD: PFRAG.shared,v 1.10 2005/11/13 06:23:00 marcm Exp $
@lib lib/libpango-1.0.so.1001.0
@lib lib/libpangocairo-1.0.so.1001.0
@lib lib/libpangoft2-1.0.so.1001.0
@lib lib/libpangox-1.0.so.1001.0
@lib lib/libpangoxft-1.0.so.1001.0
lib/pango/1.4.0/modules/pango-arabic-fc.so
lib/pango/1.4.0/modules/pango-basic-fc.so
lib/pango/1.4.0/modules/pango-basic-x.so
lib/pango/1.4.0/modules/pango-hangul-fc.so
lib/pango/1.4.0/modules/pango-hebrew-fc.so
lib/pango/1.4.0/modules/pango-indic-fc.so
lib/pango/1.4.0/modules/pango-khmer-fc.so
lib/pango/1.4.0/modules/pango-syriac-fc.so
lib/pango/1.4.0/modules/pango-thai-fc.so
lib/pango/1.4.0/modules/pango-tibetan-fc.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2005/05/24 21:27:29 marcm Exp $
@comment $OpenBSD: PLIST,v 1.12 2005/11/13 06:23:00 marcm Exp $
bin/pango-querymodules
include/pango-1.0/
include/pango-1.0/pango/
@ -23,6 +23,7 @@ include/pango-1.0/pango/pango-tabs.h
include/pango-1.0/pango/pango-types.h
include/pango-1.0/pango/pango-utils.h
include/pango-1.0/pango/pango.h
include/pango-1.0/pango/pangocairo.h
include/pango-1.0/pango/pangofc-decoder.h
include/pango-1.0/pango/pangofc-font.h
include/pango-1.0/pango/pangofc-fontmap.h
@ -32,6 +33,8 @@ include/pango-1.0/pango/pangoxft-render.h
include/pango-1.0/pango/pangoxft.h
lib/libpango-1.0.a
lib/libpango-1.0.la
lib/libpangocairo-1.0.a
lib/libpangocairo-1.0.la
lib/libpangoft2-1.0.a
lib/libpangoft2-1.0.la
lib/libpangox-1.0.a
@ -53,6 +56,8 @@ lib/pango/1.4.0/modules/pango-hebrew-fc.a
lib/pango/1.4.0/modules/pango-hebrew-fc.la
lib/pango/1.4.0/modules/pango-indic-fc.a
lib/pango/1.4.0/modules/pango-indic-fc.la
lib/pango/1.4.0/modules/pango-khmer-fc.a
lib/pango/1.4.0/modules/pango-khmer-fc.la
lib/pango/1.4.0/modules/pango-syriac-fc.a
lib/pango/1.4.0/modules/pango-syriac-fc.la
lib/pango/1.4.0/modules/pango-thai-fc.a
@ -61,6 +66,7 @@ lib/pango/1.4.0/modules/pango-tibetan-fc.a
lib/pango/1.4.0/modules/pango-tibetan-fc.la
lib/pkgconfig/
lib/pkgconfig/pango.pc
lib/pkgconfig/pangocairo.pc
lib/pkgconfig/pangoft2.pc
lib/pkgconfig/pangox.pc
lib/pkgconfig/pangoxft.pc
@ -87,6 +93,7 @@ share/gtk-doc/html/pango/ix01.html
share/gtk-doc/html/pango/layout.gif
share/gtk-doc/html/pango/left.png
share/gtk-doc/html/pango/lowlevel.html
share/gtk-doc/html/pango/pango-Cairo-Rendering.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
@ -107,6 +114,8 @@ share/gtk-doc/html/pango/pango.devhelp
share/gtk-doc/html/pango/pango.html
share/gtk-doc/html/pango/rendering.html
share/gtk-doc/html/pango/right.png
share/gtk-doc/html/pango/rotated-text.png
share/gtk-doc/html/pango/style.css
share/gtk-doc/html/pango/tools.html
share/gtk-doc/html/pango/up.png
%%SHARED%%