commit inkscape

Hello community, here is the log from the commit of package inkscape checked in at Sat Jul 8 17:20:24 CEST 2006. -------- --- GNOME/inkscape/inkscape.changes 2006-02-18 08:36:51.000000000 +0100 +++ inkscape/inkscape.changes 2006-07-07 22:15:29.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 7 22:15:04 CEST 2006 - jpr@suse.de + +- add patch to not use freetype2 internals + +------------------------------------------------------------------- New: ---- inkscape-0.43-noftinternals.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.gNjrLY/_old 2006-07-08 17:20:20.000000000 +0200 +++ /var/tmp/diff_new_pack.gNjrLY/_new 2006-07-08 17:20:20.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: Inkscape Vector Illustration Program Version: 0.43 -Release: 8 +Release: 20 Provides: sodipodi Obsoletes: sodipodi PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl @@ -30,6 +30,7 @@ Patch2: inkscape-qualification.patch Patch3: inkscape-null-conversion.patch Patch4: inkscape-swigfix.patch +Patch5: inkscape-0.43-noftinternals.patch Patch10: gc6.4.dif URL: http://www.inkscape.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -90,6 +91,7 @@ %patch2 %patch3 %patch4 +%patch5 -p1 cd src/libcroco %patch1 -p2 cd ../.. @@ -168,6 +170,8 @@ %dir /usr/share/man/fr/man1 %changelog -n inkscape +* Fri Jul 07 2006 - jpr@suse.de +- add patch to not use freetype2 internals * Sat Feb 18 2006 - stbinner@suse.de - fix typo .desktop file * Sat Feb 18 2006 - gekker@suse.de ++++++ inkscape-0.43-noftinternals.patch ++++++ diff -burN inkscape-0.43/src/libnrtype/FontInstance.cpp inkscape-0.43-new/src/libnrtype/FontInstance.cpp --- inkscape-0.43/src/libnrtype/FontInstance.cpp 2005-09-26 07:22:49.000000000 +0200 +++ inkscape-0.43-new/src/libnrtype/FontInstance.cpp 2006-05-17 22:44:46.000000000 +0200 @@ -24,11 +24,11 @@ #include "RasterFont.h" /* Freetype 2 */ -# include -# include -# include -# include -# include +# include +# include FT_OUTLINE_H +# include FT_BBOX_H +# include FT_TRUETYPE_TAGS_H +# include FT_TRUETYPE_TABLES_H # include @@ -423,10 +423,10 @@ } if ( theFace->glyph->format == ft_glyph_format_outline ) { FT_Outline_Funcs ft2_outline_funcs = { - ft2_move_to, - ft2_line_to, - ft2_conic_to, - ft2_cubic_to, + (FT_Outline_MoveToFunc) ft2_move_to, + (FT_Outline_LineToFunc) ft2_line_to, + (FT_Outline_ConicToFunc) ft2_conic_to, + (FT_Outline_CubicToFunc) ft2_cubic_to, 0, 0 }; n_g.outline=new Path; @@ -474,12 +474,12 @@ theFace=pango_ft2_font_get_face(pFont); - if ( theFace->units_per_EM == 0 ) return false; // bitmap font - if ( pFont == NULL ) return false; if ( theFace == NULL ) return false; + if ( !FT_IS_SCALABLE(theFace) ) return false; // bitmap font + TT_HoriHeader *hhea = (TT_HoriHeader*)FT_Get_Sfnt_Table(theFace, ft_sfnt_hhea); if (hhea == NULL) return false; run = hhea->caret_Slope_Run; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org