Revision: 6550
http://ipcop.svn.sourceforge.net/ipcop/?rev=6550&view=rev
Author: gespinasse
Date: 2012-04-21 06:15:13 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
Upgrade fontconfig to 2.9.0
Disable the tests as they require and test only bfd font support that I will
disable in freetype
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/fontconfig
ipcop/trunk/lfs/fontconfig
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
Modified: ipcop/trunk/config/rootfiles/common/fontconfig
===================================================================
--- ipcop/trunk/config/rootfiles/common/fontconfig 2012-04-20 06:24:13 UTC
(rev 6549)
+++ ipcop/trunk/config/rootfiles/common/fontconfig 2012-04-21 06:15:13 UTC
(rev 6550)
@@ -1,6 +1,3 @@
-## fontconfig-2.8.0
-##
-#etc
etc/fonts
#etc/fonts/conf.avail
#etc/fonts/conf.avail/10-autohint.conf
@@ -10,6 +7,9 @@
#etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
#etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
#etc/fonts/conf.avail/10-unhinted.conf
+#etc/fonts/conf.avail/11-lcdfilter-default.conf
+#etc/fonts/conf.avail/11-lcdfilter-legacy.conf
+#etc/fonts/conf.avail/11-lcdfilter-light.conf
#etc/fonts/conf.avail/20-fix-globaladvance.conf
#etc/fonts/conf.avail/20-unhint-small-vera.conf
#etc/fonts/conf.avail/25-unhint-nonlatin.conf
@@ -52,15 +52,14 @@
#usr/bin/fc-cat
#usr/bin/fc-list
#usr/bin/fc-match
+#usr/bin/fc-pattern
#usr/bin/fc-query
#usr/bin/fc-scan
#usr/include/fontconfig
#usr/include/fontconfig/fcfreetype.h
#usr/include/fontconfig/fcprivate.h
#usr/include/fontconfig/fontconfig.h
-#usr/lib/libfontconfig.a
-#usr/lib/libfontconfig.la
-usr/lib/libfontconfig.so
+#usr/lib/libfontconfig.so
usr/lib/libfontconfig.so.1
-usr/lib/libfontconfig.so.1.4.4
+usr/lib/libfontconfig.so.1.5.0
#usr/lib/pkgconfig/fontconfig.pc
Modified: ipcop/trunk/lfs/fontconfig
===================================================================
--- ipcop/trunk/lfs/fontconfig 2012-04-20 06:24:13 UTC (rev 6549)
+++ ipcop/trunk/lfs/fontconfig 2012-04-21 06:15:13 UTC (rev 6550)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = fontconfig
-VER = 2.8.0
+VER = 2.9.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 77e15a92006ddc2adbb06f840d591c0e
+$(DL_FILE)_MD5 = 26c83855ed256b5c032baae032fadc4f
install : $(TARGET)
@@ -85,6 +85,7 @@
# if we reinstall, remove before moved to .bak
rm -f /etc/fonts/fonts.conf
+ # BLFS --without-add-fonts is not needed as there is in chroot only the
font we install
cd $(DIR_APP) && ./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -93,11 +94,14 @@
--enable-libxml2 \
--build=$(MACHINE_REAL)-linux \
--target=$(MACHINE)-linux
+
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
- cd $(DIR_APP) && make -j 1 check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ # test fail because .pcf file support is disabled in freetype to save
space
+ # cd $(DIR_APP) && VERBOSE=1 make -j 1 check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
endif
cd $(DIR_APP) && make install
+ rm /usr/lib/libfontconfig.la
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-04-20 06:24:13 UTC
(rev 6549)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-04-21 06:15:13 UTC
(rev 6550)
@@ -174,6 +174,11 @@
## ethtool-3.2
/usr/sbin/ethtool
##
+## fontconfig-2.9.0
+/etc/fonts
+/usr/lib/libfontconfig.so.1
+/usr/lib/libfontconfig.so.1.5.0
+##
## gawk-4.0.1
/usr/bin/awk
/usr/bin/gawk
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-04-20 06:24:13 UTC (rev
6549)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-04-21 06:15:13 UTC (rev
6550)
@@ -8,7 +8,7 @@
Language updates.<br />
Upgrade acpid to 2.0.15, arping to 2.11, bash to 4.2.24, coreutils
to 8.16,
dhcpcd to 5.5.4, dnsmasq to 2.60,
- e2fsprogs to 1.42.2, ethtool to 3.2, gawk to 4.0.1, glib to 2.30.3
+ e2fsprogs to 1.42.2, ethtool to 3.2, fontconfig to 2.9, gawk to
4.0.1, glib to 2.30.3
gmp to 5.0.4, grep to 2.11, gnupg to 1.4.12,
iproute2 to 3.3.0, iptables to 1.4.13, hdparm to 9.39, kernel to
3.0.28, krb5 to 1.9.3,
libgcrypt to 1.5.0, libpng to 1.5.10, libtool to 2.4.2, lsof to
4.85,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-04-20 06:24:13 UTC (rev 6549)
+++ ipcop/trunk/updates/2.1.0/setup 2012-04-21 06:15:13 UTC (rev 6550)
@@ -110,6 +110,7 @@
/bin/rm -f /lib/libip4tc.so.0.0.0
/bin/rm -f /lib/libip6tc.so.0.0.0
/bin/rm -f /lib/libproc-3.2.8.so
+/bin/rm -f /usr/lib/libfontconfig.so.1.4.4
/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
@@ -126,6 +127,7 @@
/bin/rm -f /usr/lib/libpng15.so.15.8.0
# Remove devel lib that should not be needed
+/bin/rm -f /usr/lib/libfontconfig.so
/bin/rm -f /usr/lib/libpcre.so
/bin/rm -f /usr/lib/libxml2.so
## e2fsprogs
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
