[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[6919] ipcop/trunk
From: gespinasse () users ! sourceforge ! net
Date: 2013-02-10 16:45:32
Message-ID: E1U4a20-00066K-4H () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 6919
http://ipcop.svn.sourceforge.net/ipcop/?rev=6919&view=rev
Author: gespinasse
Date: 2013-02-10 16:45:30 +0000 (Sun, 10 Feb 2013)
Log Message:
-----------
Upgrade freetype to 2.4.11
Remove patch include upstream
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/freetype
ipcop/trunk/lfs/freetype
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Removed Paths:
-------------
ipcop/trunk/src/patches/freetype-2.4.10_strict-aliasing.patch
Modified: ipcop/trunk/config/rootfiles/common/freetype
===================================================================
--- ipcop/trunk/config/rootfiles/common/freetype 2013-02-10 10:06:47 UTC (rev 6918)
+++ ipcop/trunk/config/rootfiles/common/freetype 2013-02-10 16:45:30 UTC (rev 6919)
@@ -9,6 +9,7 @@
#usr/include/freetype2/freetype/config/ftstdlib.h
#usr/include/freetype2/freetype/freetype.h
#usr/include/freetype2/freetype/ftadvanc.h
+#usr/include/freetype2/freetype/ftautoh.h
#usr/include/freetype2/freetype/ftbbox.h
#usr/include/freetype2/freetype/ftbdf.h
#usr/include/freetype2/freetype/ftbitmap.h
@@ -53,6 +54,6 @@
#usr/lib/libfreetype.la
#usr/lib/libfreetype.so
usr/lib/libfreetype.so.6
-usr/lib/libfreetype.so.6.9.0
+usr/lib/libfreetype.so.6.10.0
#usr/lib/pkgconfig/freetype2.pc
#usr/share/aclocal/freetype2.m4
Modified: ipcop/trunk/lfs/freetype
===================================================================
--- ipcop/trunk/lfs/freetype 2013-02-10 10:06:47 UTC (rev 6918)
+++ ipcop/trunk/lfs/freetype 2013-02-10 16:45:30 UTC (rev 6919)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = freetype
-VER = 2.4.10
+VER = 2.4.11
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 13286702e9390a91661f980608adaff1
+$(DL_FILE)_MD5 = b93435488942486c8d0ca22e8f768034
install : $(TARGET)
@@ -81,8 +81,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- # Fix include in upstream tree, drop after 2.4.10
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_strict-aliasing.patch
# configuration may have three stages
# 1 select modules in modules.cfg (look to have priority to next ftoption.h)
Deleted: ipcop/trunk/src/patches/freetype-2.4.10_strict-aliasing.patch
===================================================================
--- ipcop/trunk/src/patches/freetype-2.4.10_strict-aliasing.patch 2013-02-10 10:06:47 \
UTC (rev 6918)
+++ ipcop/trunk/src/patches/freetype-2.4.10_strict-aliasing.patch 2013-02-10 16:45:30 \
UTC (rev 6919) @@ -1,38 +0,0 @@
-Fix include in upstream tree, drop after 2.4.10
-
-diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
-index 591b57a..7363c7d 100644
---- a/src/base/ftglyph.c
-+++ b/src/base/ftglyph.c
-@@ -4,7 +4,7 @@
- /* */
- /* FreeType convenience functions to handle glyphs (body). */
- /* */
--/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010 by */
-+/* Copyright 1996-2005, 2007, 2008, 2010, 2012 by */
- /* David Turner, Robert Wilhelm, and Werner Lemberg. */
- /* */
- /* This file is part of the FreeType project, and may only be used, */
-@@ -510,7 +510,7 @@
- FT_GlyphSlotRec dummy;
- FT_GlyphSlot_InternalRec dummy_internal;
- FT_Error error = FT_Err_Ok;
-- FT_Glyph glyph;
-+ FT_Glyph b, glyph;
- FT_BitmapGlyph bitmap = NULL;
- const FT_Glyph_Class* clazz;
-
-@@ -547,10 +547,10 @@
- dummy.format = clazz->glyph_format;
-
- /* create result bitmap glyph */
-- error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET,
-- (FT_Glyph*)(void*)&bitmap );
-+ error = ft_new_glyph( library, FT_BITMAP_GLYPH_CLASS_GET, &b );
- if ( error )
- goto Exit;
-+ bitmap = (FT_BitmapGlyph)b;
-
- #if 1
- /* if `origin' is set, translate the glyph image */
-
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-02-10 10:06:47 UTC (rev 6918)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-02-10 16:45:30 UTC (rev 6919)
@@ -235,9 +235,9 @@
/usr/lib/libfontconfig.so.1
/usr/lib/libfontconfig.so.1.5.0
##
-## freetype-2.4.10
+## freetype-2.4.11
/usr/lib/libfreetype.so.6
-/usr/lib/libfreetype.so.6.9.0
+/usr/lib/libfreetype.so.6.10.0
##
## gawk-4.0.2
/usr/bin/awk
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-02-10 10:06:47 UTC (rev 6918)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-02-10 16:45:30 UTC (rev 6919)
@@ -9,7 +9,7 @@
Language updates.<br />
Upgrade acpid to 2.0.17, arping to 2.13, bash to 4.2.42, bind to 9.8.4, \
CnxADSL to ..PIM-2.6-2.7
conntrack-tools to 1.2.2, coreutils to 8.20, dhcpcd to 5.6.7, dnsmasq to \
2.65,
- e2fsprogs to 1.42.6, ethtool to 3.6, expat to 2.1.0, freetype to 2.4.10, \
fontconfig to 2.9, + e2fsprogs to 1.42.6, ethtool to 3.6, expat to 2.1.0, \
freetype to 2.4.11, fontconfig to 2.9,
gawk to 4.0.2, gettext to 0.18.2, glib to 2.30.3, gmp to 5.0.5, gnupg to \
1.4.13, grep to 2.14, gzip to 1.5,
iproute2 to 3.7.0, iptables to 1.4.17, iptstate to 2.2.5, iputils to \
s20121011, iw to 3.8, hdparm to 9.39, httpd to 2.2.23, krb5 to 1.10.3,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2013-02-10 10:06:47 UTC (rev 6918)
+++ ipcop/trunk/updates/2.1.0/setup 2013-02-10 16:45:30 UTC (rev 6919)
@@ -120,7 +120,7 @@
/bin/rm -f /usr/lib/libexpat.so.1.5.2
/bin/rm -f /usr/lib/libffi.so.5*
/bin/rm -f /usr/lib/libfontconfig.so.1.4.4
-/bin/rm -f /usr/lib/libfreetype.so.6.8.0
+/bin/rm -f /usr/lib/libfreetype.so.6.{8,9}.0
/bin/rm -f /usr/lib/libglib-2.0.so.0.2600.1
/bin/rm -f /usr/lib/libgmodule-2.0.so.0.2600.1
/bin/rm -f /usr/lib/libgobject-2.0.so.0.2600.1
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic