Accepting request 148512 from home:jnweiger:branches:OBS_Maintained:freetype2.openSUSE_Factory

- Rediffed patches.
- CVE-2012-5668.patch, CVE-2012-5669.patch, CVE-2012-5670.patch nothing to do.

OBS-URL: https://build.opensuse.org/request/show/148512
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=72

bugzilla-308961-cmex-workaround.patch

@@ -2,11 +2,13 @@
  src/base/ftobjs.c |    5 +++++
  1 file changed, 5 insertions(+)
 
-Index: freetype-2.4.2/src/base/ftobjs.c
+Index: freetype-2.4.11/src/base/ftobjs.c
 ===================================================================
---- freetype-2.4.2.orig/src/base/ftobjs.c
-+++ freetype-2.4.2/src/base/ftobjs.c
-@@ -2153,6 +2153,11 @@
+--- freetype-2.4.11.orig/src/base/ftobjs.c
++++ freetype-2.4.11/src/base/ftobjs.c
+@@ -2187,10 +2187,15 @@
+ 
+     /* some checks */
  
      if ( FT_IS_SCALABLE( face ) )
      {
@@ -18,3 +20,5 @@ Index: freetype-2.4.2/src/base/ftobjs.c
        if ( face->height < 0 )
          face->height = (FT_Short)-face->height;
  
+       if ( !FT_HAS_VERTICAL( face ) )
+         face->max_advance_height = (FT_Short)face->height;

freetype2-bitmap-foundry.patch

@@ -2,11 +2,13 @@
  src/pcf/pcfread.c |   30 ++++++++++++++++++++++++++++--
  1 file changed, 28 insertions(+), 2 deletions(-)
 
-Index: freetype-2.4.2/src/pcf/pcfread.c
+Index: freetype-2.4.11/src/pcf/pcfread.c
 ===================================================================
---- freetype-2.4.2.orig/src/pcf/pcfread.c
-+++ freetype-2.4.2/src/pcf/pcfread.c
-@@ -1175,8 +1175,34 @@ THE SOFTWARE.
+--- freetype-2.4.11.orig/src/pcf/pcfread.c
++++ freetype-2.4.11/src/pcf/pcfread.c
+@@ -1173,12 +1173,38 @@ THE SOFTWARE.
+          goto Exit;
+ 
        prop = pcf_find_property( face, "FAMILY_NAME" );
        if ( prop && prop->isString )
        {
@@ -43,3 +45,5 @@ Index: freetype-2.4.2/src/pcf/pcfread.c
        }
        else
          root->family_name = NULL;
+ 
+       /*

freetype2-no_rpath.patch

@@ -1,6 +1,14 @@
---- builds/unix/freetype-config.in.orig	2010-12-04 21:17:24.000000000 +0100
-+++ builds/unix/freetype-config.in	2010-12-04 21:20:02.000000000 +0100
-@@ -16,7 +16,6 @@
+---
+ builds/unix/freetype-config.in |    5 -----
+ 1 file changed, 5 deletions(-)
+
+Index: builds/unix/freetype-config.in
+===================================================================
+--- builds/unix/freetype-config.in.orig
++++ builds/unix/freetype-config.in
+@@ -14,11 +14,10 @@ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ includedir=@includedir@
  libdir=@libdir@
  enable_shared=@build_libtool_libs@
  wl=@wl@
@@ -8,7 +16,11 @@
  
  usage()
  {
-@@ -140,10 +139,6 @@
+   cat <<EOF
+ Usage: freetype-config [OPTION]...
+@@ -138,14 +137,10 @@ if test "$echo_cflags" = "yes" ; then
+     echo $cflags
+   fi
  fi
  
  if test "$echo_libs" = "yes" ; then
@@ -19,3 +31,5 @@
    libs="-lfreetype @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@"
    if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
      echo -L${SYSROOT}$libdir $libs
+   else
+     echo $libs

freetype2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 11 17:12:01 UTC 2013 - jw@suse.com
+
+- Rediffed patches.
+- CVE-2012-5668.patch, CVE-2012-5669.patch, CVE-2012-5670.patch nothing to do.
+
 -------------------------------------------------------------------
 Thu Dec 20 13:56:36 UTC 2012 - idonmez@suse.com
 

freetype2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package freetype2
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

ft2demos.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 11 17:12:14 UTC 2013 - jw@suse.com
+
+- Rediffed patches.
+- CVE-2012-5668.patch, CVE-2012-5669.patch, CVE-2012-5670.patch nothing to do.
+
 -------------------------------------------------------------------
 Thu Dec 20 13:57:51 UTC 2012 - idonmez@suse.com
 

ft2demos.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ft2demos
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed