nss/nss.patch | 4 ++-- sw/source/ui/config/optload.src | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit b647042ff4fcedff5b4817ed793095e5da84ebab Author: Jim Jagielski <[email protected]> Date: Mon Oct 9 20:59:12 2017 +0000 Force lib again diff --git a/nss/nss.patch b/nss/nss.patch index 17ca773ac9b3..decd24926a5f 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -116,7 +116,7 @@ diff -ur misc/nss-3.25/nss/coreconf/Darwin.mk misc/build/nss-3.25/nss/coreconf/D + +# CC is taken from environment automatically. +#CC = cc -+CCC = $(CXX) -stdlib=libc++ ++CCC = $(CXX) -stdlib=libc++ -std=c++11 -CC = gcc -CCC = g++ @@ -282,7 +282,7 @@ diff -ur misc/nss-3.25/nss/external_tests/common/gtest.mk misc/build/nss-3.25/ns else - CXXFLAGS += -std=c++0x + ifeq (Darwin,$(OS_ARCH)) -+ CXXFLAGS += -stdlib=libc++ ++ CXXFLAGS += -stdlib=libc++ -std=c++11 + else + CXXFLAGS += -std=c++0x + endif commit 4ea2caad90cb3cb34ab9bf4dfa117b83e0c9f853 Author: Matthias Seidel <[email protected]> Date: Mon Oct 9 20:10:55 2017 +0000 Increased length for localized strings diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index 856343037024..9ac20221f4d8 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.src @@ -44,7 +44,7 @@ TabPage TP_OPTLOAD_PAGE FixedText FT_LINK { Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 115 , 8 ) ; + Size = MAP_APPFONT ( 125 , 8 ) ; Text [ en-US ] = "Update links when loading"; }; RadioButton RB_ALWAYS _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
