Makefile.top | 7 ------- Module_tail_build.mk | 2 -- cairo/prj/build.lst | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-)
New commits: commit e7fee7d4a5add0aa3547221953ad2e155c28ad15 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Wed Nov 7 00:26:43 2012 +0100 add dependency on fontconfig to cairo Change-Id: I7c97169ea56c8290d0866e2e226cd4ecf4debc25 diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 142f828..f70f6c4 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -71,12 +71,10 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ extras \ fileaccess \ filter \ - $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ forms \ formula \ fpicker \ framework \ - $(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst index b107635..9e8db83 100644 --- a/cairo/prj/build.lst +++ b/cairo/prj/build.lst @@ -1,4 +1,4 @@ -lcairo cairo : ZLIB:zlib LIBPNG:libpng soltools NULL +lcairo cairo : FONTCONFIG:fontconfig ZLIB:zlib LIBPNG:libpng soltools NULL lcairo cairo usr1 - all lcairo_mkout NULL lcairo cairo\pixman nmake - all lcairo_pixman NULL lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL commit 0f063b37863759c3c843cff94fdb166efeb3bed2 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Tue Nov 6 21:31:34 2012 +0100 these modules are gone Change-Id: Ia39005c3c8a0f8287e591455d663828fba1f639f diff --git a/Makefile.top b/Makefile.top index 1a56a3a..fb87951 100644 --- a/Makefile.top +++ b/Makefile.top @@ -110,7 +110,6 @@ libcmis\ libmspub\ liborcus\ libpng\ -librsvg\ libvisio\ libwpd\ libwpg\ @@ -219,15 +218,10 @@ cairo\ cppunit\ crashrep\ external\ -gdk-pixbuf\ -gettext\ -glib\ helpcontent2 \ icu\ instsetoo_native\ -libcroco\ libexttextcat\ -libgsf\ liblangtag\ libxml2\ libxmlsec\ @@ -241,7 +235,6 @@ mysqlcppconn\ nss\ odk\ openssl\ -pango\ postprocess\ python\ redland\
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits