Update pango to 1.12.1.

This commit is contained in:
brad 2006-05-22 01:41:52 +00:00
parent 2a16431860
commit 6152ffb25a
9 changed files with 105 additions and 118 deletions

View File

@ -1,19 +1,17 @@
# $OpenBSD: Makefile,v 1.16 2006/01/03 10:40:09 bernd Exp $
# $OpenBSD: Makefile,v 1.17 2006/05/22 01:41:52 brad Exp $
COMMENT= "library for layout and rendering of text"
DISTNAME= pango-1.10.2
PKGNAME= ${DISTNAME}p0
SHARED_LIBS= pango-1.0 1001.1 \
pangocairo-1.0 1001.1 \
pangoft2-1.0 1001.1 \
pangox-1.0 1001.1 \
pangoxft-1.0 1001.1
DISTNAME= pango-1.12.1
SHARED_LIBS= pango-1.0 1200.1 \
pangocairo-1.0 1200.1 \
pangoft2-1.0 1200.1 \
pangox-1.0 1200.1 \
pangoxft-1.0 1200.1
CATEGORIES= devel x11
HOMEPAGE= http://www.gtk.org
MAINTAINER= Marc Matteo <marcm@openbsd.org>
# LGPL
PERMIT_PACKAGE_CDROM= Yes
@ -23,13 +21,12 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xft Xrender c fontconfig freetype \
glitz iconv intl m png z
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.8/ \
${MASTER_SITE_GNOME:=sources/pango/1.10/}
EXTRACT_SUFX= .tar.bz2
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/1.12/}
EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= glib-2.0.800.0,gmodule-2.0.800.0,gobject-2.0.800.0::devel/glib2 \
LIB_DEPENDS= glib-2.0.1000.0,gmodule-2.0.1000.0,gobject-2.0.1000.0::devel/glib2 \
cairo.3::graphics/cairo
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
USE_X11= Yes
USE_GMAKE= Yes

View File

@ -1,4 +1,4 @@
MD5 (pango-1.10.2.tar.bz2) = 7302220d93ac17d2c44f356d852e81dc
RMD160 (pango-1.10.2.tar.bz2) = 8dd591ea5606a15806f575af98dc904640cee9cb
SHA1 (pango-1.10.2.tar.bz2) = dc67f60ed5840e0f9476b65e091a0a1dfc56811f
SIZE (pango-1.10.2.tar.bz2) = 1168421
MD5 (pango-1.12.1.tar.bz2) = 10ddfbc43cf895639b77788ca637409c
RMD160 (pango-1.12.1.tar.bz2) = 9dc4da7e9ace4391e907602e55321443b144278b
SHA1 (pango-1.12.1.tar.bz2) = 26f3268eabeea8aa45b1286dc7af3149c8d544a1
SIZE (pango-1.12.1.tar.bz2) = 1208619

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.4 2005/12/01 15:41:09 bernd Exp $
--- Makefile.in.orig Tue Nov 29 06:30:09 2005
+++ Makefile.in Wed Nov 30 15:34:05 2005
@@ -252,7 +252,7 @@ target_alias = @target_alias@
AUTOMAKE_OPTIONS = 1.7
$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 = \
pango.pc.in \
autogen.sh \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2006/01/03 10:40:09 bernd Exp $
--- configure.orig Mon Jan 2 22:19:22 2006
+++ configure Mon Jan 2 22:20:14 2006
@@ -23198,7 +23198,7 @@ fi
$OpenBSD: patch-configure,v 1.10 2006/05/22 01:41:52 brad Exp $
--- configure.orig Fri Apr 7 00:33:32 2006
+++ configure Wed May 10 18:01:16 2006
@@ -24033,7 +24033,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

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-examples_Makefile_in,v 1.12 2005/12/01 15:41:09 bernd Exp $
--- examples/Makefile.in.orig Tue Nov 29 06:30:47 2005
+++ examples/Makefile.in Wed Nov 30 15:34:05 2005
@@ -721,7 +721,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 && \
- $(top_builddir)/pango/pango-querymodules `find . -name '*.la' | grep -v \.libs` > ../examples/pango.modules ) ;\
+ LD_LIBRARY_PATH=$(top_builddir)/pango/.libs $(top_builddir)/pango/pango-querymodules `find . -name '*.la' | grep -v \.libs` > ../examples/pango.modules ) ;\
else \
echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
touch pango.modules; \

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-modules_Makefile_in,v 1.9 2005/12/01 15:41:09 bernd Exp $
--- modules/Makefile.in.orig Tue Nov 29 06:30:32 2005
+++ modules/Makefile.in Wed Nov 30 15:34:05 2005
@@ -560,21 +560,11 @@ uninstall-info: uninstall-info-recursive
$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
@CROSS_COMPILING_FALSE@all-local: pango.modules
install-data-local:
- @if $(RUN_QUERY_IMMODULES_TEST) ; then \
install-data-local: $(top_builddir)/pango/pango-querymodules
- @if $(RUN_QUERY_MODULES_TEST) ; then \
- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \
- $(top_builddir)/pango/pango-querymodules \
- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
@ -14,17 +14,17 @@ $OpenBSD: patch-modules_Makefile_in,v 1.9 2005/12/01 15:41:09 bernd Exp $
- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \
- else \
- echo "***" ; \
- echo "*** Warning: pango.modules not created" ; \
- echo "***" ; \
- echo "*** Warning: $(sysconfdir)/pango/pango.modules" ; \
- echo "*** not created" ; \
- echo "*** Generate this file on the target system" ; \
- echo "*** system using pango-querymodules" ; \
- echo "*** using pango-querymodules" ; \
- echo "***" ; \
- fi
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
+ LD_LIBRARY_PATH=$(top_builddir)/pango/.libs \
+ $(top_builddir)/pango/pango-querymodules \
+ `find $(DESTDIR)$(moduledir) -name '*.so'` | sed 's,$(DESTDIR),,' \
+ > $(DESTDIR)$(sysconfdir)/pango/pango.modules
+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \
+ LD_LIBRARY_PATH=$(top_builddir)/pango/.libs \
+ $(top_builddir)/pango/pango-querymodules \
+ `find $(DESTDIR)$(moduledir) -name '*.so'` | sed 's,$(DESTDIR),,' \
+ > $(DESTDIR)$(sysconfdir)/pango/pango.modules
included-modules:
@for d in $(SUBDIRS) ; do \
uninstall-local:
$(RM) $(DESTDIR)$(sysconfdir)/pango/pango.modules

View File

@ -1,48 +1,48 @@
$OpenBSD: patch-pango_Makefile_in,v 1.6 2006/01/03 10:40:09 bernd Exp $
--- pango/Makefile.in.orig Mon Jan 2 22:17:56 2006
+++ pango/Makefile.in Mon Jan 2 22:24:49 2006
@@ -313,7 +313,7 @@ pangoincludedir = $(includedir)/pango-1.
$OpenBSD: patch-pango_Makefile_in,v 1.7 2006/05/22 01:41:52 brad Exp $
--- pango/Makefile.in.orig Fri Apr 7 00:33:48 2006
+++ pango/Makefile.in Wed May 10 18:53:19 2006
@@ -364,7 +364,7 @@ pangoincludedir = $(includedir)/pango-1.
# ------------------- libpango -------------------
lib_LTLIBRARIES = libpango-1.0.la $(am__append_4) $(am__append_6) $(am__append_10) $(am__append_12) $(am__append_21)
lib_LTLIBRARIES = libpango-1.0.la $(am__append_4) $(am__append_6) $(am__append_10) $(am__append_12) $(am__append_22)
-libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_1)
+libpango_1_0_la_LDFLAGS = $(LIBpango-1.0_LTVERSION) $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_1)
libpango_1_0_la_LIBADD = $(GLIB_LIBS) mini-fribidi/libmini-fribidi.la $(libm)
libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la $(am__append_2)
@@ -380,7 +380,7 @@ pangoinclude_HEADERS = \
pango-enum-types.h\
$(am__append_3) $(am__append_5) $(am__append_9) $(am__append_11) $(am__append_20)
libpango_1_0_la_LIBADD = $(GLIB_LIBS) $(libm) mini-fribidi/libmini-fribidi.la
libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la $(am__append_2)
@@ -434,7 +434,7 @@ $(am__append_3) $(am__append_5) $(am__ap
@HAVE_X_TRUE@aliasdir = $(sysconfdir)/pango
@HAVE_X_TRUE@alias_DATA = pangox.aliases
-libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
+libpangox_1_0_la_LDFLAGS = $(LIBpangox-1.0_LTVERSION) $(LIBRARY_LIBTOOL_OPTIONS)
libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) $(GLIB_LIBS)
libpangox_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES)
@@ -393,7 +393,7 @@ libpangox_1_0_la_SOURCES = \
libpangox_1_0_la_LIBADD = \
libpango-$(PANGO_API_VERSION).la \
$(INCLUDED_X_MODULES) \
@@ -455,7 +455,7 @@ libpangox_1_0_la_SOURCES = \
pangox-fontmap.c
-libpangoft2_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_7)
+libpangoft2_1_0_la_LDFLAGS = $(LIBpangoft2-1.0_LTVERSION) $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_7)
libpangoft2_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) $(FREETYPE_LIBS) $(GLIB_LIBS) $(libm)
libpangoft2_1_0_la_DEPENDENCIES = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_FC_MODULES) $(am__append_8)
@@ -410,7 +410,7 @@ libpangoft2_1_0_la_SOURCES = \
module-defs-fc.c
libpangoft2_1_0_la_LIBADD = \
opentype/libmini-harfbuzz.la \
libpango-$(PANGO_API_VERSION).la \
@@ -487,7 +487,7 @@ libpangoft2_1_0_la_SOURCES = \
pango-ot-ruleset.c
-libpangoxft_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
+libpangoxft_1_0_la_LDFLAGS = $(LIBpangoxft-1.0_LTVERSION) $(LIBRARY_LIBTOOL_OPTIONS)
libpangoxft_1_0_la_LIBADD = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la $(XFT_LIBS) $(GLIB_LIBS) $(libm)
libpangoxft_1_0_la_DEPENDENCIES = libpangoft2-$(PANGO_API_VERSION).la libpango-$(PANGO_API_VERSION).la
@@ -421,7 +421,7 @@ libpangoxft_1_0_la_SOURCES = \
libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
libpango-$(PANGO_API_VERSION).la \
@@ -506,7 +506,7 @@ libpangoxft_1_0_la_SOURCES = \
pangoxft-render.c
-libpangocairo_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_13)
+libpangocairo_1_0_la_LDFLAGS = $(LIBpangocairo-1.0_LTVERSION) $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_13)
libpangocairo_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(CAIRO_LIBS) $(GLIB_LIBS) $(am__append_15) $(am__append_17)
libpangocairo_1_0_la_DEPENDENCIES = libpango-$(PANGO_API_VERSION).la $(am__append_14) $(am__append_18)
libpangocairo_1_0_la_LIBADD = \
libpango-$(PANGO_API_VERSION).la \
$(GLIB_LIBS) \

