pool/freetype2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 51658 from home:Fisiu:branches:M17N

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/51658
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=34
This commit is contained in:
Stephan Kulow 2010-11-01 08:41:59 +00:00 committed by Git OBS Bridge
parent 2518a636eb
commit cf3ce800d7
17 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bugzilla-308961-cmex-workaround.patch
View File

@ -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 ) )
{

12
fix-build.patch
View File

@ -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 @@ Index: freetype-2.3.12/autogen.sh
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])

3
freetype-2.4.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a987aef8c50d9bcfdfdc9f012f8bd0de6095cc1a5524e62c1a037deb8dacbfe
size 1433843

3
freetype-2.4.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4e626db62fd1b4549ff5d57f5eca3a41631fd6066adf8a31c11879b51249afc
size 1437406

3
freetype-doc-2.4.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d40093c0bbb6f182120524f36a3099e925a87458ecca38c71dc447325191774
size 104322

3
freetype-doc-2.4.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ed1d926679a13c15c2b32805127d0bcf7f8b7b950dbcc6f6db66963e4149d03
size 104313

8
freetype2-bitmap-foundry.patch
View File

@ -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 )
{

9
freetype2-subpixel.patch
View File

@ -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. */
/* */

8
freetype2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Thu Aug 12 09:43:18 UTC 2010 - jw@novell.com

4
freetype2.spec
View File

@ -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 @@ AutoReqProv: on
Obsoletes: freetype2-64bit
%endif
#
Version: 2.4.2
Version: 2.4.3
Release: 1
Url: http://www.freetype.org
Summary: A TrueType Font Library

47
ft2-stream-compat.diff
View File

@ -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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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 @@ Index: freetype-2.3.12/src/base/ftstream.c
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;
}

3
ft2demos-2.4.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95453d269d338fc93b74a6cbc5f4a3ec55a008d14478b15c8ff13cf388ece3fc
size 161201

3
ft2demos-2.4.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49b5201e6dfd21ba040e69cd25f8a76f6cbfd64cf59ff056c3800d8860f32a69
size 161975

9
ft2demos-build-testname.patch
View File

@ -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)

7
ft2demos.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Thu Aug 12 09:53:12 UTC 2010 - jw@novell.com

4
ft2demos.spec
View File

@ -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 @@ License: GPLv2+
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

12
use_unix.diff
View File

@ -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 @@ Index: freetype-2.3.12/builds/toplevel.mk
$(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".