From b6d9508f450de7711421bb214243e467365f3e2c Mon Sep 17 00:00:00 2001 From: marcm Date: Mon, 30 Jun 2003 03:57:38 +0000 Subject: [PATCH] Update to 1.2.3. Various bug fixes, a large speedup to layout with the Xft and FT2 backends, and new shapers. --- devel/pango/Makefile | 14 ++-- devel/pango/distinfo | 6 +- devel/pango/patches/patch-configure | 30 --------- .../pango/patches/patch-examples_Makefile_in | 8 +-- devel/pango/patches/patch-ltmain_sh | 67 +++++++++---------- devel/pango/patches/patch-modules_Makefile_in | 10 +-- devel/pango/patches/patch-pango_Makefile_in | 22 +++--- devel/pango/pkg/PFRAG.shared | 12 ++-- devel/pango/pkg/PLIST | 6 +- 9 files changed, 72 insertions(+), 103 deletions(-) delete mode 100644 devel/pango/patches/patch-configure diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 7e6dadfe80b..d923a9d4062 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2003/04/17 05:58:47 marcm Exp $ +# $OpenBSD: Makefile,v 1.5 2003/06/30 03:57:38 marcm Exp $ COMMENT= "library for layout and rendering of text" -DISTNAME= pango-1.2.1 +DISTNAME= pango-1.2.3 CATEGORIES= devel x11 HOMEPAGE= http://www.gtk.org @@ -21,10 +21,7 @@ LIB_DEPENDS= glib-2.0.0.8,gmodule-2.0.0.8,gobject-2.0.0.8::devel/glib2 BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig # library versions (major:minor) -LIBPANGO_VERSION= 0:7 -LIBPANGOFT2_VERSION= 0:7 -LIBPANGOX_VERSION= 0:7 -LIBPANGOXFT_VERSION= 0:7 +OBSD_LIB_VERSION= 0:9 SEPARATE_BUILD= concurrent USE_X11= Yes @@ -36,10 +33,7 @@ CONFIGURE_ARGS+= --enable-static CONFIGURE_ARGS+= --without-qt CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" -MAKE_ENV= LIBPANGO_VERSION="${LIBPANGO_VERSION}" \ - LIBPANGOFT2_VERSION="${LIBPANGOFT2_VERSION}" \ - LIBPANGOX_VERSION="${LIBPANGOX_VERSION}" \ - LIBPANGOXFT_VERSION="${LIBPANGOXFT_VERSION}" +MAKE_ENV= OBSD_LIB_VERSION="${OBSD_LIB_VERSION}" post-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pango; \ diff --git a/devel/pango/distinfo b/devel/pango/distinfo index beabd325e3d..9d835e78302 100644 --- a/devel/pango/distinfo +++ b/devel/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (pango-1.2.1.tar.bz2) = 6b354ef14e75739a92b5b78f4ca3165a -RMD160 (pango-1.2.1.tar.bz2) = db4a49eaa0260065fe03a8a052bac946b2697c61 -SHA1 (pango-1.2.1.tar.bz2) = 83d905100c6b45fd7bd01eb928d592d2091f8e8e +MD5 (pango-1.2.3.tar.bz2) = 12247592ea582907cfd2de81aeb32caf +RMD160 (pango-1.2.3.tar.bz2) = 185feebfe795ae071fa7449f56ad7d5b818e72ee +SHA1 (pango-1.2.3.tar.bz2) = 44bbcec64e5e6324a24f0c4500fb468d258dbe5d diff --git a/devel/pango/patches/patch-configure b/devel/pango/patches/patch-configure deleted file mode 100644 index 7818d9d0f66..00000000000 --- a/devel/pango/patches/patch-configure +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2003/04/17 05:58:47 marcm Exp $ ---- configure.orig Tue Feb 25 18:18:58 2003 -+++ configure Tue Feb 25 18:20:05 2003 -@@ -5781,7 +5781,7 @@ else - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case "$host_os" in -@@ -5791,7 +5791,7 @@ else - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ hardcode_libdir_flag_spec='${wl}-R$libdir' - ;; - esac - fi -@@ -6348,6 +6348,8 @@ openbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no -+ sys_lib_search_path_spec="/usr/lib" -+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib" - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case "$host_os" in - openbsd2.[89] | openbsd2.[89].*) diff --git a/devel/pango/patches/patch-examples_Makefile_in b/devel/pango/patches/patch-examples_Makefile_in index dab6b277a2d..f20375654bf 100644 --- a/devel/pango/patches/patch-examples_Makefile_in +++ b/devel/pango/patches/patch-examples_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-examples_Makefile_in,v 1.4 2003/04/17 05:58:47 marcm Exp $ ---- examples/Makefile.in.orig Wed Jan 29 09:59:30 2003 -+++ examples/Makefile.in Tue Feb 25 15:37:58 2003 -@@ -521,7 +521,7 @@ pango.modules: +$OpenBSD: patch-examples_Makefile_in,v 1.5 2003/06/30 03:57:38 marcm Exp $ +--- examples/Makefile.in.orig Sun Jun 8 21:41:51 2003 ++++ examples/Makefile.in Thu Jun 19 09:18:58 2003 +@@ -527,7 +527,7 @@ pango.modules: 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 && \ diff --git a/devel/pango/patches/patch-ltmain_sh b/devel/pango/patches/patch-ltmain_sh index 6f3299a71a8..bf48122eced 100644 --- a/devel/pango/patches/patch-ltmain_sh +++ b/devel/pango/patches/patch-ltmain_sh @@ -1,7 +1,7 @@ -$OpenBSD: patch-ltmain_sh,v 1.2 2003/04/17 05:58:47 marcm Exp $ ---- ltmain.sh.orig Fri Nov 8 12:40:11 2002 -+++ ltmain.sh Tue Feb 25 15:37:59 2003 -@@ -1082,6 +1082,17 @@ compiler." +$OpenBSD: patch-ltmain_sh,v 1.3 2003/06/30 03:57:38 marcm Exp $ +--- ltmain.sh.orig Thu Apr 24 16:44:23 2003 ++++ ltmain.sh Thu Jun 19 09:20:05 2003 +@@ -1290,6 +1290,17 @@ EOF continue ;; @@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2003/04/17 05:58:47 marcm Exp $ -module) module=yes continue -@@ -1522,6 +1533,10 @@ compiler." +@@ -1961,6 +1972,10 @@ EOF fi continue ;; @@ -30,56 +30,55 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2003/04/17 05:58:47 marcm Exp $ %DEPLIBS%) alldeplibs=yes continue -@@ -1767,11 +1782,6 @@ compiler." - continue - fi - +@@ -2209,10 +2224,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 -- - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names -@@ -4575,40 +4585,6 @@ relink_command=\"$relink_command\"" + # This is a shared library + + # Warn about portability, can't link against -module's on some systems (darwin) +@@ -5705,40 +5716,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 + test "$show" = : && exit 0 -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" +- $echo "----------------------------------------------------------------------" +- $echo "Libraries have been installed in:" - for libdir in $libdirs; do -- echo " $libdir" +- $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:" +- $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" +- $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" +- $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" +- $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then -- echo " - have your system administrator run these commands:$admincmds" +- $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'" +- $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 "----------------------------------------------------------------------" +- $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 0 ;; diff --git a/devel/pango/patches/patch-modules_Makefile_in b/devel/pango/patches/patch-modules_Makefile_in index 089faefcffb..303e0813c42 100644 --- a/devel/pango/patches/patch-modules_Makefile_in +++ b/devel/pango/patches/patch-modules_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_Makefile_in,v 1.3 2003/04/17 05:58:47 marcm Exp $ ---- modules/Makefile.in.orig Wed Jan 29 09:59:23 2003 -+++ modules/Makefile.in Tue Feb 25 15:37:59 2003 -@@ -117,6 +117,7 @@ WIN32_LIBS = @WIN32_LIBS@ +$OpenBSD: patch-modules_Makefile_in,v 1.4 2003/06/30 03:57:38 marcm Exp $ +--- modules/Makefile.in.orig Sun Jun 8 21:41:47 2003 ++++ modules/Makefile.in Thu Jun 19 09:18:58 2003 +@@ -123,6 +123,7 @@ WIN32_LIBS = @WIN32_LIBS@ XFT_CFLAGS = @XFT_CFLAGS@ XFT_LIBS = @XFT_LIBS@ ms_librarian = @ms_librarian@ @@ -9,7 +9,7 @@ $OpenBSD: patch-modules_Makefile_in,v 1.3 2003/04/17 05:58:47 marcm Exp $ SUBDIRS = \ arabic \ -@@ -338,21 +339,11 @@ maintainer-clean-generic clean mostlycle +@@ -344,21 +345,11 @@ maintainer-clean-generic clean mostlycle install-data-local: diff --git a/devel/pango/patches/patch-pango_Makefile_in b/devel/pango/patches/patch-pango_Makefile_in index 3a84e239e9c..31a222cacde 100644 --- a/devel/pango/patches/patch-pango_Makefile_in +++ b/devel/pango/patches/patch-pango_Makefile_in @@ -1,39 +1,39 @@ -$OpenBSD: patch-pango_Makefile_in,v 1.2 2003/04/17 05:58:47 marcm Exp $ ---- pango/Makefile.in.orig Wed Jan 29 09:59:21 2003 -+++ pango/Makefile.in Tue Feb 25 15:37:59 2003 -@@ -217,7 +217,7 @@ libpangox_1_0_la_SOURCES = \ +$OpenBSD: patch-pango_Makefile_in,v 1.3 2003/06/30 03:57:38 marcm Exp $ +--- pango/Makefile.in.orig Sun Jun 8 21:41:45 2003 ++++ pango/Makefile.in Thu Jun 19 09:18:58 2003 +@@ -223,7 +223,7 @@ libpangox_1_0_la_SOURCES = \ libpango_1_0_la_LDFLAGS = \ - -version-info $(LT_VERSION_INFO) \ -+ -version-info $(LIBPANGO_VERSION) \ ++ -version-info $(OBSD_LIB_VERSION) \ $(GLIB_LIBS) \ $(no_undefined) $(pango_export_symbols) -@@ -225,7 +225,7 @@ libpango_1_0_la_LDFLAGS = \ +@@ -231,7 +231,7 @@ libpango_1_0_la_LDFLAGS = \ @HAVE_FRIBIDI_FALSE@libpango_1_0_la_LIBADD = @HAVE_FRIBIDI_FALSE@mini-fribidi/libmini-fribidi.la $(pango_win32res) libpango_1_0_la_DEPENDENCIES = $(pango_win32res) -libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -+libpangox_1_0_la_LDFLAGS = -version-info $(LIBPANGOX_VERSION) ++libpangox_1_0_la_LDFLAGS = -version-info $(OBSD_LIB_VERSION) libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) libpangox_1_0_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango-$(PANGO_API_VERSION).la -@@ -252,7 +252,7 @@ libpangoxft_1_0_la_SOURCES = \ +@@ -258,7 +258,7 @@ libpangoxft_1_0_la_SOURCES = \ module-defs-xft.c -libpangoxft_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -+libpangoxft_1_0_la_LDFLAGS = -version-info $(LIBPANGOXFT_VERSION) ++libpangoxft_1_0_la_LDFLAGS = -version-info $(OBSD_LIB_VERSION) libpangoxft_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) libpangoxft_1_0_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango-$(PANGO_API_VERSION).la -@@ -264,7 +264,7 @@ libpangoft2_1_0_la_SOURCES = \ +@@ -270,7 +270,7 @@ libpangoft2_1_0_la_SOURCES = \ module-defs-ft2.c -libpangoft2_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ -+libpangoft2_1_0_la_LDFLAGS = -version-info $(LIBPANGOFT2_VERSION) \ ++libpangoft2_1_0_la_LDFLAGS = -version-info $(OBSD_LIB_VERSION) \ $(GLIB_LIBS) \ $(no_undefined) $(pangoft2_export_symbols) diff --git a/devel/pango/pkg/PFRAG.shared b/devel/pango/pkg/PFRAG.shared index f8fbaa1f1c7..7ff3e86ea97 100644 --- a/devel/pango/pkg/PFRAG.shared +++ b/devel/pango/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2003/04/17 05:58:47 marcm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.4 2003/06/30 03:57:38 marcm Exp $ lib/pango/1.2.0/modules/pango-arabic-ft2.so lib/pango/1.2.0/modules/pango-arabic-x.so lib/pango/1.2.0/modules/pango-arabic-xft.so @@ -14,13 +14,15 @@ lib/pango/1.2.0/modules/pango-hangul-xft.so lib/pango/1.2.0/modules/pango-hebrew-ft2.so lib/pango/1.2.0/modules/pango-hebrew-x.so lib/pango/1.2.0/modules/pango-hebrew-xft.so +lib/pango/1.2.0/modules/pango-indic-ft2.so lib/pango/1.2.0/modules/pango-indic-xft.so lib/pango/1.2.0/modules/pango-myanmar-x.so lib/pango/1.2.0/modules/pango-tamil-x.so +lib/pango/1.2.0/modules/pango-thai-ft2.so lib/pango/1.2.0/modules/pango-thai-x.so lib/pango/1.2.0/modules/pango-thai-xft.so -lib/libpango-1.0.so.0.7 -lib/libpangoft2-1.0.so.0.7 -lib/libpangox-1.0.so.0.7 -lib/libpangoxft-1.0.so.0.7 +lib/libpango-1.0.so.0.9 +lib/libpangoft2-1.0.so.0.9 +lib/libpangox-1.0.so.0.9 +lib/libpangoxft-1.0.so.0.9 DYNLIBDIR(%D/lib) diff --git a/devel/pango/pkg/PLIST b/devel/pango/pkg/PLIST index 721f87c31b5..769e7a65a53 100644 --- a/devel/pango/pkg/PLIST +++ b/devel/pango/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2003/04/17 05:58:47 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.4 2003/06/30 03:57:38 marcm Exp $ bin/pango-querymodules include/pango-1.0/pango/pango-attributes.h include/pango-1.0/pango/pango-break.h @@ -61,12 +61,16 @@ lib/pango/1.2.0/modules/pango-hebrew-x.a lib/pango/1.2.0/modules/pango-hebrew-x.la lib/pango/1.2.0/modules/pango-hebrew-xft.a lib/pango/1.2.0/modules/pango-hebrew-xft.la +lib/pango/1.2.0/modules/pango-indic-ft2.a +lib/pango/1.2.0/modules/pango-indic-ft2.la lib/pango/1.2.0/modules/pango-indic-xft.a lib/pango/1.2.0/modules/pango-indic-xft.la lib/pango/1.2.0/modules/pango-myanmar-x.a lib/pango/1.2.0/modules/pango-myanmar-x.la lib/pango/1.2.0/modules/pango-tamil-x.a lib/pango/1.2.0/modules/pango-tamil-x.la +lib/pango/1.2.0/modules/pango-thai-ft2.a +lib/pango/1.2.0/modules/pango-thai-ft2.la lib/pango/1.2.0/modules/pango-thai-x.a lib/pango/1.2.0/modules/pango-thai-x.la lib/pango/1.2.0/modules/pango-thai-xft.a