View File

@ -1,16 +1,16 @@
@comment $OpenBSD: PFRAG.shared,v 1.12 2006/01/03 10:40:10 bernd Exp $
@comment $OpenBSD: PFRAG.shared,v 1.13 2006/05/22 01:41:52 brad 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.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
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

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.12 2005/11/13 06:23:00 marcm Exp $
@comment $OpenBSD: PLIST,v 1.13 2006/05/22 01:41:52 brad Exp $
bin/pango-querymodules
bin/pango-view
include/pango-1.0/
include/pango-1.0/pango/
include/pango-1.0/pango/pango-attributes.h
@ -42,28 +43,28 @@ lib/libpangox-1.0.la
lib/libpangoxft-1.0.a
lib/libpangoxft-1.0.la
lib/pango/
lib/pango/1.4.0/
lib/pango/1.4.0/modules/
lib/pango/1.4.0/modules/pango-arabic-fc.a
lib/pango/1.4.0/modules/pango-arabic-fc.la
lib/pango/1.4.0/modules/pango-basic-fc.a
lib/pango/1.4.0/modules/pango-basic-fc.la
lib/pango/1.4.0/modules/pango-basic-x.a
lib/pango/1.4.0/modules/pango-basic-x.la
lib/pango/1.4.0/modules/pango-hangul-fc.a
lib/pango/1.4.0/modules/pango-hangul-fc.la
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
lib/pango/1.4.0/modules/pango-thai-fc.la
lib/pango/1.4.0/modules/pango-tibetan-fc.a
lib/pango/1.4.0/modules/pango-tibetan-fc.la
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/pkgconfig/
lib/pkgconfig/pango.pc
lib/pkgconfig/pangocairo.pc
@ -93,6 +94,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-ATSUI-Fonts.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