add packaging

7 files changed, 151 insertions, 0 deletions

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
new file mode 100644
index 0000000..3a998c5
--- /dev/null
+++ b/packaging/baselibs.conf
@@ -0,0 +1,8 @@
+libfreetype6
+	obsoletes "freetype2-<targettype> < <version>"
+	provides "freetype2-<targettype> = <version>"
+freetype2-devel
+	requires -freetype2-<targettype>
+	requires "libfreetype6-<targettype>"
+	requires "zlib-devel-<targettype>"
+	
diff --git a/packaging/bugzilla-308961-cmex-workaround.patch b/packaging/bugzilla-308961-cmex-workaround.patch
new file mode 100644
index 0000000..505c1c8
--- /dev/null
+++ b/packaging/bugzilla-308961-cmex-workaround.patch
@@ -0,0 +1,20 @@
+---
+ src/base/ftobjs.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: freetype-2.4.2/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 @@
+ 
+     if ( FT_IS_SCALABLE( face ) )
+     {
++      if ( face->family_name && strncmp(face->family_name, "CMEX", 4 ) == 0){
++	face->underline_position = (FT_Short)( -face->units_per_EM / 10 );
++	face->underline_thickness = (FT_Short)( face->units_per_EM / 30 );
++      }
++
+       if ( face->height < 0 )
+         face->height = (FT_Short)-face->height;
+ 
diff --git a/packaging/fix-build.patch b/packaging/fix-build.patch
new file mode 100644
index 0000000..01aefce
--- /dev/null
+++ b/packaging/fix-build.patch
@@ -0,0 +1,31 @@
+---
+ autogen.sh                |    2 +-
+ builds/unix/configure.raw |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: freetype-2.4.2/autogen.sh
+===================================================================
+--- freetype-2.4.2.orig/autogen.sh
++++ freetype-2.4.2/autogen.sh
+@@ -150,7 +150,7 @@ sed -e "s;@VERSION@;$freetype_major$free
+   < configure.raw > configure.ac
+ 
+ run aclocal -I . --force
+-run $LIBTOOLIZE --force --copy --install
++run $LIBTOOLIZE --force --copy
+ run autoconf --force
+ 
+ chmod +x mkinstalldirs
+Index: freetype-2.4.2/builds/unix/configure.raw
+===================================================================
+--- freetype-2.4.2.orig/builds/unix/configure.raw
++++ freetype-2.4.2/builds/unix/configure.raw
+@@ -650,7 +650,7 @@ AC_SUBST([FT2_EXTRA_LIBS])
+ AC_SUBST([SYSTEM_ZLIB])
+ 
+ 
+-LT_INIT(win32-dll)
++#LT_INIT(win32-dll)
+ 
+ AC_SUBST([hardcode_libdir_flag_spec])
+ AC_SUBST([wl])
diff --git a/packaging/freetype2-bitmap-foundry.patch b/packaging/freetype2-bitmap-foundry.patch
new file mode 100644
index 0000000..ffbb2de
--- /dev/null
+++ b/packaging/freetype2-bitmap-foundry.patch
@@ -0,0 +1,45 @@
+---
+ src/pcf/pcfread.c |   30 ++++++++++++++++++++++++++++--
+ 1 file changed, 28 insertions(+), 2 deletions(-)
+
+Index: freetype-2.4.2/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.
+       prop = pcf_find_property( face, "FAMILY_NAME" );
+       if ( prop && prop->isString )
+       {
+-        if ( FT_STRDUP( root->family_name, prop->value.atom ) )
+-          goto Exit;
++ 	      int l = ft_strlen( prop->value.atom ) + 1;
++ 	      int wide = 0;
++ 	      PCF_Property foundry_prop = pcf_find_property( face, "FOUNDRY" );
++ 	      PCF_Property point_size_prop = pcf_find_property( face, "POINT_SIZE" );
++ 	      PCF_Property average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" );
++ 	      if ( point_size_prop != NULL && average_width_prop != NULL) {
++ 		      if ( average_width_prop->value.l >= point_size_prop->value.l ) {
++ 			      /* This font is at least square shaped or even wider */
++ 			      wide = 1;
++ 			      l += ft_strlen( " Wide");
++ 		      }
++ 	      }
++ 	      if ( foundry_prop != NULL && foundry_prop->isString) {
++ 		      l += ft_strlen( foundry_prop->value.atom ) + 1;
++ 		      if ( FT_NEW_ARRAY( root->family_name, l ) )
++ 			      goto Exit;
++ 		      ft_strcpy( root->family_name, foundry_prop->value.atom );
++ 		      strcat( root->family_name, " ");
++ 		      strcat( root->family_name, prop->value.atom );
++ 	      }
++ 	      else {
++ 		      if ( FT_NEW_ARRAY( root->family_name, l ) )
++ 			      goto Exit;
++ 		      ft_strcpy( root->family_name, prop->value.atom );
++ 	      }
++ 	      if ( wide != 0) {
++ 		      strcat( root->family_name, " Wide");
++ 	      }
+       }
+       else
+         root->family_name = NULL;
diff --git a/packaging/freetype2-no_rpath.patch b/packaging/freetype2-no_rpath.patch
new file mode 100644
index 0000000..b74b1ea
--- /dev/null
+++ b/packaging/freetype2-no_rpath.patch
@@ -0,0 +1,21 @@
+--- 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 @@
+ libdir=@libdir@
+ enable_shared=@build_libtool_libs@
+ wl=@wl@
+-hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'
+ 
+ usage()
+ {
+@@ -140,10 +139,6 @@
+ fi
+ 
+ if test "$echo_libs" = "yes" ; then
+-  rpath=
+-  if test "$enable_shared" = "yes" ; then
+-    eval "rpath=\"$hardcode_libdir_flag_spec\""
+-  fi
+   libs="-lfreetype @LIBZ@ @LIBBZ2@ @FT2_EXTRA_LIBS@"
+   if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
+     echo -L${SYSROOT}$libdir $libs
diff --git a/packaging/freetype2-subpixel.patch b/packaging/freetype2-subpixel.patch
new file mode 100644
index 0000000..ea8cfe5
--- /dev/null
+++ b/packaging/freetype2-subpixel.patch
@@ -0,0 +1,13 @@
+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.                */
+   /*                                                                       */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+ 
+ 
+   /*************************************************************************/
diff --git a/packaging/ft2demos-build-testname.patch b/packaging/ft2demos-build-testname.patch
new file mode 100644
index 0000000..1f257a5
--- /dev/null
+++ b/packaging/ft2demos-build-testname.patch
@@ -0,0 +1,13 @@
+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)
+-	  $(LINK)
++	  $(LINK_COMMON)
+ 
+ 
+   $(BIN_DIR_2)/ftview$E: $(OBJ_DIR_2)/ftview.$(SO) $(FTLIB) \