configure.ac | 4 ++-- connectivity/source/commontools/dbconversion.cxx | 4 ++-- python3/ExternalProject_python3.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit fd179c5f308a0a611bc2b5a479e28ff3ced79647 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Sat Apr 20 17:44:51 2013 -0500 missing "" around identity in check for code signng key on Mac Change-Id: I421b72dd58d1216c1f68731332bc6a41d3c0071e diff --git a/configure.ac b/configure.ac index 639a1f1..2152487 100644 --- a/configure.ac +++ b/configure.ac @@ -2586,12 +2586,12 @@ if test "$_os" = "Darwin"; then identity=`security find-identity -p codesigning -v 2>/dev/null | grep 'Developer ID Application:' | awk '{print $2}' |head -1` if test -n "$identity"; then MACOSX_CODESIGNING_IDENTITY=$identity - pretty_name=`security find-identity -p codesigning -v | grep $MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^"]]*"//' -e 's/"//'` + pretty_name=`security find-identity -p codesigning -v | grep "$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'` AC_MSG_RESULT([yes, using the identity $MACOSX_CODESIGNING_IDENTITY for $pretty_name]) fi elif test -n "$enable_macosx_code_signing"; then MACOSX_CODESIGNING_IDENTITY=$enable_macosx_code_signing - pretty_name=`security find-identity -p codesigning -v | grep $MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^"]]*"//' -e 's/"//'` + pretty_name=`security find-identity -p codesigning -v | grep "$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'` AC_MSG_RESULT([yes, using the identity $MACOSX_CODESIGNING_IDENTITY for $pretty_name]) else AC_MSG_RESULT([no]) commit 292af048ace2d4b455b2da3a22c784cb05db1d09 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Sat Apr 20 17:41:34 2013 -0500 python3: --with-system-expat seems to mess up mac build Change-Id: I2227c5c715bb656878dd97b71d59c149e7e5320a diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index f030afd..a01e115 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -72,9 +72,9 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - --with-system-expat \ $(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \ --prefix=/python-inst \ + $(if $(filter MACOSX,$(OS)),,--with-system-expat) \ $(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads \ OPT="-g0 -fwrapv -O3 -Wall") \ $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ commit 693d25f8a601ee3738a396fbd8a9b838f19e39c9 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Sat Apr 20 17:31:26 2013 -0500 connectivity: use LL qualifier for int64 contants Change-Id: Iaafbd62920c2b695c5810766d143a01c288e813f diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index b23cd3b..0150cdd 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -39,8 +39,8 @@ namespace const sal_Int16 minInHour = 60; const sal_Int64 secMask = 1000000000; - const sal_Int64 minMask = 100000000000; - const sal_Int64 hourMask = 10000000000000; + const sal_Int64 minMask = 100000000000LL; + const sal_Int64 hourMask = 10000000000000LL; const double fNanoSecondsPerDay = nanoSecInSec * secInMin * minInHour * 24.0; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits