[ooo-build-commit] 2 commits - bin/unpack configure.in patches/dev300

[Jan Holesovsky]

 bin/unpack                               |   28 ++++++++++++++++------------
 configure.in                             |   12 +++++++++++-
 patches/dev300/apply                     |    5 ++++-
 patches/dev300/evaluation-row-limit.diff |   26 ++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 14 deletions(-)

New commits:
commit 33c0edddafd54d18a9d7f6b017952e8849e2e93c
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Dec 21 15:42:40 2009 +0100

    Alternative row limit.
    
    * configure.in:
    * patches/dev300/apply:
    * patches/dev300/evaluation-row-limit.diff:

diff --git a/configure.in b/configure.in
index c12845a..438e7f9 100644
--- a/configure.in
+++ b/configure.in
@@ -1588,6 +1588,7 @@ distro-configs/Slackware.conf
 distro-configs/Mandriva.conf
 distro-configs/Mandriva64.conf
 distro-configs/NovellWin32.conf
+distro-configs/NovellWin32Eval.conf
 distro-configs/NovellWin32ISO.conf
 distro-configs/Gentoo.conf
 distro-configs/Frugalware.conf
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2cd1aad..9c5a54e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -123,8 +123,8 @@ NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin3
 	CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
 # Novell
 NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only
-NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only
 NovellWin32Eval: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellEvaluation
+NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only
 # go-oo.org Win32
 GoOoWin32: NovellLikeWin32, GoOoOnlyWin32, MultilanguageWin32Only, GoOoSplash
 # Mac OS X
@@ -849,6 +849,7 @@ calc-formula-range-separator-fix.diff, n#556268, kohei
 SectionOwner => kohei
 
 # increase the row limit and make the row header a little wider.
+# Note: When up-streamed, remove evaluation-row-limit.diff
 calc-increase-row-limit.diff, n#443634, i#30215, kohei
 
 # check for last edited row when exporting automatic styles.
@@ -966,6 +967,8 @@ novell-subscription.diff, jholesov
 [ NovellEvaluation ]
 # enable the Subscription menu
 novell-subscription-enable-in-menu.diff
+# back to the up-stream row limit
+evaluation-row-limit.diff
 
 
 [ NotDebian ]
diff --git a/patches/dev300/evaluation-row-limit.diff b/patches/dev300/evaluation-row-limit.diff
new file mode 100644
index 0000000..a275bb3
--- /dev/null
+++ b/patches/dev300/evaluation-row-limit.diff
@@ -0,0 +1,26 @@
+diff --git sc/inc/address.hxx sc/inc/address.hxx
+index 76f0d42..af36690 100644
+--- sc/inc/address.hxx
++++ sc/inc/address.hxx
+@@ -86,7 +86,7 @@ const SCSIZE   SCSIZE_MAX   = ::std::numeric_limits<SCSIZE>::max();
+ 
+ // The maximum values. Defines are needed for preprocessor checks in
+ // bcaslot.cxx, otherwise type safe constants are preferred.
+-#define MAXROWCOUNT_DEFINE 1048576
++#define MAXROWCOUNT_DEFINE 65536
+ #define MAXCOLCOUNT_DEFINE 1024
+ 
+ // Count values
+diff --git sc/source/ui/view/hdrcont.cxx sc/source/ui/view/hdrcont.cxx
+index 3160bee..be36c2b 100644
+--- sc/source/ui/view/hdrcont.cxx
++++ sc/source/ui/view/hdrcont.cxx
+@@ -104,7 +104,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn
+ 
+ 	nWidth = nSmallWidth = aSize.Width();
+ 	nBigWidth = LogicToPixel( Size( GetTextWidth(
+-		String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888888")) ), 0 ) ).Width() + 5;
++		String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("88888")) ), 0 ) ).Width() + 4;
+ 
+ 	SetBackground();	// sonst Probleme auf OS/2 !?!?!
+ }
commit 71a3dec62e9a00c66cebb6a52574c67e791960a0
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Dec 21 14:37:26 2009 +0100

    Ability to share more up-stream sources using --with-git.
    
    --with-git now accepts a parameter which specifies a location of an already
    existing src/clone directory (up-stream clones).  This saves time and space
    when having more active braches.
    
    * bin/unpack: Implement locking so that we don't get broken sources.
    * configure.in: --with-git accepts the parameter.

diff --git a/bin/unpack b/bin/unpack
index eb4af07..1d7a4e7 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -276,18 +276,22 @@ else
     fi
     mkdir $OOBUILDDIR
     for pkg in $CORE_PKGS; do
-        tree=$SRCDIR/clone/$pkg
-        echo "* checking out $CVSTAG in $pkg..."
-        (
-            cd $tree
-            if git show $CVSTAG >/dev/null 2>&1 ; then
-                git checkout $CVSTAG || exit 1
-            else
-                git checkout -b $CVSTAG $GITTAG || exit 1
-            fi
-        ) || exit 1
-        echo "* copying it into place..."
-        rsync -a --exclude .git $tree/* $OOBUILDDIR/
+        export pkg
+        flock $SRCDIR/clone/$pkg-lock -c '
+            tree=$SRCDIR/clone/$pkg
+            echo "* checking out $CVSTAG in $pkg..."
+            (
+                cd $tree
+                if git show $CVSTAG >/dev/null 2>&1 ; then
+                    git checkout $CVSTAG || exit 1
+                else
+                    git checkout -b $CVSTAG $GITTAG || exit 1
+                fi
+            ) || exit 1
+            echo "* copying it into place..."
+            rsync -a --exclude .git $tree/* $OOBUILDDIR/
+        '
+        unset pkg
     done
 fi
 
diff --git a/configure.in b/configure.in
index d33978e..c12845a 100644
--- a/configure.in
+++ b/configure.in
@@ -1433,7 +1433,16 @@ if test \( -z "$with_git" -a -f "$SRCDIR/$CVSTAG-bootstrap.tar.bz2" \) -o "$with
     AC_MSG_RESULT([no])
 else
     OOO_GIT="git://anongit.freedesktop.org/git/ooo-build"
-    AC_MSG_RESULT([$OOO_GIT])
+    RESULT="Clone from $OOO_GIT"
+    if test -e "src/clone" ; then
+        RESULT="src/clone already set up"
+    else
+        if test -d "$with_git" ; then
+            RESULT="Reusing trees located here: $with_git"
+            ln -s "$with_git" src/clone || AC_MSG_ERROR([Cannot ln -s $with_git src/clone])
+        fi
+    fi
+    AC_MSG_RESULT([$RESULT])
 fi
 AC_SUBST(OOO_GIT)