external/fontconfig/ExternalProject_fontconfig.mk | 2 +-
external/freetype/ExternalProject_freetype.mk | 4 ++--
vcl/inc/salgdi.hxx | 3 ---
3 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 49f6c5907a2ec8c1886e3157de2c843d332aabcf
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Oct 24 23:12:32 2013 +0300
Fix freetype and fontconfig problems
We need to do a "make install" in freetype so that what freetype-config
--libs
outputs is correct. We don't use freetype-config ourselves but fontconfig
does, and it builds some test programs.
The bundled freetype and fontconfig are built only for Android.
Change-Id: Ib622cc48a0c4eb6a72188bc83c8d36b39f97fdca
diff --git a/external/fontconfig/ExternalProject_fontconfig.mk
b/external/fontconfig/ExternalProject_fontconfig.mk
index 74438d0..e4de004 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
--with-arch=arm \
--with-expat-includes=$(call
gb_UnpackedTarball_get_dir,expat)/lib \
--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
- --with-freetype-config=$(call
gb_UnpackedTarball_get_dir,freetype)/builds/unix/freetype-config \
+ --with-freetype-config=$(call
gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
&& $(MAKE) \
)
diff --git a/external/freetype/ExternalProject_freetype.mk
b/external/freetype/ExternalProject_freetype.mk
index ba22a64..aa9a1b7 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -20,10 +20,10 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
--disable-shared \
--without-zlib \
--without-bzip2 \
- --prefix=$(OUTDIR) --includedir=$(call
gb_UnpackedTarball_get_dir,freetype)/include \
+ --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
&& chmod +x builds/unix/freetype-config \
- && $(MAKE) \
+ && $(MAKE) install \
&& touch $@
# vim: set noet sw=4 ts=4:
commit 01a51764c5eff1c883d3a19381ab4d8971471492
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Oct 24 20:00:27 2013 +0300
Bin unused #defines
Change-Id: I5a6eb741c0669d2f1e5bfbe302066be863ec0249
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index d4a219d..d0edf59 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -56,10 +56,7 @@ namespace basegfx {
// - SalGraphics-Codes -
// ---------------------
-#define SAL_SETFONT_REMOVEANDMATCHNEW ((sal_uInt16)0x0001)
-#define SAL_SETFONT_USEDRAWTEXT ((sal_uInt16)0x0002)
#define SAL_SETFONT_USEDRAWTEXTARRAY ((sal_uInt16)0x0004)
-#define SAL_SETFONT_UNICODE ((sal_uInt16)0x0008)
#define SAL_SETFONT_BADFONT ((sal_uInt16)0x1000)
#define SAL_COPYAREA_WINDOWINVALIDATE ((sal_uInt16)0x0001)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
