[ooo-build-commit] 2 commits - distro-configs/CrossWin32.conf.in patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Jan 13 01:57:02 PST 2010
distro-configs/CrossWin32.conf.in | 4 -
patches/dev300/apply | 34 ++++++-----
patches/dev300/crosswin32-config_office-cross.diff | 12 ----
patches/dev300/crosswin32-sal-cross.diff | 2
patches/dev300/crosswin32-sal-mingw-c.diff | 43 ---------------
patches/dev300/crosswin32-sal-mingw.diff | 11 ---
patches/dev300/win32-pdfimport-assume-no-encryption.diff | 12 ++++
7 files changed, 33 insertions(+), 85 deletions(-)
New commits:
commit a2447d9ec394b78444520b039b2b09d7907b66fc
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Wed Jan 13 10:51:33 2010 +0100
Assume no encryption of pdf files (works around bnc#569319)
* patches/dev300/apply:
* patches/dev300/win32-pdfimport-assume-no-encryption.diff: Because of some
locking issued the encryption test always determines that a PDF file is
encrypted. Before we really understand the underlying locking issue, disable
the encryption test for win32 and assume that the files are not encrypted.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7d87354..68be337 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3268,6 +3268,8 @@ boost-1.39-extra-header.diff, kohei
[ Win32Only ]
win32-boost-crack.diff
+win32-pdfimport-assume-no-encryption.diff, n#569319, fridrich
+
[ NovellOnly ]
# remove Macro Recorder from UI since it is borked by design
basctl-no-macro-recorder-in-ui.diff, fridrich
diff --git a/patches/dev300/win32-pdfimport-assume-no-encryption.diff b/patches/dev300/win32-pdfimport-assume-no-encryption.diff
new file mode 100644
index 0000000..1155483
--- /dev/null
+++ b/patches/dev300/win32-pdfimport-assume-no-encryption.diff
@@ -0,0 +1,12 @@
+--- sdext/source/pdfimport/wrapper/wrapper.cxx 2010-01-13 10:39:42.000000000 +0100
++++ sdext/source/pdfimport/wrapper/wrapper.cxx 2010-01-13 10:41:01.000000000 +0100
+@@ -827,6 +827,9 @@
+ bool& o_rIsEncrypted
+ )
+ {
++ // Ugly temporary workaround to some file-locking
++ return true;
++
+ bool bSuccess = false;
+ rtl::OString aPDFFile;
+ aPDFFile = rtl::OUStringToOString( i_rPath, osl_getThreadTextEncoding() );
commit b6b4b5f31e6c7d971c2b81cf7ad2dc2e800687be
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Tue Jan 12 11:51:06 2010 +0100
Commit some cross-compile patches
* distro-configs/CrossWin32.conf.in:
* patches/dev300/apply:
* patches/dev300/crosswin32-config_office-cross.diff:
* patches/dev300/crosswin32-sal-cross.diff:
* patches/dev300/crosswin32-sal-mingw-c.diff:
* patches/dev300/crosswin32-sal-mingw.diff:
diff --git a/distro-configs/CrossWin32.conf.in b/distro-configs/CrossWin32.conf.in
index f435bcf..3c2e8c9 100644
--- a/distro-configs/CrossWin32.conf.in
+++ b/distro-configs/CrossWin32.conf.in
@@ -16,7 +16,7 @@
--disable-ldap
--disable-mozilla
--with-system-mozilla=no
---with-tools-dir=/home/jesus/soltools
+--with-tools-dir=/home/fstrba/soltools
--with-system-icu
--with-system-expat
--with-system-db
@@ -29,4 +29,4 @@
--with-system-cairo
--with-system-libwpd
--with-system-libwpg
---with-system-libwps
\ No newline at end of file
+--with-system-libwps
diff --git a/patches/dev300/apply b/patches/dev300/apply
index af58049..7d87354 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3392,40 +3392,40 @@ crosswin32-funit-char-line.diff
#crosswin32-goodies-mingw.diff
#crosswin32-helpcontent2-mingw.diff
crosswin32-hyphen-mingw.diff
-crosswin32-i18npool-cross.diff
+#crosswin32-i18npool-cross.diff
crosswin32-i18npool-mingw.diff
-crosswin32-icc-cross.diff
+#crosswin32-icc-cross.diff
crosswin32-instsetoo_native-mingw.diff
crosswin32-lingucomponent-mingw.diff
crosswin32-o3tl-no-cppunit.diff
-crosswin32-unixodbc-disable.diff
-crosswin32-odk-cross.diff
+#crosswin32-unixodbc-disable.diff
+#crosswin32-odk-cross.diff
crosswin32-postprocess-mingw.diff
-crosswin32-pyuno-mingw.diff
+#crosswin32-pyuno-mingw.diff
crosswin32-sal-cross.diff
crosswin32-sal-mingw-c.diff
crosswin32-sal-mingw.diff
crosswin32-sccomp-mingw.diff
-crosswin32-scp2-mingw.diff
+#crosswin32-scp2-mingw.diff
crosswin32-setup_native-mingw.diff
-crosswin32-shell-mingw.diff
-crosswin32-solenv-cross.diff
-crosswin32-solenv-mingw-installer.diff
-crosswin32-solenv-mingw.diff
-crosswin32-solenv-mingw-res.diff
+#crosswin32-shell-mingw.diff
+#crosswin32-solenv-cross.diff
+#crosswin32-solenv-mingw-installer.diff
+#crosswin32-solenv-mingw.diff
+#crosswin32-solenv-mingw-res.diff
crosswin32-solenv.diff
-crosswin32-soltools-cross.diff
-crosswin32-store-core.diff
+#crosswin32-soltools-cross.diff
+#crosswin32-store-core.diff
crosswin32-store-registry.diff
-crosswin32-svx-mingw.diff
+#crosswin32-svx-mingw.diff
crosswin32-sysui-mingw.diff
crosswin32-tools-mingw.diff
crosswin32-trans-mingw.diff
crosswin32-unotools-mingw.diff
-crosswin32-vcl-mingw.diff
+#crosswin32-vcl-mingw.diff
crosswin32-writerperfect-cross.diff
# things to fix later
-crosswin32-ugly-hacks.diff
+#crosswin32-ugly-hacks.diff
[ Misc ]
diff --git a/patches/dev300/crosswin32-config_office-cross.diff b/patches/dev300/crosswin32-config_office-cross.diff
index be08f3f..32f2f2b 100644
--- a/patches/dev300/crosswin32-config_office-cross.diff
+++ b/patches/dev300/crosswin32-config_office-cross.diff
@@ -179,18 +179,6 @@
cd "$SRC_ROOT/config_office/guw" || exit
--- set_soenv.in.orig 2008-10-20 19:52:27.000000000 +0200
+++ set_soenv.in 2008-10-20 21:38:02.000000000 +0200
-@@ -1194,7 +1210,10 @@ if ($platform =~ m/cygwin|os2/)
- if ($platform =~ m/linux|netbsd|odf1|irix|freebsd|aix|solaris/)
- { $PATH = $cur_dir.
- # $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
-- $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
-+ if ("@CROSS_COMPILING@" == "yes") {
-+ $PATH .= $ps.'@TOOLS_DIR@';
-+ }
-+ $PATH .= $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
- $ps.'$SOLARENV'.$BIN;
-
- if ($platform =~ m/solaris/) {
@@ -1847,6 +1847,20 @@ ToFile( "SOLAR_JAVA", $SOLAR_JAVA
ToFile( "BIG_SVX", $BIG_SVX, "e" );
ToFile( "COM", $COM, "e" );
diff --git a/patches/dev300/crosswin32-sal-cross.diff b/patches/dev300/crosswin32-sal-cross.diff
index e305986..f3b9146 100644
--- a/patches/dev300/crosswin32-sal-cross.diff
+++ b/patches/dev300/crosswin32-sal-cross.diff
@@ -12,5 +12,5 @@
+.ENDIF # "$(CROSS_COMPILING)" == "yes"
+
+$(BOOTSTRAPMK) : $(GEN_MAKEFILE)
- $< > $@
+ $(AUGMENT_LIBRARY_PATH) $< > $@
diff --git a/patches/dev300/crosswin32-sal-mingw-c.diff b/patches/dev300/crosswin32-sal-mingw-c.diff
index 83738ce..239ec8c 100644
--- a/patches/dev300/crosswin32-sal-mingw-c.diff
+++ b/patches/dev300/crosswin32-sal-mingw-c.diff
@@ -1,17 +1,3 @@
---- sal/osl/w32/conditn.c.~1.7.46.1.~ 2008-08-21 17:30:55.000000000 +0200
-+++ sal/osl/w32/conditn.c 2008-10-21 20:51:52.000000000 +0200
-@@ -108,7 +108,11 @@
- {
- /* Only wake up if a SendMessage call to the threads message loop is detected */
-
-+#ifndef __MINGW32__
- switch( MsgWaitForMultipleObjects( 1, &(HANDLE)Condition, FALSE, timeout, QS_SENDMESSAGE ) )
-+#else /* __MINGW32__ */
-+ switch( MsgWaitForMultipleObjects( 1, (HANDLE)Condition, FALSE, timeout, QS_SENDMESSAGE ) )
-+#endif /* __MINGW32__ */
- {
- case WAIT_OBJECT_0 + 1:
- {
--- sal/osl/w32/dllentry.c.~1.34.~ 2008-04-10 13:17:16.000000000 +0200
+++ sal/osl/w32/dllentry.c 2008-10-21 20:56:07.000000000 +0200
@@ -216,7 +216,9 @@
@@ -242,32 +228,3 @@ diff -purN sal/systools/win32/uwinapi/FindNextVolumeA.cpp sal/systools/win32/uwi
#endif
#else
// winsock2.h includes windows.h
---- sal/osl/w32/file.cxx.orig 2009-08-10 19:05:30.000000000 +0200
-+++ sal/osl/w32/file.cxx 2009-08-10 19:08:35.000000000 +0200
-@@ -1453,7 +1453,7 @@
- void parse_UNC_path(const sal_Unicode* path, UNCComponents* puncc)
- {
- OSL_PRECOND(is_UNC_path(path), "Precondition violated: No UNC path");
-- OSL_PRECOND(!wcschr(path, SLASH), "Path must not contain slashes");
-+ OSL_PRECOND(!wcschr((const wchar_t*)path, SLASH), "Path must not contain slashes");
-
- const sal_Unicode* pend = path + rtl_ustr_getLength(path);
- const sal_Unicode* ppos = path + 2;
-@@ -1573,7 +1573,7 @@
- e.g. 'c:\' or '\\Share' have no more parents */
- int path_make_parent(sal_Unicode* path)
- {
-- OSL_PRECOND(!wcschr(path, SLASH), "Path must not contain slashes");
-+ OSL_PRECOND(!wcschr((const wchar_t*)path, SLASH), "Path must not contain slashes");
- OSL_PRECOND(has_path_parent(path), "Path must have a parent");
-
- sal_Unicode* pos_last_backslash = path + rtl_ustr_lastIndexOfChar(path, BACKSLASH);
-@@ -1826,7 +1826,7 @@
- oslDirectoryCreationCallbackFunc aDirectoryCreationCallbackFunc,
- void* pData)
- {
-- OSL_PRECOND(wcslen(dir_path) > 0 && (wcsrchr(dir_path, BACKSLASH) != (dir_path + (wcslen(dir_path) - 1))), \
-+ OSL_PRECOND(wcslen((const wchar_t*)dir_path) > 0 && (wcsrchr((const wchar_t*)dir_path, BACKSLASH) != ((const wchar_t*)dir_path + (wcslen((const wchar_t*)dir_path) - 1))), \
- "Path must not end with a backslash");
-
- DWORD w32_error = create_dir_with_callback(
diff --git a/patches/dev300/crosswin32-sal-mingw.diff b/patches/dev300/crosswin32-sal-mingw.diff
index 8fbcda5..653c4cd 100644
--- a/patches/dev300/crosswin32-sal-mingw.diff
+++ b/patches/dev300/crosswin32-sal-mingw.diff
@@ -76,17 +76,6 @@
#endif
// Globally disable "warning C4100: unreferenced formal parameter" caused by
---- sal/osl/w32/file.cxx.orig 2008-08-06 17:36:23.000000000 +0200
-+++ sal/osl/w32/file.cxx 2008-10-21 20:53:48.000000000 +0200
-@@ -34,7 +34,7 @@
- #define UNICODE
- #define _UNICODE
- #define _WIN32_WINNT 0x0500
--#include "systools\win32\uwinapi.h"
-+#include "systools/win32/uwinapi.h"
-
- #include "path_helper.hxx"
-
--- sal/inc/sal/mathconf.h.~1.6.~ 2008-04-10 12:47:09.000000000 +0200
+++ sal/inc/sal/mathconf.h 2008-04-10 12:47:24.000000000 +0200
@@ -53,7 +53,7 @@
More information about the ooo-build-commit
mailing list