[Libreoffice-commits] .: 41 commits - graphite/graphite-2.3.1_debug.patch libxml2/libxml2-long-path.patch libxml2/makefile.mk moz/prj python/prj
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Mar 23 09:25:59 PDT 2011
graphite/graphite-2.3.1_debug.patch | 13 +++++++++++++
libxml2/libxml2-long-path.patch | 34 ++++++++++++++++++++++++++++++++++
libxml2/makefile.mk | 4 ++++
moz/prj/d.lst | 19 ++++++++++++++++++-
python/prj/d.lst | 6 ------
5 files changed, 69 insertions(+), 7 deletions(-)
New commits:
commit ccb82324365d308cfc66aac4b9989a3bf55684e1
Merge: c230986... 208cca8...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 23 17:13:43 2011 +0100
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-extern-sys
commit c23098607d423f99fefe0f5f452a0349f1b40fd3
Merge: 7d81d14... 8802183...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Mar 23 16:59:29 2011 +0100
Merge commit 'ooo/DEV300_m103'
Conflicts:
graphite/makefile.mk
libxml2/makefile.mk
diff --cc libxml2/makefile.mk
index 3cf7988,6fd231f..9e69e67
mode 100644,100755..100755
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@@ -53,9 -53,11 +53,13 @@@ PATCH_FILES=libxml2-configure.patch
libxml2-gnome599717.patch \
libxml2-xpath.patch \
libxml2-global-symbols.patch \
+ libxml2-aix.patch \
+ libxml2-vc10.patch
+ .IF "$(OS)" == "WNT"
+ PATCH_FILES+= libxml2-long-path.patch
+ .ENDIF
+
# This is only for UNX environment now
.IF "$(OS)"=="WNT"
commit 8802183d217a567fdb2b342dc26ae4064d827a20
Merge: 339dd0c... bff599c...
Author: obo <obo at openoffice.org>
Date: Wed Mar 16 10:11:17 2011 +0100
CWS-TOOLING: integrate CWS jl164
commit 339dd0c40ae730efea2a325d11fe210bb5538300
Merge: 57e87b3... 229e1ba...
Author: obo <obo at openoffice.org>
Date: Wed Mar 16 10:01:17 2011 +0100
CWS-TOOLING: integrate CWS sb142
commit 57e87b38480b2c237e004dbc54868928d8313f72
Merge: 010a675... b8d51ee...
Author: obo <obo at openoffice.org>
Date: Wed Mar 16 08:29:30 2011 +0100
CWS-TOOLING: integrate CWS debuglevels
commit b8d51eedd958a78327a2b824b2f5edb0be951242
Merge: 3026f38... 010a675...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 09:47:56 2011 +0100
debuglevels: pulled and merged DEV300.m102
commit 010a67596ed90cf02b91a7cb0a86d475ecfba591
Merge: fed60e3... 5826738...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Mar 7 13:55:23 2011 +0100
CWS-TOOLING: integrate CWS vcl119
commit 229e1ba6e63e50ee9ff86991331300b6c01f992a
Author: sb <sb at openoffice.org>
Date: Fri Mar 4 14:29:58 2011 +0100
sb142: #i116738# ignore test stuff from the Python implementation
diff --git a/python/prj/d.lst b/python/prj/d.lst
index def1bb8..e5c4d5b 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -3,9 +3,6 @@ mkdir: %_DEST%\lib%_EXT%\python\lib-old
mkdir: %_DEST%\lib%_EXT%\python\lib-tk
mkdir: %_DEST%\lib%_EXT%\python\site-packages
mkdir: %_DEST%\lib%_EXT%\python\encodings
-mkdir: %_DEST%\lib%_EXT%\python\test
-mkdir: %_DEST%\lib%_EXT%\python\test\output
-mkdir: %_DEST%\lib%_EXT%\python\test\data
mkdir: %_DEST%\lib%_EXT%\python\email
mkdir: %_DEST%\lib%_EXT%\python\email\mime
mkdir: %_DEST%\lib%_EXT%\python\compiler
@@ -38,9 +35,6 @@ mkdir: %_DEST%\lib%_EXT%\python\ctypes\macholib
..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\* %_DEST%\lib%_EXT%\python\test\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\output\* %_DEST%\lib%_EXT%\python\test\output\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\data\* %_DEST%\lib%_EXT%\python\test\data\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*
commit fed60e3dc84e03000289af78b565020df8d87e95
Merge: 3becf2c... 2daa586...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Mar 2 12:10:39 2011 +0100
CWS-TOOLING: integrate CWS mhu21
commit bff599c3dd01dffe58f60133461838e2a8bdab5c
Author: Joachim Lingner <jl at openoffice.org>
Date: Thu Feb 24 15:28:48 2011 +0100
jl164 #i109096# libxml2 fails when using long paths on windows
diff --git a/libxml2/libxml2-long-path.patch b/libxml2/libxml2-long-path.patch
new file mode 100644
index 0000000..bd888d9
--- /dev/null
+++ b/libxml2/libxml2-long-path.patch
@@ -0,0 +1,34 @@
+--- misc/libxml2-2.7.6/uri.c 2009-10-02 17:28:55.000000000 +0200
++++ misc/build/libxml2-2.7.6/uri.c 2011-02-24 13:47:19.349299000 +0100
+@@ -2479,7 +2479,16 @@
+ if (path == NULL)
+ return(NULL);
+
+- /* sanitize filename starting with // so it can be used as URI */
++#if defined(_WIN32)
++ //We must not change the backslashes to slashes if the the path starts with
++ // \\?\
++ //Those pathes can be up to 32k characters long.
++ len = xmlStrlen(path);
++ if ((len > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') )
++ return xmlStrdup((const xmlChar *) path);
++#endif
++
++ /* sanitize filename starting with // so it can be used as URI */
+ if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/'))
+ path++;
+
+--- misc/libxml2-2.7.6/xmlIO.c 2009-09-24 17:32:00.000000000 +0200
++++ misc/build/libxml2-2.7.6/xmlIO.c 2011-02-24 13:47:26.163762000 +0100
+@@ -772,6 +772,11 @@
+
+ #ifdef HAVE_STAT
+ #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__)
++ //On Windows stat and wstat do not work with long pathname,
++ //which start with '\\?\'
++ if ((xmlStrlen(path) > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') )
++ return 1;
++
+ if (xmlWrapStat(path, &stat_buffer) == -1)
+ return 0;
+ #else
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
old mode 100644
new mode 100755
index 20a22e4..6fd231f
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -54,6 +54,9 @@ PATCH_FILES=libxml2-configure.patch \
libxml2-xpath.patch \
libxml2-global-symbols.patch \
+.IF "$(OS)" == "WNT"
+PATCH_FILES+= libxml2-long-path.patch
+.ENDIF
# This is only for UNX environment now
commit 2daa586a55b19a5e3c301e4a4f793af985d08287
Merge: 5ec7762... 3becf2c...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Wed Feb 23 21:03:15 2011 +0100
Update from master repository (DEV300_m100).
commit 582673872cb065e796086bdba113a6ed7e10592e
Merge: dc4821f... 3becf2c...
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Wed Feb 23 16:37:27 2011 +0100
vcl119: rebase to DEV300_m101
commit 3026f38a1231d01b162fe49de59c48d6a7ab209e
Merge: 31d4640... 3becf2c...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Feb 23 09:58:44 2011 +0100
debuglevels: merged to-be-m101
commit dc4821f73d2780d87f711d4b63aa86a8e48586ee
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Mon Feb 21 13:30:27 2011 +0100
vcl119: #i116227# remove an invalid assertion
diff --git a/graphite/graphite-2.3.1_debug.patch b/graphite/graphite-2.3.1_debug.patch
new file mode 100644
index 0000000..583fac7
--- /dev/null
+++ b/graphite/graphite-2.3.1_debug.patch
@@ -0,0 +1,13 @@
+--- misc/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2008-08-21 16:24:32.000000000 +0200
++++ misc/build/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2011-02-21 13:22:23.159834368 +0100
+@@ -247,7 +247,9 @@
+ GlyphSetIterator::reference GlyphSetIterator::operator*() const
+ {
+ assert(m_pseg != 0);
+- assert(m_vit != std::vector<int>::const_iterator());
++ // #i116227# the check below is well meant but breaks itself when using stlport with debug facilities
++ // a valid iterator cannot be compared to an empty one in that case
++ // assert(m_vit != std::vector<int>::const_iterator());
+ // in the case of a non-contiguous list
+ return m_pseg->m_prgginf[(*m_vit) - m_pseg->m_isloutGinf0];
+ }
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index b9ecb7a..f443490 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -47,7 +47,7 @@ all:
.IF "$(ENABLE_GRAPHITE)"=="TRUE"
TARFILE_NAME=silgraphite-2.3.1
TARFILE_MD5=d35724900f6a4105550293686688bbb3
-PATCH_FILES=graphite-2.3.1.patch
+PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch
# convert line-endings to avoid problems when patching
CONVERTFILES=\
commit 5ec776208c3a15ecdbe7945129fb9c30d98c969d
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Fri Feb 18 16:23:50 2011 +0100
#i115784# moz/d.lst: deliver windows libs, too.
diff --git a/moz/prj/d.lst b/moz/prj/d.lst
index df08e6b..67bd28b 100644
--- a/moz/prj/d.lst
+++ b/moz/prj/d.lst
@@ -248,7 +248,8 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT%
..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT%
..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
mkdir: %_DEST%\lib%_EXT%\sqlite
..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite
commit dd40732a86d32f6a2e1d3b577cbc3b67254514a8
Merge: 5a6d007... 35dcee7...
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Wed Feb 16 15:57:58 2011 +0100
rebase to DEV300_m100
commit 31d464016950a995a90c46e5540b79abb1d9bccc
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Feb 7 10:20:10 2011 +0100
debuglevels: #i116839#
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index b9ecb7a..3721fda 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -71,7 +71,7 @@ VCNUM=8
# make use of stlport headerfiles
EXT_USE_STLPORT=TRUE
BUILD_ACTION=nmake VERBOSE=1
-.IF "$(debug)"=="true"
+.IF "x$(debug)"!="x"
BUILD_FLAGS= "CFG=DEBUG"
CFLAGSWITHPATH= $(CFLAGS:s!-Fd.!-Fd../../../../../!)
.ELSE
@@ -90,7 +90,7 @@ BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll
.IF "$(COM)"=="GCC"
# Does linux want --disable-shared?
-.IF "$(debug)"=="true"
+.IF "x$(debug)"!="x"
GR_CONFIGURE_FLAGS= --enable-debug=yes --disable-final --enable-static --disable-shared
.ELSE
GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared
@@ -123,7 +123,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
.IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
#OUT2LIB=win32$/bin.msvc$/*.lib
-.IF "$(debug)"=="true"
+.IF "x$(debug)"!="x"
OUT2LIB=engine$/debug$/*.lib
.ELSE
OUT2LIB=engine$/release$/*.lib
@@ -141,7 +141,7 @@ OUT2LIB+=src$/.libs$/libgraphite.*.dylib
.ELSE
.IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
#OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll
-.IF "$(debug)"=="true"
+.IF "x$(debug)"!="x"
OUT2BIN= \
# engine$/debug$/*.dll \
engine$/debug$/*.pdb
commit c73140d4bc26f0a4be36b1d1a43eb1cac0716f04
Merge: 5f0cef9... 9462bdd...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Thu Jan 27 18:55:41 2011 +0100
Update from sibling repository.
commit 5f0cef92db92c880c5f55164abe0ee2b0aa93e59
Merge: 015b5ef... 5a6d007...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Thu Jan 27 18:16:28 2011 +0100
Update from master repository (DEV300_m98).
diff --cc dictionaries/da_DK/desc_da_DK.txt
index 18543da,201626b..201626b
mode 100755,100644..100755
--- a/dictionaries/da_DK/desc_da_DK.txt
+++ b/dictionaries/da_DK/desc_da_DK.txt
diff --cc dictionaries/da_DK/desc_en_US.txt
index 50e860d,45e5575..45e5575
mode 100755,100644..100755
--- a/dictionaries/da_DK/desc_en_US.txt
+++ b/dictionaries/da_DK/desc_en_US.txt
diff --cc dictionaries/da_DK/description.xml
index 1be6802,99f1a31..99f1a31
mode 100755,100644..100755
--- a/dictionaries/da_DK/description.xml
+++ b/dictionaries/da_DK/description.xml
diff --cc dictionaries/da_DK/manifest.xml
index ec4defc,0b9d18a..0b9d18a
mode 100755,100644..100755
--- a/dictionaries/da_DK/manifest.xml
+++ b/dictionaries/da_DK/manifest.xml
diff --cc dictionaries/hu_HU/description.xml
index e17a0a1,c2cd1e0..c2cd1e0
mode 100755,100644..100755
--- a/dictionaries/hu_HU/description.xml
+++ b/dictionaries/hu_HU/description.xml
diff --cc dictionaries/it_IT/description.xml
index e2fa660,bb4ee61..bb4ee61
mode 100755,100644..100755
--- a/dictionaries/it_IT/description.xml
+++ b/dictionaries/it_IT/description.xml
diff --cc dictionaries/it_IT/dictionaries.xcu
index 04fda90,cd41bce..cd41bce
mode 100755,100644..100755
--- a/dictionaries/it_IT/dictionaries.xcu
+++ b/dictionaries/it_IT/dictionaries.xcu
diff --cc dictionaries/nl_NL/description.xml
index 4fdf1e2,16ebde6..16ebde6
mode 100755,100644..100755
--- a/dictionaries/nl_NL/description.xml
+++ b/dictionaries/nl_NL/description.xml
diff --cc dictionaries/nl_NL/dictionaries.xcu
index b463e58,156d826..156d826
mode 100755,100644..100755
--- a/dictionaries/nl_NL/dictionaries.xcu
+++ b/dictionaries/nl_NL/dictionaries.xcu
diff --cc dictionaries/nl_NL/manifest.xml
index 05bd316,f54199b..f54199b
mode 100755,100644..100755
--- a/dictionaries/nl_NL/manifest.xml
+++ b/dictionaries/nl_NL/manifest.xml
diff --cc dictionaries/sk_SK/description.xml
index 135cc2c,30ba355..30ba355
mode 100755,100644..100755
--- a/dictionaries/sk_SK/description.xml
+++ b/dictionaries/sk_SK/description.xml
diff --cc dictionaries/sl_SI/description.xml
index d6ea48f,0dd4fc0..0dd4fc0
mode 100755,100644..100755
--- a/dictionaries/sl_SI/description.xml
+++ b/dictionaries/sl_SI/description.xml
diff --cc dictionaries/sr/description.xml
index dda9580,18d461a..18d461a
mode 100755,100644..100755
--- a/dictionaries/sr/description.xml
+++ b/dictionaries/sr/description.xml
diff --cc dictionaries/sr/makefile.mk
index cac1c71,4301a5c..4301a5c
mode 100755,100644..100755
--- a/dictionaries/sr/makefile.mk
+++ b/dictionaries/sr/makefile.mk
diff --cc dictionaries/sr/sh.aff
index 6603d3a,9c1326c..9c1326c
mode 100755,100644..100755
--- a/dictionaries/sr/sh.aff
+++ b/dictionaries/sr/sh.aff
diff --cc dictionaries/sr/sr.aff
index e6c2dcd,ce9334e..ce9334e
mode 100755,100644..100755
--- a/dictionaries/sr/sr.aff
+++ b/dictionaries/sr/sr.aff
diff --cc dictionaries/sv_SE/LICENSE_en_US.txt
index 247afe1,7a3fd88..7a3fd88
mode 100755,100644..100755
--- a/dictionaries/sv_SE/LICENSE_en_US.txt
+++ b/dictionaries/sv_SE/LICENSE_en_US.txt
diff --cc dictionaries/sv_SE/LICENSE_sv_SE.txt
index 591ccbb,eb513a7..eb513a7
mode 100755,100644..100755
--- a/dictionaries/sv_SE/LICENSE_sv_SE.txt
+++ b/dictionaries/sv_SE/LICENSE_sv_SE.txt
diff --cc dictionaries/sv_SE/dictionaries.xcu
index ea9213e,a56c588..a56c588
mode 100755,100644..100755
--- a/dictionaries/sv_SE/dictionaries.xcu
+++ b/dictionaries/sv_SE/dictionaries.xcu
diff --cc dictionaries/vi/LICENSES-en.txt
index c1e0fc9,7a04f8c..7a04f8c
mode 100755,100644..100755
--- a/dictionaries/vi/LICENSES-en.txt
+++ b/dictionaries/vi/LICENSES-en.txt
diff --cc dictionaries/vi/description.xml
index a18c3a8,ebf6ebc..ebf6ebc
mode 100755,100644..100755
--- a/dictionaries/vi/description.xml
+++ b/dictionaries/vi/description.xml
diff --cc dictionaries/vi/dictionaries.xcu
index 45e2e1b,362f4d9..362f4d9
mode 100755,100644..100755
--- a/dictionaries/vi/dictionaries.xcu
+++ b/dictionaries/vi/dictionaries.xcu
diff --cc dictionaries/vi/makefile.mk
index 049c54a,bbca9e8..bbca9e8
mode 100755,100644..100755
--- a/dictionaries/vi/makefile.mk
+++ b/dictionaries/vi/makefile.mk
diff --cc dictionaries/vi/vi_VN.aff
index 7186491,fd69df8..fd69df8
mode 100755,100644..100755
--- a/dictionaries/vi/vi_VN.aff
+++ b/dictionaries/vi/vi_VN.aff
diff --cc dictionaries/vi/vi_VN.dic
index e3ffa0f,d9395e9..d9395e9
mode 100755,100644..100755
--- a/dictionaries/vi/vi_VN.dic
+++ b/dictionaries/vi/vi_VN.dic
diff --cc libxml2/libxml2-mingw.patch
index d160dcb,651b0c1..651b0c1
mode 100755,100644..100755
--- a/libxml2/libxml2-mingw.patch
+++ b/libxml2/libxml2-mingw.patch
commit 9462bddc9c09e62ac2e41f59145b8123f702def3
Merge: 37c25af... 5a6d007...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Mon Jan 24 16:50:44 2011 +0100
Update from master repository (DEV300_m98).
commit 37c25afdfa426509a39c455d6d6f951779536873
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Mon Dec 13 12:24:22 2010 +0100
Better workaround for multiple sqlite conflict (see module nss/prj/d.lst).
diff --git a/moz/prj/d.lst b/moz/prj/d.lst
index 2ecfab5..df08e6b 100644
--- a/moz/prj/d.lst
+++ b/moz/prj/d.lst
@@ -237,7 +237,20 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib
..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
+..\%__SRC%\lib\libldap50.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmozjs.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmozz.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libprldap50.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%
+
mkdir: %_DEST%\lib%_EXT%\sqlite
-..\%__SRC%\lib\libsqlite3* %_DEST%\lib%_EXT%\sqlite
-..\%__SRC%\lib\* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite
+
..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT%
commit 795859143e25090c47e9e1491a27dc9311fac11b
Merge: 57b1971... 83b3b04...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Mon Dec 13 11:06:14 2010 +0100
Update from master repository (DEV300_m95).
diff --cc libxml2/libxml2-mingw.patch
index d160dcb,651b0c1..651b0c1
mode 100755,100644..100755
--- a/libxml2/libxml2-mingw.patch
+++ b/libxml2/libxml2-mingw.patch
commit 015b5ef7f54d14d65dc2f2d7e4f839c5f9bbc722
Merge: 7ba9f9b... 57b1971...
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Thu Nov 25 18:25:48 2010 +0100
Update from sibling repository.
commit 57b1971c3b73acfb88d7082f523f6dda02d42d96
Author: Matthias Huetsch [mhu] <matthias.huetsch at oracle.com>
Date: Mon Nov 8 18:51:50 2010 +0100
Workaround multiple sqlite conflict.
diff --git a/moz/prj/d.lst b/moz/prj/d.lst
index dda8503..2ecfab5 100644
--- a/moz/prj/d.lst
+++ b/moz/prj/d.lst
@@ -236,5 +236,8 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
..\%__SRC%\inc\xpnet\* %_DEST%\inc%_EXT%\mozilla\xpnet
..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib
..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
+
+mkdir: %_DEST%\lib%_EXT%\sqlite
+..\%__SRC%\lib\libsqlite3* %_DEST%\lib%_EXT%\sqlite
..\%__SRC%\lib\* %_DEST%\lib%_EXT%
..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT%
commit 0cae88c91366b6cc7f7689f00c83c0bacca0f18c
Merge: 80b3d41... c1ae9ef...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Fri Jun 25 16:25:27 2010 +0200
Update from master repository (DEV300_m83).
commit 80b3d41a1d2a7587b54fd49e695a38a0879d9716
Merge: 2660e5d... eea9317...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Jun 14 10:57:59 2010 +0200
Update from master repository (DEV300_m82).
commit 2660e5d1cc8f555b737607f0d73fec577a535634
Merge: f735835... 14e45db...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Wed Jun 9 08:39:08 2010 +0200
Update from master repository (DEV300_m81).
commit f735835cd420a0c6031c310e466f14bd7b23ad4d
Merge: 44b5cb4... fc2a73b...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Tue Jun 1 16:49:19 2010 +0200
Update from master repository (DEV300_m80).
commit 44b5cb4fecdce0331b4e69eb652f26b4758dfbe3
Merge: c18fd0b... b1348ab...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu May 27 11:57:25 2010 +0200
Update from master repository (DEV300_m79).
commit c18fd0b9c4ff1cd3a24f52994e9983d702cbdae8
Merge: fc1bcd2... 1359a1e...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu May 20 18:00:57 2010 +0200
Update from master repository (DEV300_m78).
diff --cc dictionaries/pl_PL/README_en.txt
index 578d03e,214db8b..214db8b
mode 100755,100644..100755
--- a/dictionaries/pl_PL/README_en.txt
+++ b/dictionaries/pl_PL/README_en.txt
commit fc1bcd2c468e1c47f56f2203952583159ec70aa0
Merge: 209fb84... 156b207...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu Apr 29 12:07:25 2010 +0200
Update from master repository (DEV300 masterfix).
commit 7ba9f9b999d1e8e0fc822bc0fd4593f1dccaeb02
Merge: c361291... 156b207...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu Apr 22 15:29:12 2010 +0200
Update from master repository (DEV300m77).
commit 209fb847f9d00909ac983cc188d507caea97f526
Merge: c361291... 5647bb3...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Fri Apr 9 16:11:26 2010 +0200
Update from master repository (DEV300_m76).
commit c361291d12c778bdec65904c958df15b7ca4717d
Merge: ef8f6bd... 0ed0241...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Mar 22 18:41:46 2010 +0100
Update from local repository.
commit 0ed0241f1568c6ac0fe2952125a1830995be7c1f
Merge: bf79019... 9728bdd...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Mar 22 17:02:50 2010 +0100
Update from master repository (DEV300_m75).
commit bf7901950ab11e19b7d3eee180247892216f34f9
Merge: 7fea8c6... 4865bb1...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Thu Jan 21 16:52:59 2010 +0100
Update from master repository (to m70).
commit ef8f6bdd5ea24451335c707d5d21bdd47b0a2ed1
Merge: c959264... 5138f5e...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Jan 11 14:29:32 2010 +0100
Update from master repository (to m69).
commit 7fea8c66f2af2ee7c54382cab6cbeca2d202f6c6
Merge: cd636a5... 5138f5e...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Fri Jan 8 18:08:02 2010 +0100
Update from master repository (to m69).
commit cd636a584fe5cfdf7cab0da96f28eba717923fbe
Merge: b98b362... e0fcfda...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Mon Jan 4 10:33:53 2010 +0100
Update from master repository (to m68).
commit b98b362a4200d6eef817a7b5229fd8b986ef86df
Merge: c959264... 3084c3c...
Author: Matthias Huetsch [mhu] <matthias.huetsch at sun.com>
Date: Wed Dec 9 19:54:38 2009 +0100
Update from master repository (to m67).
commit c959264f2323a429f22f28199a250a8caf392454
Merge: 0bb3f2b... f44d99c...
Author: Matthias Huetsch <matthias.huetsch at sun.com>
Date: Tue Nov 10 15:56:20 2009 +0100
Update from master repository to m64.
More information about the Libreoffice-commits
mailing list