diff options
| author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2010-07-15 11:56:58 +0200 |
|---|---|---|
| committer | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2010-07-15 12:11:08 +0200 |
| commit | ac70c8e343b668d016d474cd2fcf61784577beaf (patch) | |
| tree | c05dd96d0541c27b171e6718b17f9a20d2e70402 /recipes | |
| parent | e1293010dd18621555b6a43c95f4c128178457fd (diff) | |
freetype: fixed broken patches
Patches in aaac36c39e301995029cb40ae40fa8af277694dc are malformed
because they were cherrypicked with global 'apply.whitespace=fix'.
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/freetype/freetype-2.3.12/fix-configure.patch | 4 | ||||
| -rw-r--r-- | recipes/freetype/freetype-2.3.12/libtool-tag.patch | 12 | ||||
| -rw-r--r-- | recipes/freetype/freetype_2.3.12.bb | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/recipes/freetype/freetype-2.3.12/fix-configure.patch b/recipes/freetype/freetype-2.3.12/fix-configure.patch index 78e76ebce7..ecd96738d4 100644 --- a/recipes/freetype/freetype-2.3.12/fix-configure.patch +++ b/recipes/freetype/freetype-2.3.12/fix-configure.patch @@ -4,8 +4,8 @@ Index: freetype-2.3.6/builds/unix/configure.ac +++ freetype-2.3.6/builds/unix/configure.ac @@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS]) AC_SUBST([SYSTEM_ZLIB]) - - + + -LT_INIT(win32-dll) - AC_SUBST([hardcode_libdir_flag_spec]) diff --git a/recipes/freetype/freetype-2.3.12/libtool-tag.patch b/recipes/freetype/freetype-2.3.12/libtool-tag.patch index 356a256e4c..2f096cdd46 100644 --- a/recipes/freetype/freetype-2.3.12/libtool-tag.patch +++ b/recipes/freetype/freetype-2.3.12/libtool-tag.patch @@ -1,16 +1,16 @@ ---- freetype-2.3.6/builds/unix/unix-cc.in -+++ freetype-2.3.6/builds/unix/unix-cc.in -@@ -88,7 +88,7 @@ +--- freetype-2.3.6/builds/unix/unix-cc.in ++++ freetype-2.3.6/builds/unix/unix-cc.in +@@ -88,7 +88,7 @@ # # CCraw := $(CC) -CC := $(LIBTOOL) --mode=compile $(CCraw) +CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw) - + # Linker flags. # -@@ -105,7 +105,7 @@ - +@@ -105,7 +105,7 @@ + # Library linking # -LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ diff --git a/recipes/freetype/freetype_2.3.12.bb b/recipes/freetype/freetype_2.3.12.bb index 6056760e13..eda6ee5660 100644 --- a/recipes/freetype/freetype_2.3.12.bb +++ b/recipes/freetype/freetype_2.3.12.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Freetype font rendering library" SECTION = "libs" LICENSE = "freetype" -PR = "r1" +PR = "r2" DEPENDS = "zlib" SRC_URI = "\ |