Hello community,
here is the log from the commit of package freetype2 for openSUSE:Factory
checked in at Tue Nov 2 10:34:01 CET 2010.
--------
--- freetype2/freetype2.changes 2010-08-12 12:02:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/freetype2/freetype2.changes 2010-10-29 18:49:22.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Oct 29 16:19:41 UTC 2010 - fisiu@opensuse.org
+
+- Updated to version 2.4.3:
+ + Fix rendering of certain cubic, S-shaped arcs. This regression
+ has been introduced in version 2.4.0.
+ + Handling of broken fonts has been further improved.
+
+-------------------------------------------------------------------
--- freetype2/ft2demos.changes 2010-08-12 12:02:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/freetype2/ft2demos.changes 2010-10-29 18:49:27.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 29 16:25:22 UTC 2010 - fisiu@opensuse.org
+
+- Updated to version 2.4.3:
+ + Make `grKey' enum comprehensive for gcc 4.5 compatibility.
+ + [ftbench] Add option `-i' to specify first used glyph index.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
freetype-2.4.2.tar.bz2
freetype-doc-2.4.2.tar.bz2
ft2demos-2.4.2.tar.bz2
New:
----
freetype-2.4.3.tar.bz2
freetype-doc-2.4.3.tar.bz2
ft2demos-2.4.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freetype2.spec ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:21.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:21.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package freetype2 (Version 2.4.2)
+# spec file for package freetype2 (Version 2.4.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,7 +28,7 @@
Obsoletes: freetype2-64bit
%endif
#
-Version: 2.4.2
+Version: 2.4.3
Release: 1
Url: http://www.freetype.org
Summary: A TrueType Font Library
++++++ ft2demos.spec ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:21.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:21.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package ft2demos (Version 2.4.2)
+# spec file for package ft2demos (Version 2.4.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
Group: Productivity/Publishing/Other
AutoReqProv: on
Supplements: fonts-config
-Version: 2.4.2
+Version: 2.4.3
Release: 1
%define freetype_version %{version}
Url: http://www.freetype.org
++++++ bugzilla-308961-cmex-workaround.patch ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:21.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:21.000000000 +0100
@@ -1,8 +1,8 @@
-Index: freetype-2.3.12/src/base/ftobjs.c
+Index: freetype-2.4.3/src/base/ftobjs.c
===================================================================
---- freetype-2.3.12.orig/src/base/ftobjs.c 2010-01-23 13:44:16.000000000 +0100
-+++ freetype-2.3.12/src/base/ftobjs.c 2010-03-31 16:23:42.000000000 +0200
-@@ -2103,6 +2103,11 @@
+--- freetype-2.4.3.orig/src/base/ftobjs.c 2010-10-29 15:58:01.000000000 +0200
++++ freetype-2.4.3/src/base/ftobjs.c 2010-10-29 16:01:57.187258621 +0200
+@@ -2153,6 +2153,11 @@
if ( FT_IS_SCALABLE( face ) )
{
++++++ fix-build.patch ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:21.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: freetype-2.3.12/autogen.sh
+Index: freetype-2.4.3/autogen.sh
===================================================================
---- freetype-2.3.12.orig/autogen.sh 2010-02-13 07:54:14.000000000 +0100
-+++ freetype-2.3.12/autogen.sh 2010-03-31 16:23:42.000000000 +0200
+--- freetype-2.4.3.orig/autogen.sh 2010-02-13 07:54:14.000000000 +0100
++++ freetype-2.4.3/autogen.sh 2010-10-29 16:05:43.356557850 +0200
@@ -150,7 +150,7 @@ sed -e "s;@VERSION@;$freetype_major$free
< configure.raw > configure.ac
@@ -11,10 +11,10 @@
run autoconf --force
chmod +x mkinstalldirs
-Index: freetype-2.3.12/builds/unix/configure.raw
+Index: freetype-2.4.3/builds/unix/configure.raw
===================================================================
---- freetype-2.3.12.orig/builds/unix/configure.raw 2010-02-13 07:55:07.000000000 +0100
-+++ freetype-2.3.12/builds/unix/configure.raw 2010-03-31 16:23:42.000000000 +0200
+--- freetype-2.4.3.orig/builds/unix/configure.raw 2010-10-03 20:34:42.000000000 +0200
++++ freetype-2.4.3/builds/unix/configure.raw 2010-10-29 16:06:54.225383610 +0200
@@ -650,7 +650,7 @@ AC_SUBST([FT2_EXTRA_LIBS])
AC_SUBST([SYSTEM_ZLIB])
++++++ freetype-2.4.2.tar.bz2 -> freetype-2.4.3.tar.bz2 ++++++
++++ 4014 lines of diff (skipped)
++++++ freetype2-bitmap-foundry.patch ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:22.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: freetype-2.3.12/src/pcf/pcfread.c
+Index: freetype-2.4.3/src/pcf/pcfread.c
===================================================================
---- freetype-2.3.12.orig/src/pcf/pcfread.c 2009-10-10 19:32:28.000000000 +0200
-+++ freetype-2.3.12/src/pcf/pcfread.c 2010-06-04 13:44:03.767338504 +0200
-@@ -1171,8 +1171,34 @@ THE SOFTWARE.
+--- freetype-2.4.3.orig/src/pcf/pcfread.c 2010-06-24 20:16:51.000000000 +0200
++++ freetype-2.4.3/src/pcf/pcfread.c 2010-10-29 16:12:07.904258618 +0200
+@@ -1175,8 +1175,34 @@ THE SOFTWARE.
prop = pcf_find_property( face, "FAMILY_NAME" );
if ( prop && prop->isString )
{
++++++ freetype2-subpixel.patch ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:22.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:22.000000000 +0100
@@ -1,7 +1,8 @@
-diff -ru freetype-2.2.1.20061013.orig/include/freetype/config/ftoption.h freetype-2.2.1.20061013/include/freetype/config/ftoption.h
---- freetype-2.2.1.20061013.orig/include/freetype/config/ftoption.h 2006-09-26 23:55:44.000000000 +0200
-+++ freetype-2.2.1.20061013/include/freetype/config/ftoption.h 2006-10-19 14:12:48.000000000 +0200
-@@ -92,7 +92,7 @@
+Index: freetype-2.4.3/include/freetype/config/ftoption.h
+===================================================================
+--- freetype-2.4.3.orig/include/freetype/config/ftoption.h 2010-07-05 06:38:55.000000000 +0200
++++ freetype-2.4.3/include/freetype/config/ftoption.h 2010-10-29 16:15:59.582654748 +0200
+@@ -93,7 +93,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
++++++ freetype-doc-2.4.2.tar.bz2 -> freetype-doc-2.4.3.tar.bz2 ++++++
++++++ ft2demos-2.4.2.tar.bz2 -> ft2demos-2.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.4.2/ChangeLog new/ft2demos-2.4.3/ChangeLog
--- old/ft2demos-2.4.2/ChangeLog 2010-08-06 22:08:12.000000000 +0200
+++ new/ft2demos-2.4.3/ChangeLog 2010-10-03 20:41:12.000000000 +0200
@@ -1,7 +1,38 @@
+2010-10-03 Werner Lemberg
+
+ * Version 2.4.3 released.
+ =========================
+
+
+ Tag sources with `VER-2-4-3'.
+
+ * README: Updated.
+
+2010-08-29 Steve Langasek
+
+ Make `grKey' enum comprehensive for gcc 4.5 compatibility.
+
+ * graph/grevents.h (grKey): Avoid the situation of trying to compare
+ an enum variable with a value not included in that enum in a case
+ statement. An enum needs to be declared to include the list of all
+ possible values (which in the case of keypresses is quite a few),
+ not just the most convenient ones.
+
+2010-08-17 Werner Lemberg
+
+ [ftbench] Add option `-i' to specify first used glyph index.
+
+ * src/ftbench.c (first_index): New global variable.
+ (test_load, test_load_advances, test_render, test_embolden,
+ test_get_cbox, test_get_glyph, test_image_cache, test_sbit_cache,
+ get_charset): Use it.
+ (usage): Updated.
+ (main): Handle `-i'.
+
2010-08-06 Werner Lemberg
* Version 2.4.2 released.
- ==========================
+ =========================
Tag sources with `VER-2-4-2'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.4.2/graph/grevents.h new/ft2demos-2.4.3/graph/grevents.h
--- old/ft2demos-2.4.2/graph/grevents.h 2009-03-14 14:58:28.000000000 +0100
+++ new/ft2demos-2.4.3/graph/grevents.h 2010-08-29 09:29:29.000000000 +0200
@@ -2,24 +2,24 @@
#define GREVENTS_H
-#define gr_event_none 0
-#define gr_event_wait 1
-#define gr_event_poll 2
-#define gr_event_flush 3
+#define gr_event_none 0
+#define gr_event_wait 1
+#define gr_event_poll 2
+#define gr_event_flush 3
#define gr_mouse_down 0x04
#define gr_mouse_move 0x08
#define gr_mouse_up 0x10
#define gr_mouse_drag 0x20
-#define gr_key_down 0x40
-#define gr_key_up 0x80
+#define gr_key_down 0x40
+#define gr_key_up 0x80
-#define gr_event_mouse 0x3C
-#define gr_event_key 0xC0
+#define gr_event_mouse 0x3C
+#define gr_event_key 0xC0
-#define gr_event_type (gr_event_mouse | gr_event_key)
+#define gr_event_type ( gr_event_mouse | gr_event_key )
typedef enum grKey_
@@ -56,51 +56,113 @@
grKeyBackSpace,
grKeyReturn,
- grKeyMax,
- grKeyForceShort = 0x7FFF /* this forces the grKey to be stored */
- /* on at least one short ! */
+ grKeySpace = ' ',
+ grKey0 = '0',
+ grKey1 = '1',
+ grKey2 = '2',
+ grKey3 = '3',
+ grKey4 = '4',
+ grKey5 = '5',
+ grKey6 = '6',
+ grKey7 = '7',
+ grKey8 = '8',
+ grKey9 = '9',
+
+ grKeyPlus = '+',
+ grKeyLess = '-',
+ grKeyEqual = '=',
+ grKeyMult = '*',
+ grKeyDollar = '$',
+ grKeySmaller = '<',
+ grKeyGreater = '>',
+ grKeyQuestion = '?',
+ grKeyComma = ',',
+ grKeyDot = '.',
+ grKeySemiColon = ';',
+ grKeyColon = ':',
+ grKeyDiv = '/',
+ grKeyExclam = '!',
+ grKeyPercent = '%',
+ grKeyLeftParen = '(',
+ grKeyRightParen = '(',
+ grKeyAt = '@',
+
+ grKey_A = 'A',
+ grKey_B = 'B',
+ grKey_C = 'C',
+ grKey_D = 'D',
+ grKey_E = 'E',
+ grKey_F = 'F',
+ grKey_G = 'G',
+ grKey_H = 'H',
+ grKey_I = 'I',
+ grKey_J = 'J',
+ grKey_K = 'K',
+ grKey_L = 'L',
+ grKey_M = 'M',
+ grKey_N = 'N',
+ grKey_O = 'O',
+ grKey_P = 'P',
+ grKey_Q = 'Q',
+ grKey_R = 'R',
+ grKey_S = 'S',
+ grKey_T = 'T',
+ grKey_U = 'U',
+ grKey_V = 'V',
+ grKey_W = 'W',
+ grKey_X = 'X',
+ grKey_Y = 'Y',
+ grKey_Z = 'Z',
+
+ grKeyLeftB = '[',
+ grKeyBackSlash = '\\',
+ grKeyRightB = ']',
+ grKeyCircumflex = '^',
+ grKeyUnder = '_',
+ grKeyBackTick = '`',
+
+ grKey_a = 'a',
+ grKey_b = 'b',
+ grKey_c = 'c',
+ grKey_d = 'd',
+ grKey_e = 'e',
+ grKey_f = 'f',
+ grKey_g = 'g',
+ grKey_h = 'h',
+ grKey_i = 'i',
+ grKey_j = 'j',
+ grKey_k = 'k',
+ grKey_l = 'l',
+ grKey_m = 'm',
+ grKey_n = 'n',
+ grKey_o = 'o',
+ grKey_p = 'p',
+ grKey_q = 'q',
+ grKey_r = 'r',
+ grKey_s = 's',
+ grKey_t = 't',
+ grKey_u = 'u',
+ grKey_v = 'v',
+ grKey_w = 'w',
+ grKey_x = 'x',
+ grKey_y = 'y',
+ grKey_z = 'z',
+
+ grKeyForceShort = 0x7FFF, /* this forces the grKey to be stored */
+ /* on at least one short */
+ grKeyMax
} grKey;
-#define grKEY(c) ((grKey)(c))
-#define grKeyAlt ((grKey)0x8000)
-#define grKeyCtrl ((grKey)0x4000)
-#define grKeyShift ((grKey)0x2000)
-
-#define grKeyModifiers ((grKey)0xE000)
-
-#define grKey0 grKEY('0')
-#define grKey1 grKEY('1')
-#define grKey2 grKEY('2')
-#define grKey3 grKEY('3')
-#define grKey4 grKEY('4')
-#define grKey5 grKEY('5')
-#define grKey6 grKEY('6')
-#define grKey7 grKEY('7')
-#define grKey8 grKEY('8')
-#define grKey9 grKEY('9')
-
-
-#define grKeyPlus grKEY('+')
-#define grKeyLess grKEY('-')
-#define grKeyEqual grKEY('=')
-#define grKeyMult grKEY('*')
-#define grKeyDollar grKEY('$')
-#define grKeySmaller grKEY('<')
-#define grKeyGreater grKEY('>')
-#define grKeyQuestion grKEY('?')
-#define grKeyComma grKEY(',')
-#define grKeyDot grKEY('.')
-#define grKeySemiColumn grKEY(';')
-#define grKeyColumn grKEY(':')
-#define grKeyDiv grKEY('/')
-#define grKeyExclam grKEY('!')
-#define grKeyPercent grKEY('%')
-#define grKeyLeftParen grKEY('(')
-#define grKeyRightParen grKEY('(')
-#define grKeyAt grKEY('@')
-#define grKeyUnder grKEY('_')
+#define grKEY( c ) ( (grKey)( c ) )
+ /* masks - to be used as enums they would have to be included */
+ /* in the grKey enum */
+#define grKeyAlt ( (grKey)0x8000 )
+#define grKeyCtrl ( (grKey)0x4000 )
+#define grKeyShift ( (grKey)0x2000 )
+
+#define grKeyModifiers ( (grKey)0xE000 )
typedef struct grEvent_
@@ -112,6 +174,4 @@
} grEvent;
-
#endif /* GREVENTS_H */
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.4.2/README new/ft2demos-2.4.3/README
--- old/ft2demos-2.4.2/README 2010-08-06 22:08:34.000000000 +0200
+++ new/ft2demos-2.4.3/README 2010-10-03 20:41:23.000000000 +0200
@@ -8,8 +8,8 @@
downloaded one of the stable FreeType 2 source packages from our
server, you most probably have to rename its directory, for example:
- mv freetype-2.4.2 freetype2 on Unix
- rename freetype-2.4.2 freetype2 on Windows
+ mv freetype-2.4.3 freetype2 on Unix
+ rename freetype-2.4.3 freetype2 on Windows
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.4.2/src/ftbench.c new/ft2demos-2.4.3/src/ftbench.c
--- old/ft2demos-2.4.2/src/ftbench.c 2010-06-28 17:56:23.000000000 +0200
+++ new/ft2demos-2.4.3/src/ftbench.c 2010-08-17 07:57:30.000000000 +0200
@@ -101,6 +101,8 @@
int preload;
char* filename;
+unsigned int first_index;
+
FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL;
FT_Int32 load_flags = FT_LOAD_DEFAULT;
@@ -214,7 +216,7 @@
TIMER_START( timer );
- for ( i = 0; i < face->num_glyphs; i++ )
+ for ( i = first_index; i < face->num_glyphs; i++ )
{
if ( !FT_Load_Glyph( face, i, load_flags ) )
done++;
@@ -240,8 +242,10 @@
TIMER_START( timer );
- FT_Get_Advances( face, 0, face->num_glyphs, flags, advances );
- done += face->num_glyphs;
+ FT_Get_Advances( face,
+ first_index, face->num_glyphs - first_index,
+ flags, advances );
+ done += face->num_glyphs - first_index;
TIMER_STOP( timer );
@@ -261,7 +265,7 @@
FT_UNUSED( user_data );
- for ( i = 0; i < face->num_glyphs; i++ )
+ for ( i = first_index; i < face->num_glyphs; i++ )
{
if ( FT_Load_Glyph( face, i, load_flags ) )
continue;
@@ -285,7 +289,7 @@
FT_UNUSED( user_data );
- for ( i = 0; i < face->num_glyphs; i++ )
+ for ( i = first_index; i < face->num_glyphs; i++ )
{
if ( FT_Load_Glyph( face, i, load_flags ) )
continue;
@@ -311,7 +315,7 @@
FT_UNUSED( user_data );
- for ( i = 0; i < face->num_glyphs; i++ )
+ for ( i = first_index; i < face->num_glyphs; i++ )
{
if ( FT_Load_Glyph( face, i, load_flags ) )
continue;
@@ -341,7 +345,7 @@
FT_UNUSED( user_data );
- for ( i = 0; i < face->num_glyphs; i++ )
+ for ( i = first_index; i < face->num_glyphs; i++ )
{
if ( FT_Load_Glyph( face, i, load_flags ) )
continue;
@@ -434,7 +438,7 @@
TIMER_START( timer );
- for ( i = 0; i < face->num_glyphs; i++ )
+ for ( i = first_index; i < face->num_glyphs; i++ )
{
if ( !FTC_ImageCache_Lookup(image_cache, &font_type, i, &glyph, NULL) )
done++;
@@ -465,7 +469,7 @@
TIMER_START( timer );
- for ( i = 0; i < face->num_glyphs; i++ )
+ for ( i = first_index; i < face->num_glyphs; i++ )
{
if ( !FTC_SBitCache_Lookup(sbit_cache, &font_type, i, &glyph, NULL) )
done++;
@@ -545,20 +549,24 @@
charcode = FT_Get_First_Char(face, &gindex);
/* certain fonts contain a broken charmap that will map character codes */
- /* to out-of-bounds glyph indices. Take care of that here !! */
+ /* to out-of-bounds glyph indices. Take care of that here. */
/* */
while ( gindex && i < face->num_glyphs )
{
- charset->code[i++] = charcode;
+ if ( gindex >= first_index )
+ charset->code[i++] = charcode;
charcode = FT_Get_Next_Char(face, charcode, &gindex);
}
}
else
{
+ int j;
+
+
/* no charmap, do an identity mapping */
- for ( i = 0; i < face->num_glyphs; i++ )
- charset->code[i] = i;
+ for ( i = 0, j = first_index; j < face->num_glyphs; i++, j++ )
+ charset->code[i] = j;
}
charset->size = i;
@@ -635,6 +643,7 @@
" -C : compare with cached version if available\n"
" -c : max iteration count for each test (0 means time limited)\n"
" -f : load flags (hexadecimal)\n"
+ " -i : first index to start with (default is 0)\n"
" -m : max cache size in KByte (default is %d)\n"
" -p : preload font file in memory\n"
" -r : render mode (default is FT_RENDER_MODE_NORMAL)\n"
@@ -675,7 +684,7 @@
int opt;
- opt = getopt( argc, argv, "Cc:f:m:pr:s:t:b:" );
+ opt = getopt( argc, argv, "Cc:f:i:m:pr:s:t:b:" );
if ( opt == -1 )
break;
@@ -691,6 +700,9 @@
case 'f':
load_flags = strtol( optarg, NULL, 16 );
break;
+ case 'i':
+ first_index = atoi( optarg );
+ break;
case 'm':
max_bytes = atoi( optarg );
max_bytes *= 1024;
++++++ ft2demos-build-testname.patch ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:23.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:23.000000000 +0100
@@ -1,7 +1,8 @@
-diff -ru ft2demos-2.2.1.orig/Makefile ft2demos-2.2.1/Makefile
---- ft2demos-2.2.1.orig/Makefile 2006-05-10 18:20:49.000000000 +0200
-+++ ft2demos-2.2.1/Makefile 2006-06-21 12:48:13.000000000 +0200
-@@ -439,7 +439,7 @@
+Index: ft2demos-2.4.3/Makefile
+===================================================================
+--- ft2demos-2.4.3.orig/Makefile 2009-10-07 09:57:21.000000000 +0200
++++ ft2demos-2.4.3/Makefile 2010-10-29 16:24:24.770446520 +0200
+@@ -482,7 +482,7 @@ else
$(LINK)
$(BIN_DIR_2)/testname$E: $(OBJ_DIR_2)/testname.$(SO) $(FTLIB)
++++++ ft2-stream-compat.diff ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:23.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: freetype-2.3.12/src/base/ftstream.c
+Index: freetype-2.4.3/src/base/ftstream.c
===================================================================
---- freetype-2.3.12.orig/src/base/ftstream.c 2009-08-03 19:51:40.000000000 +0200
-+++ freetype-2.3.12/src/base/ftstream.c 2010-03-31 16:23:42.000000000 +0200
+--- freetype-2.4.3.orig/src/base/ftstream.c 2010-08-04 15:52:01.000000000 +0200
++++ freetype-2.4.3/src/base/ftstream.c 2010-10-29 16:41:31.418258733 +0200
@@ -44,6 +44,17 @@
stream->close = 0;
}
@@ -56,27 +56,26 @@
FT_BASE_DEF( FT_Error )
FT_Stream_ExtractFrame( FT_Stream stream,
-@@ -210,7 +229,9 @@
+@@ -210,6 +229,8 @@
return error;
}
--
+ FT_BASE_DEF( FT_Error )
+ FT_Extract_Frame( FT_Stream, FT_ULong, FT_Byte** ) __attribute__((weak, alias("FT_Stream_ExtractFrame")));
-+
+
FT_BASE_DEF( void )
FT_Stream_ReleaseFrame( FT_Stream stream,
- FT_Byte** pbytes )
-@@ -229,6 +250,8 @@
+@@ -229,6 +250,9 @@
*pbytes = 0;
}
+ FT_BASE_DEF( void )
+ FT_Release_Frame( FT_Stream, FT_Byte** ) __attribute__((weak, alias("FT_Stream_ReleaseFrame")));
++
FT_BASE_DEF( FT_Error )
FT_Stream_EnterFrame( FT_Stream stream,
-@@ -295,6 +318,8 @@
+@@ -307,6 +331,8 @@
return error;
}
@@ -85,7 +84,7 @@
FT_BASE_DEF( void )
FT_Stream_ExitFrame( FT_Stream stream )
-@@ -325,6 +350,8 @@
+@@ -337,6 +363,8 @@
stream->limit = 0;
}
@@ -94,7 +93,7 @@
FT_BASE_DEF( FT_Char )
FT_Stream_GetChar( FT_Stream stream )
-@@ -341,6 +368,8 @@
+@@ -353,6 +381,8 @@
return result;
}
@@ -103,7 +102,7 @@
FT_BASE_DEF( FT_Short )
FT_Stream_GetShort( FT_Stream stream )
-@@ -360,6 +389,8 @@
+@@ -372,6 +402,8 @@
return result;
}
@@ -112,7 +111,7 @@
FT_BASE_DEF( FT_Short )
FT_Stream_GetShortLE( FT_Stream stream )
-@@ -379,6 +410,8 @@
+@@ -391,6 +423,8 @@
return result;
}
@@ -121,7 +120,7 @@
FT_BASE_DEF( FT_Long )
FT_Stream_GetOffset( FT_Stream stream )
-@@ -397,6 +430,8 @@
+@@ -409,6 +443,8 @@
return result;
}
@@ -130,7 +129,7 @@
FT_BASE_DEF( FT_Long )
FT_Stream_GetLong( FT_Stream stream )
-@@ -415,6 +450,8 @@
+@@ -427,6 +463,8 @@
return result;
}
@@ -139,7 +138,7 @@
FT_BASE_DEF( FT_Long )
FT_Stream_GetLongLE( FT_Stream stream )
-@@ -433,6 +470,8 @@
+@@ -445,6 +483,8 @@
return result;
}
@@ -148,7 +147,7 @@
FT_BASE_DEF( FT_Char )
FT_Stream_ReadChar( FT_Stream stream,
-@@ -470,6 +509,8 @@
+@@ -482,6 +522,8 @@
return 0;
}
@@ -157,17 +156,16 @@
FT_BASE_DEF( FT_Short )
FT_Stream_ReadShort( FT_Stream stream,
-@@ -517,6 +558,9 @@
+@@ -529,6 +571,8 @@
return 0;
}
+ FT_BASE_DEF( FT_Short )
+ FT_Read_Short( FT_Stream, FT_Error* ) __attribute__((weak, alias("FT_Stream_ReadShort")));
-+
FT_BASE_DEF( FT_Short )
FT_Stream_ReadShortLE( FT_Stream stream,
-@@ -564,6 +608,8 @@
+@@ -576,6 +620,8 @@
return 0;
}
@@ -176,7 +174,7 @@
FT_BASE_DEF( FT_Long )
FT_Stream_ReadOffset( FT_Stream stream,
-@@ -611,6 +657,8 @@
+@@ -623,6 +669,8 @@
return 0;
}
@@ -185,7 +183,7 @@
FT_BASE_DEF( FT_Long )
FT_Stream_ReadLong( FT_Stream stream,
-@@ -658,6 +706,8 @@
+@@ -670,6 +718,8 @@
return 0;
}
@@ -194,17 +192,16 @@
FT_BASE_DEF( FT_Long )
FT_Stream_ReadLongLE( FT_Stream stream,
-@@ -705,6 +755,9 @@
+@@ -717,6 +767,8 @@
return 0;
}
+ FT_BASE_DEF( FT_Long )
+ FT_Read_LongLE( FT_Stream, FT_Error* ) __attribute__((weak, alias("FT_Stream_ReadLongLE")));
-+
FT_BASE_DEF( FT_Error )
FT_Stream_ReadFields( FT_Stream stream,
-@@ -848,5 +901,6 @@
+@@ -860,5 +912,6 @@
return error;
}
++++++ use_unix.diff ++++++
--- /var/tmp/diff_new_pack.HedvrN/_old 2010-11-02 10:33:23.000000000 +0100
+++ /var/tmp/diff_new_pack.HedvrN/_new 2010-11-02 10:33:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: freetype-2.3.12/builds/toplevel.mk
+Index: freetype-2.4.3/builds/toplevel.mk
===================================================================
---- freetype-2.3.12.orig/builds/toplevel.mk 2010-03-31 16:24:31.000000000 +0200
-+++ freetype-2.3.12/builds/toplevel.mk 2010-03-31 16:31:02.000000000 +0200
+--- freetype-2.4.3.orig/builds/toplevel.mk 2010-07-12 00:33:23.000000000 +0200
++++ freetype-2.4.3/builds/toplevel.mk 2010-10-29 16:19:37.525259301 +0200
@@ -120,7 +120,7 @@ ifdef check_platform
#
# Note: This test is duplicated in `builds/unix/detect.mk'.
@@ -11,10 +11,10 @@
$(wildcard /usr/sbin/init) \
$(wildcard /hurd/auth))
ifneq ($(is_unix),)
-Index: freetype-2.3.12/builds/unix/detect.mk
+Index: freetype-2.4.3/builds/unix/detect.mk
===================================================================
---- freetype-2.3.12.orig/builds/unix/detect.mk 2009-03-14 14:45:26.000000000 +0100
-+++ freetype-2.3.12/builds/unix/detect.mk 2010-03-31 16:31:16.000000000 +0200
+--- freetype-2.4.3.orig/builds/unix/detect.mk 2009-03-14 14:45:26.000000000 +0100
++++ freetype-2.4.3/builds/unix/detect.mk 2010-10-29 16:20:02.456789596 +0200
@@ -18,7 +18,7 @@ ifeq ($(PLATFORM),ansi)
# Note: this test is duplicated in "builds/toplevel.mk".
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org