nss/ExternalProject_nss.mk | 2 +- nss/nss_macosx.patch | 11 +++++++++++ vcl/win/source/gdi/salgdi3.cxx | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-)
New commits: commit d90fa3890d18ca554ec48cb78fcc7bf410dabb85 Author: Michael Stahl <[email protected]> Date: Fri Sep 13 19:14:41 2013 +0200 nss: nmedit is apparently also affected by xcrun... ...but it's the only use of that tool apparently (hoping that libtool merely checks for it for decorative purposes) so perhaps we can do without another config_host.mk variable... Change-Id: I2a0dec4c01dc8ad3327b34a99c807705fedcdd00 diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index f907154..843a153 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -71,7 +71,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter YES,$(CROSS_COMPILING)),\ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py") \ NSDISTMODE=copy \ - $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) nss_build_all \ + $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit nss_build_all \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libfreebl3.dylib \ diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch index 6b50960..102e9a3 100644 --- a/nss/nss_macosx.patch +++ b/nss/nss_macosx.patch @@ -65,3 +65,14 @@ MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) DLL_SUFFIX = dylib +--- misc/nss-3.13.5/mozilla/security/coreconf/rules.mk ++++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk +@@ -342,7 +342,7 @@ + chmod +x $@ + ifeq ($(OS_TARGET),Darwin) + ifdef MAPFILE +- nmedit -s $(MAPFILE) $@ ++ $(NMEDIT) -s $(MAPFILE) $@ + endif + endif + endif commit 134d64ca81bb6c93fd800a13256951ad6979dbab Author: Michael Stahl <[email protected]> Date: Fri Sep 13 19:04:29 2013 +0200 vcl: unbreak WNT build Change-Id: I000824e86f40ce20af2d254dc848b51321602760 diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 5c01947..a642e3d 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -104,7 +104,8 @@ protected: enum{ MAGIC = 0x12349876 }; // change if fontattrcache format changes public: - ImplFontAttrCache( const String& rCacheFileName, const String& rBaseURL ); + ImplFontAttrCache(const OUString& rCacheFileName, + const OUString& rBaseURL); ~ImplFontAttrCache(); ImplDevFontAttributes GetFontAttr( const String& rFontFileName ) const; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
