← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/dev300/crosswin32-dbaccess-mingw.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2009-08-13 16:30:00 UTC
  • mfrom: (1.1.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20090813163000-ck1d5pxexe0jg8p4
Tags: 1:3.1.1~rc1-1ubuntu1
* Copy of the openoffice.org source.
  - debian/changelog: Change source name.
  - debian/control.in: Change source name.
  - debian/control: Regenerate control file.

* Resynchronise with Debian (r1631). Remaining changes:
  - Add Launchpad integration support.
  - Add Launchpad translations support.
  - Add package openoffice.org-style-human.
  - Add some Ubuntu-specific bitmaps. Adjust broffice diversions for these.
  - Add support for compressing debs with lzma.
  - Add support for shared /usr/share/doc directories.
  - Add support to build l10n as a separate source.
  - Add support to build on lpia.
  - Add support to turn off building on sparc.
  - Add Xb-Npp-xxx tags according to "firefox distro add-on suport" spec.
  - Use imagemagick instead of graphicsmagick.
  - openoffice.org-help switch to internal copy of lucene.
  - Disable gnome-vfs support since it is buggy.
  - Switch desktop files from %U to %F for gvfs fuse.
* Resynchronise with ooo-build-3-1-1 (7b03695ba14f142cfde58b4592af50cd60e3e787).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/dev300/crosswin32-dbaccess-mingw.diff
 
1
--- dbaccess/source/ui/dlg/makefile.mk.pristine 2008-04-10 16:59:00.000000000 +0200
 
2
+++ dbaccess/source/ui/dlg/makefile.mk  2009-02-16 15:51:44.000000000 +0100
 
3
@@ -131,7 +131,7 @@ SLOFILES=                                                           \
 
4
                $(SLO)$/dlgsize.obj                             \
 
5
                $(SLO)$/dlgattr.obj 
 
6
 
 
7
-.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"==""
 
8
+.IF ("$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="") || "$(TARGET_OS)" == "MinGW"
 
9
 DISABLE_ADO=TRUE
 
10
 .ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"==""
 
11
 
 
12
--- dbaccess/source/ui/dlg/odbcconfig.cxx.~2~   2008-11-05 10:14:38.000000000 +0100
 
13
+++ dbaccess/source/ui/dlg/odbcconfig.cxx       2008-11-04 17:22:07.000000000 +0100
 
14
@@ -31,6 +31,15 @@
 
15
 // MARKER(update_precomp.py): autogen include statement, do not remove
 
16
 #include "precompiled_dbaccess.hxx"
 
17
 
 
18
+#ifdef __MINGW32__
 
19
+#define Rectangle W32_Rectangle
 
20
+#include <windows.h>
 
21
+#define SDB_ODBC_CHAR SQLCHAR
 
22
+#include <odbcinst.h>
 
23
+#include <sqlext.h>
 
24
+#undef Yield
 
25
+#endif /* __MINGW32__ */
 
26
+
 
27
 #ifndef _DBAUI_ODBC_CONFIG_HXX_
 
28
 #include "odbcconfig.hxx"
 
29
 #endif
 
30
@@ -52,6 +61,9 @@
 
31
 #ifndef _TOOLS_DEBUG_HXX
 
32
 #include <tools/debug.hxx>
 
33
 #endif
 
34
+#ifdef __MINGW32__
 
35
+#undef Rectangle 
 
36
+#endif /* __MINGW32__ */
 
37
 #ifndef _SV_SVAPP_HXX
 
38
 #include <vcl/svapp.hxx>
 
39
 #endif
 
40
--- dbaccess/source/ui/dlg/ConnectionHelper.cxx.~1.19.~ 2008-05-05 17:56:49.000000000 +0200
 
41
+++ dbaccess/source/ui/dlg/ConnectionHelper.cxx 2009-02-16 21:37:10.000000000 +0100
 
42
@@ -149,7 +149,7 @@
 
43
 #ifndef _SFX_DOCFILT_HACK_HXX
 
44
 #include <sfx2/docfilt.hxx>
 
45
 #endif
 
46
-#if !defined(WINDOWS_VISTA_PSDK) && (defined(WIN) || defined(WNT))
 
47
+#if !defined(WINDOWS_VISTA_PSDK) && !defined(__MINGW32__) && (defined(WIN) || defined(WNT))
 
48
 #define _ADO_DATALINK_BROWSE_
 
49
 #endif
 
50