Revision: 7344
http://sourceforge.net/p/ipcop/svn/7344
Author: owes
Date: 2014-03-18 06:54:18 +0000 (Tue, 18 Mar 2014)
Log Message:
-----------
Update pango to 1.36.2
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/pango
ipcop/trunk/lfs/pango
ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
ipcop/trunk/updates/2.1.3/information.xml
ipcop/trunk/updates/2.1.3/setup
Modified: ipcop/trunk/config/rootfiles/common/pango
===================================================================
--- ipcop/trunk/config/rootfiles/common/pango 2014-03-18 06:51:40 UTC (rev
7343)
+++ ipcop/trunk/config/rootfiles/common/pango 2014-03-18 06:54:18 UTC (rev
7344)
@@ -38,104 +38,24 @@
#usr/lib/libpango-1.0.la
#usr/lib/libpango-1.0.so
usr/lib/libpango-1.0.so.0
-usr/lib/libpango-1.0.so.0.2800.4
+usr/lib/libpango-1.0.so.0.3600.2
#usr/lib/libpangocairo-1.0.la
#usr/lib/libpangocairo-1.0.so
usr/lib/libpangocairo-1.0.so.0
-usr/lib/libpangocairo-1.0.so.0.2800.4
+usr/lib/libpangocairo-1.0.so.0.3600.2
#usr/lib/libpangoft2-1.0.la
#usr/lib/libpangoft2-1.0.so
usr/lib/libpangoft2-1.0.so.0
-usr/lib/libpangoft2-1.0.so.0.2800.4
+usr/lib/libpangoft2-1.0.so.0.3600.2
#usr/lib/pango
-#usr/lib/pango/1.6.0
-#usr/lib/pango/1.6.0/modules
-#usr/lib/pango/1.6.0/modules/pango-arabic-fc.la
-usr/lib/pango/1.6.0/modules/pango-arabic-fc.so
-#usr/lib/pango/1.6.0/modules/pango-arabic-lang.la
-usr/lib/pango/1.6.0/modules/pango-arabic-lang.so
-#usr/lib/pango/1.6.0/modules/pango-basic-fc.la
-usr/lib/pango/1.6.0/modules/pango-basic-fc.so
-#usr/lib/pango/1.6.0/modules/pango-hangul-fc.la
-usr/lib/pango/1.6.0/modules/pango-hangul-fc.so
-#usr/lib/pango/1.6.0/modules/pango-hebrew-fc.la
-#usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so
-#usr/lib/pango/1.6.0/modules/pango-indic-fc.la
-#usr/lib/pango/1.6.0/modules/pango-indic-fc.so
-#usr/lib/pango/1.6.0/modules/pango-indic-lang.la
-#usr/lib/pango/1.6.0/modules/pango-indic-lang.so
-#usr/lib/pango/1.6.0/modules/pango-khmer-fc.la
-#usr/lib/pango/1.6.0/modules/pango-khmer-fc.so
-#usr/lib/pango/1.6.0/modules/pango-syriac-fc.la
-#usr/lib/pango/1.6.0/modules/pango-syriac-fc.so
-#usr/lib/pango/1.6.0/modules/pango-thai-fc.la
-#usr/lib/pango/1.6.0/modules/pango-thai-fc.so
-#usr/lib/pango/1.6.0/modules/pango-tibetan-fc.la
-#usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so
+#usr/lib/pango/1.8.0
+#usr/lib/pango/1.8.0/modules
+#usr/lib/pango/1.8.0/modules/pango-arabic-lang.la
+usr/lib/pango/1.8.0/modules/pango-arabic-lang.so
+#usr/lib/pango/1.8.0/modules/pango-basic-fc.la
+usr/lib/pango/1.8.0/modules/pango-basic-fc.so
+#usr/lib/pango/1.8.0/modules/pango-indic-lang.la
+#usr/lib/pango/1.8.0/modules/pango-indic-lang.so
#usr/lib/pkgconfig/pango.pc
#usr/lib/pkgconfig/pangocairo.pc
#usr/lib/pkgconfig/pangoft2.pc
-#usr/share/gtk-doc/html/pango
-#usr/share/gtk-doc/html/pango/PangoEngineLang.html
-#usr/share/gtk-doc/html/pango/PangoEngineShape.html
-#usr/share/gtk-doc/html/pango/PangoFcDecoder.html
-#usr/share/gtk-doc/html/pango/PangoFcFont.html
-#usr/share/gtk-doc/html/pango/PangoFcFontMap.html
-#usr/share/gtk-doc/html/pango/PangoMarkupFormat.html
-#usr/share/gtk-doc/html/pango/home.png
-#usr/share/gtk-doc/html/pango/index-1.10.html
-#usr/share/gtk-doc/html/pango/index-1.12.html
-#usr/share/gtk-doc/html/pango/index-1.14.html
-#usr/share/gtk-doc/html/pango/index-1.16.html
-#usr/share/gtk-doc/html/pango/index-1.18.html
-#usr/share/gtk-doc/html/pango/index-1.2.html
-#usr/share/gtk-doc/html/pango/index-1.20.html
-#usr/share/gtk-doc/html/pango/index-1.22.html
-#usr/share/gtk-doc/html/pango/index-1.24.html
-#usr/share/gtk-doc/html/pango/index-1.26.html
-#usr/share/gtk-doc/html/pango/index-1.28.html
-#usr/share/gtk-doc/html/pango/index-1.4.html
-#usr/share/gtk-doc/html/pango/index-1.6.html
-#usr/share/gtk-doc/html/pango/index-1.8.html
-#usr/share/gtk-doc/html/pango/index-all.html
-#usr/share/gtk-doc/html/pango/index-deprecated.html
-#usr/share/gtk-doc/html/pango/index.html
-#usr/share/gtk-doc/html/pango/index.sgml
-#usr/share/gtk-doc/html/pango/layout.gif
-#usr/share/gtk-doc/html/pango/left.png
-#usr/share/gtk-doc/html/pango/lowlevel.html
-#usr/share/gtk-doc/html/pango/pango-ATSUI-Fonts.html
-#usr/share/gtk-doc/html/pango/pango-Bidirectional-Text.html
-#usr/share/gtk-doc/html/pango/pango-Cairo-Rendering.html
-#usr/share/gtk-doc/html/pango/pango-Coverage-Maps.html
-#usr/share/gtk-doc/html/pango/pango-Engines.html
-#usr/share/gtk-doc/html/pango/pango-Fonts.html
-#usr/share/gtk-doc/html/pango/pango-FreeType-Fonts-and-Rendering.html
-#usr/share/gtk-doc/html/pango/pango-Glyph-Storage.html
-#usr/share/gtk-doc/html/pango/pango-Layout-Objects.html
-#usr/share/gtk-doc/html/pango/pango-Miscellaneous-Utilities.html
-#usr/share/gtk-doc/html/pango/pango-Modules.html
-#usr/share/gtk-doc/html/pango/pango-OpenType-Font-Handling.html
-#usr/share/gtk-doc/html/pango/pango-Scripts-and-Languages.html
-#usr/share/gtk-doc/html/pango/pango-Tab-Stops.html
-#usr/share/gtk-doc/html/pango/pango-Text-Attributes.html
-#usr/share/gtk-doc/html/pango/pango-Text-Processing.html
-#usr/share/gtk-doc/html/pango/pango-Version-Checking.html
-#usr/share/gtk-doc/html/pango/pango-Vertical-Text.html
-#usr/share/gtk-doc/html/pango/pango-Win32-Fonts-and-Rendering.html
-#usr/share/gtk-doc/html/pango/pango-X-Fonts-and-Rendering.html
-#usr/share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html
-#usr/share/gtk-doc/html/pango/pango-hierarchy.html
-#usr/share/gtk-doc/html/pango/pango-pango-renderer.html
-#usr/share/gtk-doc/html/pango/pango-querymodules.html
-#usr/share/gtk-doc/html/pango/pango.devhelp
-#usr/share/gtk-doc/html/pango/pango.devhelp2
-#usr/share/gtk-doc/html/pango/pango.html
-#usr/share/gtk-doc/html/pango/rendering.html
-#usr/share/gtk-doc/html/pango/right.png
-#usr/share/gtk-doc/html/pango/rotated-text.png
-#usr/share/gtk-doc/html/pango/style.css
-#usr/share/gtk-doc/html/pango/tools.html
-#usr/share/gtk-doc/html/pango/up.png
-#usr/share/man/man1/pango-querymodules.1
-#usr/share/man/man1/pango-view.1
Modified: ipcop/trunk/lfs/pango
===================================================================
--- ipcop/trunk/lfs/pango 2014-03-18 06:51:40 UTC (rev 7343)
+++ ipcop/trunk/lfs/pango 2014-03-18 06:54:18 UTC (rev 7344)
@@ -32,15 +32,14 @@
include Config
-# 1.30.1 require glib>=2.31
PKG_NAME = pango
-VER = 1.28.4
+VER = 1.36.2
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = http://ftp.gnome.org/pub/GNOME/sources/pango/1.28
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = http://ftp.gnome.org/pub/GNOME/sources/pango/1.36
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -52,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3f3989700f04e9117d30544a9078b3a0
+$(DL_FILE)_MD5 = 253026c7132c22e52cefd998ba89a742
install : $(TARGET)
@@ -81,14 +80,16 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
# Workaround for strict-aliasing warnings
- cd $(DIR_APP) && CFLAGS="$$CFLAGS -fno-strict-aliasing" ./configure
--prefix=/usr --disable-static --sysconfdir=/etc
+ #cd $(DIR_APP) && CFLAGS="$$CFLAGS -fno-strict-aliasing" ./configure
--prefix=/usr --disable-static --sysconfdir=/etc
+ cd $(DIR_APP) && ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man/pango \
+ --disable-static \
+ --disable-gtk-doc-html
- # Fix GLIB_LIBS missing in tests after binutils-2.22 upgrade
- # Inspired by upstream change but a patch on Makefile.am would be a
nightmare due to automake-1.11 missing issue
- cd $(DIR_APP) && sed -i '/test.*\.\.\/pango/s/LDADD = /LDADD =
$$(GLIB_LIBS) /' tests/Makefile
cd $(DIR_APP) && make -j $(PARALLELISM) V=1
ifeq "$(RUNNING_TEST)" "yes"
-cd $(DIR_APP) && make -j 1 -k check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
@@ -99,5 +100,6 @@
# be sure the modules are in the same order everytime, so md5 does not
vary
sort -o /etc/pango/pango.modules /etc/pango/pango.modules
+ rm -rf /usr/share/man/pango /usr/share/gtk-doc/html/pango
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-18 06:51:40 UTC
(rev 7343)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-18 06:54:18 UTC
(rev 7344)
@@ -189,6 +189,17 @@
/usr/lib/libldap-2.4.so.2
/usr/lib/libldap-2.4.so.2.10.2
##
+## pango-1.36.2
+/etc/pango/pango.modules
+/usr/lib/libpango-1.0.so.0
+/usr/lib/libpango-1.0.so.0.3600.2
+/usr/lib/libpangocairo-1.0.so.0
+/usr/lib/libpangocairo-1.0.so.0.3600.2
+/usr/lib/libpangoft2-1.0.so.0
+/usr/lib/libpangoft2-1.0.so.0.3600.2
+/usr/lib/pango/1.8.0/modules/pango-arabic-lang.so
+/usr/lib/pango/1.8.0/modules/pango-basic-fc.so
+##
## pcre-8.34
/usr/lib/libpcre.so.1
/usr/lib/libpcre.so.1.2.2
Modified: ipcop/trunk/updates/2.1.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.3/information.xml 2014-03-18 06:51:40 UTC (rev
7343)
+++ ipcop/trunk/updates/2.1.3/information.xml 2014-03-18 06:54:18 UTC (rev
7344)
@@ -9,7 +9,7 @@
Upgrade apcid to 2.0.22, bind to 9.9.5, cairo to 1.12.16, coreutils to
8.22, db to 6.0.30, e2fsprogs to 1.42.9, ethtool to 3.13,
fcron to 3.1.2, freetype to 2.5.3, glib to 2.38.2, gnupg to 1.4.16,
iproute2 to 3.12.0, libgcrypt to 1.6.1, libgpg-error to 1.12, libnl to
3.2.24, libpng to 1.6.10, logrotate to 3.8.7, openldap to 2.4.39,
- pcre to 8.34, procps to 3.3.9, psmisc to 22.21, readline to 6.3,
sqlite to 3.8.4.1,
+ pango to 1.36.2, pcre to 8.34, procps to 3.3.9, psmisc to 22.21,
readline to 6.3, sqlite to 3.8.4.1,
squid-langpack to 20140220, tzdata to 2014a, ulogd to 2.0.3,
util-linux to 2.24.1.</description>
<previousversion>2.1.2</previousversion>
<installdate>INSTALLDATE</installdate>
Modified: ipcop/trunk/updates/2.1.3/setup
===================================================================
--- ipcop/trunk/updates/2.1.3/setup 2014-03-18 06:51:40 UTC (rev 7343)
+++ ipcop/trunk/updates/2.1.3/setup 2014-03-18 06:54:18 UTC (rev 7344)
@@ -114,6 +114,14 @@
/bin/rm -f /usr/lib/liblber-2.4.so.2.10.1
/bin/rm -f /usr/lib/libldap-2.4.so.2
/bin/rm -f /usr/lib/libldap-2.4.so.2.10.1
+# pango
+/bin/rm -f /usr/lib/libpango-1.0.so.0
+/bin/rm -f /usr/lib/libpango-1.0.so.0.2800.4
+/bin/rm -f /usr/lib/libpangocairo-1.0.so.0
+/bin/rm -f /usr/lib/libpangocairo-1.0.so.0.2800.4
+/bin/rm -f /usr/lib/libpangoft2-1.0.so.0
+/bin/rm -f /usr/lib/libpangoft2-1.0.so.0.2800.4
+/bin/rm -rf /usr/lib/pango/1.6.0
# pcre
/bin/rm -f /usr/lib/libpcre.so.1
/bin/rm -f /usr/lib/libpcre.so.1.2.1
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
