head 1.13; access; symbols pkgsrc-2013Q2:1.13.0.8 pkgsrc-2013Q2-base:1.13 pkgsrc-2012Q4:1.13.0.6 pkgsrc-2012Q4-base:1.13 pkgsrc-2011Q4:1.13.0.4 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q2:1.13.0.2 pkgsrc-2011Q2-base:1.13 pkgsrc-2011Q1:1.12.0.4 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.2 pkgsrc-2009Q4:1.11.0.2 pkgsrc-2009Q4-base:1.11 pkgsrc-2008Q4:1.8.0.22 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.20 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.18 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.16 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.14 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.12 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.10 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.8 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.6 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.4 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.2 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.6.0.20 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.18 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.16 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.14 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.12 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.10 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.8 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.6 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.4 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.2 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.5.0.4 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.5.0.2 netbsd-1-6-1-base:1.5 buildlink2-base:1.1 buildlink2:1.1.0.4 netbsd-1-6:1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.2 pkgviews-base:1.1; locks; strict; comment @# @; 1.13 date 2011.04.11.15.35.53; author drochner; state dead; branches; next 1.12; 1.12 date 2011.01.27.14.04.51; author drochner; state Exp; branches 1.12.2.1; next 1.11; 1.11 date 2009.12.15.15.09.21; author drochner; state dead; branches; next 1.10; 1.10 date 2009.11.25.09.58.39; author tron; state Exp; branches; next 1.9; 1.9 date 2009.11.22.19.14.42; author sno; state Exp; branches; next 1.8; 1.8 date 2006.08.10.16.12.59; author wiz; state dead; branches; next 1.7; 1.7 date 2006.07.24.18.09.43; author minskim; state Exp; branches; next 1.6; 1.6 date 2004.01.22.13.39.23; author jmmv; state dead; branches; next 1.5; 1.5 date 2002.12.24.03.41.12; author wiz; state Exp; branches; next 1.4; 1.4 date 2002.12.22.18.06.22; author jmmv; state Exp; branches; next 1.3; 1.3 date 2002.10.30.03.09.32; author rh; state dead; branches; next 1.2; 1.2 date 2002.08.25.19.22.37; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.07.18.02.19.36; author rh; state Exp; branches 1.1.4.1; next ; 1.12.2.1 date 2011.01.27.14.04.51; author spz; state dead; branches; next 1.12.2.2; 1.12.2.2 date 2011.03.05.17.58.14; author spz; state Exp; branches; next ; 1.1.4.1 date 2002.07.18.02.19.36; author jlam; state dead; branches; next 1.1.4.2; 1.1.4.2 date 2002.08.22.11.10.53; author jlam; state Exp; branches; next ; desc @@ 1.13 log @update to 1.28.4 changes: bugfixes @ text @$NetBSD: patch-ad,v 1.12 2011/01/27 14:04:51 drochner Exp $ https://bugzilla.gnome.org/show_bug.cgi?id=639882 --- pango/pangoft2-render.c.orig 2010-02-09 12:06:28.000000000 +0000 +++ pango/pangoft2-render.c @@@@ -121,9 +121,14 @@@@ pango_ft2_font_render_box_glyph (int box->bitmap.width = width; box->bitmap.rows = height; - box->bitmap.pitch = height; + box->bitmap.pitch = width; - box->bitmap.buffer = g_malloc0 (box->bitmap.rows * box->bitmap.pitch); + box->bitmap.buffer = g_malloc0_n (box->bitmap.rows, box->bitmap.pitch); + + if (G_UNLIKELY (!box->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, box); + return NULL; + } /* draw the box */ for (j = 0; j < line_width; j++) @@@@ -226,6 +231,11 @@@@ pango_ft2_font_render_glyph (PangoFont * rendered->bitmap_left = face->glyph->bitmap_left; rendered->bitmap_top = face->glyph->bitmap_top; + if (G_UNLIKELY (!rendered->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, rendered); + return NULL; + } + return rendered; } else @@@@ -276,6 +286,8 @@@@ pango_ft2_renderer_draw_glyph (PangoRend if (rendered_glyph == NULL) { rendered_glyph = pango_ft2_font_render_glyph (font, glyph); + if (rendered_glyph == NULL) + return; add_glyph_to_cache = TRUE; } @ 1.12 log @-add patch from https://bugzilla.gnome.org/show_bug.cgi?id=639882 to fix possible heap corruption when parsing a corrupt font (CVE-2011-0020) -being here, add a patch from upstream to fix a scaling inconsistency bump PKGREV @ text @d1 1 a1 1 $NetBSD$ @ 1.12.2.1 log @file patch-ad was added on branch pkgsrc-2010Q4 on 2011-03-05 17:58:14 +0000 @ text @d1 44 @ 1.12.2.2 log @Pullup ticket #3377 - requested by tron devel/pango: security update Revisions pulled up: - devel/pango/Makefile 1.151 - devel/pango/distinfo 1.87 - devel/pango/patches/patch-ac 1.15 - devel/pango/patches/patch-ad 1.12 ---------------------------------------------------------------------------- Module Name: pkgsrc Committed By: drochner Date: Thu Jan 27 14:04:51 UTC 2011 Modified Files: pkgsrc/devel/pango: Makefile distinfo Added Files: pkgsrc/devel/pango/patches: patch-ac patch-ad Log Message: -add patch from https://bugzilla.gnome.org/show_bug.cgi?id=3D639882 to fix possible heap corruption when parsing a corrupt font (CVE-2011-0020) -being here, add a patch from upstream to fix a scaling inconsistency bump PKGREV @ text @a0 44 $NetBSD$ https://bugzilla.gnome.org/show_bug.cgi?id=639882 --- pango/pangoft2-render.c.orig 2010-02-09 12:06:28.000000000 +0000 +++ pango/pangoft2-render.c @@@@ -121,9 +121,14 @@@@ pango_ft2_font_render_box_glyph (int box->bitmap.width = width; box->bitmap.rows = height; - box->bitmap.pitch = height; + box->bitmap.pitch = width; - box->bitmap.buffer = g_malloc0 (box->bitmap.rows * box->bitmap.pitch); + box->bitmap.buffer = g_malloc0_n (box->bitmap.rows, box->bitmap.pitch); + + if (G_UNLIKELY (!box->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, box); + return NULL; + } /* draw the box */ for (j = 0; j < line_width; j++) @@@@ -226,6 +231,11 @@@@ pango_ft2_font_render_glyph (PangoFont * rendered->bitmap_left = face->glyph->bitmap_left; rendered->bitmap_top = face->glyph->bitmap_top; + if (G_UNLIKELY (!rendered->bitmap.buffer)) { + g_slice_free (PangoFT2RenderedGlyph, rendered); + return NULL; + } + return rendered; } else @@@@ -276,6 +286,8 @@@@ pango_ft2_renderer_draw_glyph (PangoRend if (rendered_glyph == NULL) { rendered_glyph = pango_ft2_font_render_glyph (font, glyph); + if (rendered_glyph == NULL) + return; add_glyph_to_cache = TRUE; } @ 1.11 log @update to 1.26.2 changes: fix non-standard / illegal code which broke build on some platforms (was patched in pkgsrc) @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.10 2009/11/25 09:58:39 tron Exp $ d3 1 a3 2 See https://bugzilla.gnome.org/show_bug.cgi?id=602408 and https://bugzilla.gnome.org/show_bug.cgi?id=602660 d5 33 a37 27 --- pango/opentype/hb-ot-layout-common-private.hh.orig +++ pango/opentype/hb-ot-layout-common-private.hh @@@@ -67,14 +67,15 @@@@ struct RecordArrayOf : ArrayOf > { inline const Tag& get_tag (unsigned int i) const { if (HB_UNLIKELY (i >= this->len)) return Null(Tag); - return this->array[i].tag; + return (*this)[i].tag; } inline bool get_tags (unsigned int *record_count /* IN/OUT */, hb_tag_t *record_tags /* OUT */) const { + const Record *a = this->const_array(); unsigned int count = MIN (this->len, *record_count); for (unsigned int i = 0; i < count; i++) - record_tags[i] = this->array[i].tag; + record_tags[i] = a[i].tag; *record_count = this->len; return !!this->len; @@@@ -83,10 +84,11 @@@@ struct RecordArrayOf : ArrayOf > { { const Tag t = tag; // TODO bsearch + const Record *a = this->const_array(); unsigned int count = this->len; for (unsigned int i = 0; i < count; i++) d39 5 a43 93 - if (t == this->array[i].tag) + if (t == a[i].tag) { if (index) *index = i; return true; @@@@ -116,14 +118,15 @@@@ struct IndexArray : ArrayOf { if (HB_UNLIKELY (i >= this->len)) return NO_INDEX; - return this->array[i]; + return this->const_array()[i]; } inline bool get_indexes (unsigned int *_count /* IN/OUT */, unsigned int *_indexes /* OUT */) const { unsigned int count = MIN (this->len, *_count); + const USHORT *a = this->const_array(); for (unsigned int i = 0; i < count; i++) - _indexes[i] = this->array[i]; + _indexes[i] = a[i]; *_count = this->len; return !!this->len; @@@@ -283,7 +286,7 @@@@ struct Lookup inline bool sanitize (SANITIZE_ARG_DEF) { TRACE_SANITIZE (); - if (!(SANITIZE_SELF () && SANITIZE_THIS (subTable))) return false; + if (!(SANITIZE (lookupType) && SANITIZE (lookupFlag) && SANITIZE_THIS (subTable))) return false; if (HB_UNLIKELY (lookupFlag & LookupFlag::UseMarkFilteringSet)) { USHORT &markFilteringSet = NEXT (USHORT, subTable); @@@@ -296,11 +299,11 @@@@ struct Lookup USHORT lookupFlag; /* Lookup qualifiers */ OffsetArrayOf subTable; /* Array of SubTables */ - USHORT markFilteringSetX[0]; /* Index (base 0) into GDEF mark glyph sets + USHORT markFilteringSetX[VAR]; /* Index (base 0) into GDEF mark glyph sets * structure. This field is only present if bit * UseMarkFilteringSet of lookup flags is set. */ }; -ASSERT_SIZE (Lookup, 6); +ASSERT_SIZE_VAR (Lookup, 6, USHORT); typedef OffsetListOf LookupList; ASSERT_SIZE (LookupList, 2); @@@@ -320,7 +320,7 @@@@ struct CoverageFormat1 if (HB_UNLIKELY (glyph_id > 0xFFFF)) return NOT_COVERED; GlyphID gid; - gid = glyph_id; + gid.set (glyph_id); // TODO: bsearch unsigned int num_glyphs = glyphArray.len; for (unsigned int i = 0; i < num_glyphs; i++) @@@@ -425,11 +428,10 @@@@ struct Coverage private: union { USHORT format; /* Format identifier */ - CoverageFormat1 format1[]; - CoverageFormat2 format2[]; + CoverageFormat1 format1[VAR]; + CoverageFormat2 format2[VAR]; } u; }; -ASSERT_SIZE (Coverage, 2); /* @@@@ -541,11 +543,10 @@@@ struct ClassDef private: union { USHORT format; /* Format identifier */ - ClassDefFormat1 format1[]; - ClassDefFormat2 format2[]; + ClassDefFormat1 format1[VAR]; + ClassDefFormat2 format2[VAR]; } u; }; -ASSERT_SIZE (ClassDef, 2); /* @@@@ -595,9 +596,9 @@@@ struct Device USHORT startSize; /* Smallest size to correct--in ppem */ USHORT endSize; /* Largest size to correct--in ppem */ USHORT deltaFormat; /* Format of DeltaValue array data: 1, 2, or 3 */ - USHORT deltaValue[]; /* Array of compressed data */ + USHORT deltaValue[VAR]; /* Array of compressed data */ }; -ASSERT_SIZE (Device, 6); +ASSERT_SIZE_VAR (Device, 6, USHORT); a44 1 #endif /* HB_OT_LAYOUT_COMMON_PRIVATE_HH */ @ 1.10 log @Add patches on behalf of Jens Rehsack: Pango was using invalid c++ code and Sun Studio avoids that to compile. Applied patches are taken from the bug-fixes committed upstream -HEAD taken from harrbuuz-ng repository for pango. Bump package revision because of these patches. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.9 2009/11/22 19:14:42 sno Exp $ @ 1.9 log @Adding some patches to get it a bit further compiled with Sun Studio (see https://bugzilla.gnome.org/show_bug.cgi?id=602408). Without commiting so far I couldn't check progress over the week - sorry for the extra noise. @ text @d1 1 a1 1 $NetBSD$ d4 1 d8 72 d89 40 @ 1.8 log @Update to 1.14.0: Overview of changes between 1.13.5 and 1.14.0 ============================================== * Make pango-view accept non-ASCII --text. * Require cairo-1.2.2 for the important bug fixes it has. Overview of changes between 1.13.4 and 1.13.5 ============================================== * Indic shaper improvements. * Misc fixes. * Bugs fixed in this release: Bug 121672 – Ra (vattu) not rendered properly in Malayalam Patch from LingNing Zhang Bug 335811 – Some conjugates of Malayalam are wrong. Patch from LingNing Zhang Overview of changes between 1.13.3 and 1.13.4 ============================================== * Update to Unicode Character Database 5.0.0. * Misc fixes. * Bugs fixed in this release: Bug 336282 – Update to Unicode Character Database 5.0.0 Bug 347073 – Allow empty GPOS table Bug 347021 – atsui crash when a matching font cannot be found. Patch from Brian Tarricone. Overview of changes between 1.13.2 and 1.13.3 ============================================== * Improved build system. Using gnome-autogen.sh now. (gnome-common needed for bootstrapping) * Improved documentation. Docs now include list of new API for each stable version of Pango. * New public API: - pango_glyph_string_get_width * Little performance improvement. * Misc fixes. * Bugs fixed in this release: Bug 330603 – pango_scan_int invokes undefined behaviour Bug 315599 – PangoAttribute remains in wrong context. Bug 163677 – pango_attr_list_splice: inconsistent docs Patch from Morten Welinder Bug 345070 – [ml_IN] not render for combination with ZWJ Patch from LingNing Zhang Bug 345274 – list of new symbols for each version is missing in docs Patch from Priit Laes Bug 346297 – autogen doesn't work with automake-1.6 Patch from Priit Laes Bug 135683 – Cache glyphstring extents Bug 344766 – Memory leak in get_ruleset() in modules/basic/basic-fc.c Bug 345600 – cvs build error in pango/opentype/Makefile Bug 345511 – -no-undefined problem with new libtool Overview of changes between 1.13.1 and 1.13.2 ============================================== * Improved hexbox drawing, and font metrics calculations. * Synthesize italic variants on win32 [Hans Breuer] * New public API: - pango_cairo_show_error_underline - pango_cairo_error_underline_path - pango_font_describe_with_absolute_size * Misc fixes. * Bugs fixed in this release: Bug 326960 – hex box drawing for win32 and atsui backends of cairo Bug 343717 – License information in unclear. Bug 343355 – Add pango_cairo_show_error_underline & pango_cairo_error_underline_path Bug 343966 – pango Cygwin build fixes Patch from Cygwin Ports maintainer. Bug 343796 – Italic Chinese character can't be show correctly in Win32. Bug 314114 – max_x_advance not appropriate for approximate_(char|digit)_width Bug 341138 – Using TTC font, Gtk2 programs begin to eating big memory and have many cpu usage. Patch from Yong Li. Bug 336153 – Mark to mark positioning (Lookup Type 6) isn't correct when using MarkAttchmentType Patch from Tin Myo Htet. Bug 333984 – pango_language_from_string improvements Bug 125378 – Better underline thickness handling Bug 339730 – Pango needlessly falls back away from a Type 1 font into a TTF font Bug 342562 – Support absolute sizes in pango_font_description_to/from_string Bug 341922 – pango should handle more characters as zero width Patch from Roozbeh Pournader Bug 342525 – With PangoFc and PangoWin32, approximate digit width is not what it says Bug 342079 – pangoatsui-private.h missing from release Overview of changes between 1.13.0 and 1.13.1 ============================================== * Increased robustness against broken pango.modules * Improved build infrastructure: - Remove CAIRO_CFLAGS from pangocairo.pc.in, as it Require's cairo already. - Use -no-undefined on Unix too. * Improved documentation. * Misc fixes. * Bugs fixed in this release: Bug 307196 – Unhinted fonts are measured incorrectly and drawing problems occur as a result Bug 329547 – pango_layout_get_pixel_extents and pango_layout_get_pixel_size cause off-by-one metrics Bug 339747 – pango_font_metrics_get_approximate_digit_width docs Bug 339749 – pango_language_from_string issues Patch from Morten Welinder. Bug 333771 – Use gmodule-no-export-2.0 instead of gmodule-2.0 in pango-uninstalled.pc.in Bug 337594 – pango_glyph_string_extents_range possible bug Bug 329664 – Move gunichar_to_glyph cache from PangoCairoFcFont to PangoFcFont Patch from LingNing Zhang. Bug 322374 – Examples does not build on MacOS X Bug 340229 – pango_font_description_from_string does not do bound checking Bug 329483 – hinting hexbox in cairo backend doesn't handle absolute font size Bug 340040 – pangocairo hex box hinting falls apart with PS/PDF backends Bug 71033 – make size 0 fonts work Overview of changes between 1.12.0 and 1.13.0 ============================================== * Fix incorrect rendering when in x86 64-bit precision mode https://bugs.freedesktop.org/show_bug.cgi?id=5200 * Fix non-OpenType fonts losing kerning in 1.12.0 [#336026, Denis Jacquerye] * Fix blurred underlines on Win32 [#332656, Tor Lillqvist] * Build fix when having both Win32 and FreeType cairo backends available [#337502, Alexander Larsson] * Moved the OpenType Layout code into a new project called HarfBuzz: http://www.freedesktop.org/wiki/Software/HarfBuzz * Improved documentation. * Misc bug fixes. * Fixed many compiler warnings. * Bugs fixed in this release: 332656,335840,334802,337029,337821,338343 @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7 2006/07/24 18:09:43 minskim Exp $ d3 1 a3 1 http://bugzilla.gnome.org/show_bug.cgi?id=322374 d5 11 a15 10 --- pango/Makefile.in.orig 2006-07-24 09:57:03.000000000 -0700 +++ pango/Makefile.in @@@@ -524,6 +524,7 @@@@ libpangocairo_1_0_la_SOURCES = \ $(am__append_16) $(am__append_19) $(am__append_20) @@HAVE_CAIRO_ATSUI_TRUE@@libpangocairo_1_0_la_CFLAGS = -xobjective-c +@@HAVE_CAIRO_ATSUI_TRUE@@libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework Carbon -framework Cocoa libpangowin32_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS) $(am__append_23) libpangowin32_1_0_la_LIBADD = \ @ 1.7 log @Add a patch for GNOME bug 322374, which may cause link errors when the atsui module is enabled. Patch obtained from GNOME CVS. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Move "configuration" files from PKG_SYSCONFDIR to PREFIX/libdata. What pango installs are something like databases that need to be handled automatically by the package system during installation of modules, not by the end user. Bump PKGREVISION to 1. (As a side effect, the package gets simplified a lot). There are no packages in pkgsrc installing pango modules at the moment. When they come, we can easily add a framework to handle them, as has been done for x11/gtk2. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2002/12/24 03:41:12 wiz Exp $ d3 6 a8 4 --- pango/pangox-fontmap.c.orig Tue Oct 15 00:50:47 2002 +++ pango/pangox-fontmap.c @@@@ -912,7 +912,7 @@@@ pango_x_font_map_read_aliases (PangoXFon int n; d10 2 a11 3 if (!files_str) - files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases"); + files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pangox.aliases"); d13 2 a14 2 files = pango_split_file_list (files_str); @ 1.5 log @Update to 1.2.0. Depend on Xft2. Changes: * Improve font solection for Hangul tone marks * Improve range definitions for basic-xft [Jungshik Shin] * Draw unknown character boxes with X primitives for the X backend instead of hoping for a suitable glyph [Morten Welinder] * For Xft/FT2, give an informative error mesage when no fonts are found. * Support shape modules with ranges beyond the BMP [Federic Zhang] * Use octal escapes rather than literal UTF-8 [Arnaud Charlet] * Use g_[sf]printf where appropriate [Matthias Clasen] * Fix the Arabic-words-broken-by-underlines problem by stripping out non-shape affecting attributes then adding them back after shaping. * Hangul shaper fixes [Changwoo Ryu, Jungshik Shin] * Handle compatability ideographs in basic-x shaper [Federic Zhang] * Implement pango_ft2_font_map_set_default_substitute() [Matthias Clasen] * Hangul module bug fixes and improvements [Changwoo Ryu, Jungshik Shin] - Move rendering of precomposed characters to hangul-xft shaper - Handle Hangul tone marks * Add a new wrap mode for PangoLayout - PANGO_WRAP_WORD_CHAR [Alex Larsson] * Indic module improvements [Eric Mader] * Fixes to generic OpenType handling [Eric] * Improve language specific charset ordering basic-x11 [James Su, Brian Yuan] * Some merges of fixes by Werner Lemberg to the original FreeType OpenType code. * Robustify and otherwise improve pango_color_parse() [Matthias Clasen] * Some cross-compiling fixes [J. Ali Harlow] * Merge a lot of the code between the Xft and FT2 backend, so that the FT2 backend gets the recent improvements to Xft. * Add proper language tag support to the Xft/FT2 backends. * Various effienciency fixes for the Xft/FT2 backends. * Support for version 2 of the Xft library. [Keith Packard] * Convert the freetype backend over to using fontconfig, instead of MiniXft for font cataloging. * A port of the Indic OpenType code from ICU to Pango. [Eric Mader] * A new hangul-xft [Changwoo Ryu] * Various cleanups to the PangoXft and PangoFT2 public APIs. ... as well as the usual bug fixes. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Make this package install its configuration files under the examples tree and let bsd.pkg.install.mk copy them to PKG_SYSCONFDIR. Bump PKGREVISION to 1. Reviewed by wiz. @ text @d3 1 a3 1 --- pango/pangox-fontmap.c.orig Mon Mar 25 21:22:52 2002 d5 1 a5 1 @@@@ -874,7 +874,7 @@@@ pango_x_font_map_read_aliases (PangoXFon @ 1.3 log @Replace hand made patches for pkgconfig tempates with PKGCONFIG_OVERRIDE. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2002/08/25 19:22:37 jlam Exp $ d3 4 a6 9 --- pangowin32.pc.in.orig Wed Mar 6 03:20:57 2002 +++ pangowin32.pc.in @@@@ -7,6 +7,6 @@@@ Name: Pango Win32 Description: Win32 GDI font support for Pango Version: @@VERSION@@ Requires: pango -Libs: -L${libdir} -lpangowin32-@@PANGO_API_VERSION@@ @@WIN32_LIBS@@ +Libs: -L${libdir} -Wl,-R${libdir} -lpangowin32-@@PANGO_API_VERSION@@ @@WIN32_LIBS@@ Cflags: -I${includedir}/pango-1.0 d8 6 @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1.4.1 2002/08/22 11:10:53 jlam Exp $ @ 1.1 log @Patch the various pkgconfig files to include proper -Wl,-R options. Bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ @ 1.1.4.1 log @file patch-ad was added on branch buildlink2 on 2002-08-22 11:10:53 +0000 @ text @d1 12 @ 1.1.4.2 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @a0 12 $NetBSD: patch-ad,v 1.1.4.1 2002/08/22 11:10:53 jlam Exp $ --- pangowin32.pc.in.orig Wed Mar 6 03:20:57 2002 +++ pangowin32.pc.in @@@@ -7,6 +7,6 @@@@ Name: Pango Win32 Description: Win32 GDI font support for Pango Version: @@VERSION@@ Requires: pango -Libs: -L${libdir} -lpangowin32-@@PANGO_API_VERSION@@ @@WIN32_LIBS@@ +Libs: -L${libdir} -Wl,-R${libdir} -lpangowin32-@@PANGO_API_VERSION@@ @@WIN32_LIBS@@ Cflags: -I${includedir}/pango-1.0 @