[Libreoffice-commits] .: Branch 'tinderbox' - local_conf/Error_Parse.pm local_conf/TreeData.pm

[Thorsten Behrens]

 local_conf/Error_Parse.pm |    2 ++
 local_conf/TreeData.pm    |   12 ++++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit ede07a61018919b5332cc7d81148e55167238b37
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Dec 5 12:37:50 2012 +0100

    Update from live version: xcode error parser, new branches

diff --git a/local_conf/Error_Parse.pm b/local_conf/Error_Parse.pm
index 7f1f86e..211bea2 100644
--- a/local_conf/Error_Parse.pm
+++ b/local_conf/Error_Parse.pm
@@ -303,6 +303,8 @@ sub line_type {
 		     ($line =~ m#\.\./\.\./dist/include/xpcom_obsolete/nsFileStream\.h: In member function 'PRBool nsErrorProne::failed\(\) const':$#) ||
 		     # system-libs
 		     ($line =~ m#^Therefore the version provided here does not need to be built in addition\.#) ||
+                     # XCode 2.5
+		     ($line =~ m#ld: warning can't open dynamic library: \@loader_path/lib(glib|gmodule|gobject|gthread)-2\.0\.0\.dylib referenced from:.*\(checking for undefined symbols may be affected\)#) ||
 		     
                      0);
       
diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm
index e49ec0e..d30c7fb 100644
--- a/local_conf/TreeData.pm
+++ b/local_conf/TreeData.pm
@@ -231,6 +231,18 @@ $VERSION = '#tinder_version#';
                    branch => 'master',
                    VCS  => 'GIT',
                   },
+            'libreoffice-4-0' =>  {
+                   root => 'git://anongit.freedesktop.org/git/libreoffice/core',
+                   module => 'all',
+                   branch => 'libreoffice-4-0',
+                   VCS  => 'GIT',
+                  },
+            'libreoffice-3-6' =>  {
+                   root => 'git://anongit.freedesktop.org/git/libreoffice/core',
+                   module => 'all',
+                   branch => 'libreoffice-3-6',
+                   VCS  => 'GIT',
+                  },
             'libreoffice-3-5' =>  {
                    root => 'git://anongit.freedesktop.org/git/libreoffice/core',
                    module => 'all',