Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Sorry, iam new on git, what command should i run on the core directory to generate the patch.
The attachment patch was generate with the below command

git git-patch -1

is it correct?

best regards
jorge luis

----- Mensaje original -----
De: "Stephan Bergmann" <sbergman@redhat.com>
Para: "Jorge Luis Roque Alvarez" <jlalvarez@uci.cu>
CC: libreoffice@lists.freedesktop.org
Enviados: MiƩrcoles, 8 de Mayo 2013 9:57:10
Asunto: Re: Wizard Integration

On 05/08/2013 03:48 PM, Jorge Luis Roque Alvarez wrote:
Here it goes ...

Sorry, that's not in a usable form.  From your previous mails, I
understand that you add your calendar wizard code to the LO sources, and
try to build it as part of LO.  So please provide your code as a git patch.

Stephan
http://www.uci.cu

http://www.uci.cu

From 7885f9820d5d1ca80381bf88ea2be537874e5ad5 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@suse.com>
Date: Wed, 3 Apr 2013 13:36:47 +0200
Subject: [PATCH] Make 10.6 sdk in XCode 4 setup work in configury.

Change-Id: Ia7393d177a24ec6d5e3c25e487a8d5ae96e3c02a
---
 configure.ac |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index f096cb3..cc24bf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2558,11 +2558,15 @@ if test "$_os" = "Darwin"; then
             CXX="${gccprefix}g++-4.0 $arch -mmacosx-version-min=$with_macosx_version_min_required 
-isysroot $MACOSX_SDK_PATH"
             ;;
         10.6)
-            # Is similar logic as above needed? Is it likely somebody
-            # has both an older Xcode with the 10.6 SDK and a current
-            # Xcode?
-            CC="gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
-            CXX="g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+            # did someone copy her 10.6 sdk into xcode 4 (needed on Mountain Lion)?
+            if test "$(echo $MACOSX_SDK_PATH | cut -c1-23)" = "/Applications/Xcode.app"; then
+                CC="`xcrun -find gcc` $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+                CXX="`xcrun -find g++` $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+                XCRUN=xcrun
+            else
+                CC="gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required 
-isysroot $MACOSX_SDK_PATH"
+                CXX="g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required 
-isysroot $MACOSX_SDK_PATH"
+            fi
             ;;
         10.7|10.8)
             CC="`xcrun -find clang` $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
-- 
1.7.10.4


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.