cairo: Update to 1.14.8

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/cairo b/config/rootfiles/common/cairo
index ca09099eb313f385d3350f6a873152c2d19f54b8..12934cead75a4ccd147d42a8fcf594ce77a8c15d 100644 (file)
--- a/config/rootfiles/common/cairo
+++ b/config/rootfiles/common/cairo
@@ -7,36 +7,38 @@
 #usr/include/cairo/cairo-pdf.h
 #usr/include/cairo/cairo-ps.h
 #usr/include/cairo/cairo-script-interpreter.h
+#usr/include/cairo/cairo-script.h
 #usr/include/cairo/cairo-svg.h
 #usr/include/cairo/cairo-version.h
 #usr/include/cairo/cairo.h
 #usr/lib/cairo
 #usr/lib/cairo/libcairo-trace.a
 #usr/lib/cairo/libcairo-trace.la
-usr/lib/cairo/libcairo-trace.so
+#usr/lib/cairo/libcairo-trace.so
 usr/lib/cairo/libcairo-trace.so.0
 usr/lib/cairo/libcairo-trace.so.0.0.0
 #usr/lib/libcairo-gobject.a
 #usr/lib/libcairo-gobject.la
-usr/lib/libcairo-gobject.so
+#usr/lib/libcairo-gobject.so
 usr/lib/libcairo-gobject.so.2
-usr/lib/libcairo-gobject.so.2.11000.2
+usr/lib/libcairo-gobject.so.2.11400.8
 #usr/lib/libcairo-script-interpreter.a
 #usr/lib/libcairo-script-interpreter.la
-usr/lib/libcairo-script-interpreter.so
+#usr/lib/libcairo-script-interpreter.so
 usr/lib/libcairo-script-interpreter.so.2
-usr/lib/libcairo-script-interpreter.so.2.11000.2
+usr/lib/libcairo-script-interpreter.so.2.11400.8
 #usr/lib/libcairo.a
 #usr/lib/libcairo.la
 #usr/lib/libcairo.so
 usr/lib/libcairo.so.2
-usr/lib/libcairo.so.2.11000.2
+usr/lib/libcairo.so.2.11400.8
 #usr/lib/pkgconfig/cairo-fc.pc
 #usr/lib/pkgconfig/cairo-ft.pc
 #usr/lib/pkgconfig/cairo-gobject.pc
 #usr/lib/pkgconfig/cairo-pdf.pc
 #usr/lib/pkgconfig/cairo-png.pc
 #usr/lib/pkgconfig/cairo-ps.pc
+#usr/lib/pkgconfig/cairo-script.pc
 #usr/lib/pkgconfig/cairo-svg.pc
 #usr/lib/pkgconfig/cairo.pc
 #usr/share/gtk-doc/html/cairo
@@ -58,16 +60,20 @@ usr/lib/libcairo.so.2.11000.2
 #usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
 #usr/share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-Raster-Sources.html
 #usr/share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-Regions.html
 #usr/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-Transformations.html
 #usr/share/gtk-doc/html/cairo/cairo-Types.html
 #usr/share/gtk-doc/html/cairo/cairo-User-Fonts.html
 #usr/share/gtk-doc/html/cairo/cairo-Version-Information.html
 #usr/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
 #usr/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-XCB-Surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html
 #usr/share/gtk-doc/html/cairo/cairo-cairo-device-t.html
 #usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
 #usr/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html
@@ -81,10 +87,11 @@ usr/lib/libcairo.so.2.11000.2
 #usr/share/gtk-doc/html/cairo/cairo-support.html
 #usr/share/gtk-doc/html/cairo/cairo-surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-text.html
-#usr/share/gtk-doc/html/cairo/cairo.devhelp
 #usr/share/gtk-doc/html/cairo/cairo.devhelp2
 #usr/share/gtk-doc/html/cairo/home.png
 #usr/share/gtk-doc/html/cairo/index-1.10.html
+#usr/share/gtk-doc/html/cairo/index-1.12.html
+#usr/share/gtk-doc/html/cairo/index-1.14.html
 #usr/share/gtk-doc/html/cairo/index-1.2.html
 #usr/share/gtk-doc/html/cairo/index-1.4.html
 #usr/share/gtk-doc/html/cairo/index-1.6.html
@@ -93,7 +100,10 @@ usr/lib/libcairo.so.2.11000.2
 #usr/share/gtk-doc/html/cairo/index.html
 #usr/share/gtk-doc/html/cairo/index.sgml
 #usr/share/gtk-doc/html/cairo/language-bindings.html
+#usr/share/gtk-doc/html/cairo/left-insensitive.png
 #usr/share/gtk-doc/html/cairo/left.png
+#usr/share/gtk-doc/html/cairo/right-insensitive.png
 #usr/share/gtk-doc/html/cairo/right.png
 #usr/share/gtk-doc/html/cairo/style.css
+#usr/share/gtk-doc/html/cairo/up-insensitive.png
 #usr/share/gtk-doc/html/cairo/up.png

diff --git a/lfs/cairo b/lfs/cairo
index 591549ab3e7e86118005d8f856c72ad9a39020e2..a5772af721dfb50ff2d6bf1c605b8c7d5e5e9988 100644 (file)
--- a/lfs/cairo
+++ b/lfs/cairo
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.10.2
+VER        = 1.14.8
 
 THISAPP    = cairo-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f101a9e88b783337b20b2e26dfd26d5f
+$(DL_FILE)_MD5 = 4ef0db2eacb271c74f8a3fd87822aa98
 
 install : $(TARGET)
 
@@ -69,8 +69,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-win32 --disable-os2 --disable-beos
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr \
+               --disable-win32 --disable-os2 --disable-beos
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)