[ooo-build-commit] .: patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 03:13:44 PDT 2010
patches/dev300/apply | 13 ----
patches/dev300/win32-cygwin-1.7.diff | 41 --------------
patches/dev300/win32-dxsdk-200908.diff | 27 ---------
patches/dev300/win32-sdk7.diff | 21 -------
patches/dev300/win32-tooltips.diff | 92 ---------------------------------
5 files changed, 194 deletions(-)
New commits:
commit 733bb7ebbad2ff019afe95cfd53c20d100f9d573
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 12:12:43 2010 +0200
Migrate to git some safe win32 build fixes and drop stuff not needed anymore.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9248d29..583914b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2711,19 +2711,6 @@ sw-outline-numbering-broken-fix.diff, i#96092, n#445536, Amelia Wang
# one of pagebreak enhancements
sw-insert-pagebreak-in-numbered-paragraph.diff, n#396648, Amelia Wang
-# Drop the lame and misleading tooltips for the icon on the desktop
-# and in the Start Menu on Windows
-win32-tooltips.diff, tml
-
-# In Cygwin 1.7 the trailing dot hack from i#59477 is harmful
-win32-cygwin-1.7.diff, i#59477, tml
-
-# Recognize Windows SDK 7
-win32-sdk7.diff, tml
-
-# Build also against DirectX SDK August 2009
-win32-dxsdk-200908.diff, tml
-
# Experimental support for Interix
# FIXME dev300-m83 win32-interix.diff, tml
diff --git a/patches/dev300/win32-cygwin-1.7.diff b/patches/dev300/win32-cygwin-1.7.diff
deleted file mode 100644
index 283384e..0000000
--- a/patches/dev300/win32-cygwin-1.7.diff
+++ /dev/null
@@ -1,41 +0,0 @@
----
- packimages/pack/makefile.mk | 2 +-
- solenv/bin/modules/installer/control.pm | 7 ++++++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git packimages/pack/makefile.mk packimages/pack/makefile.mk
-index c8feef3..f3f8d0c 100644
---- packimages/pack/makefile.mk
-+++ packimages/pack/makefile.mk
-@@ -92,7 +92,7 @@ $(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
-
- # unpack the classic icon set
- $(MISC)$/classic.flag : $(CLASSIC_TARBALL)
-- cd $(MISC) && gunzip -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-+ cd $(MISC) && gunzip -d -c $(CLASSIC_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
- .IF "$(GUI)"=="UNX"
- chmod -R g+w $(MISC)$/classic
- .ENDIF
-diff --git solenv/bin/modules/installer/control.pm solenv/bin/modules/installer/control.pm
-index c48156a..9a71c9a 100644
---- solenv/bin/modules/installer/control.pm
-+++ solenv/bin/modules/installer/control.pm
-@@ -87,9 +87,14 @@ sub check_system_path
-
- if( $^O =~ /cygwin/i )
- { # When using cygwin's perl the PATH variable is POSIX style and ...
-- $pathvariable = qx{cygpath -mp "$pathvariable"} ;
-+ my $temparrayref = installer::converter::convert_stringlist_into_array_without_newline(\$pathvariable, $local_pathseparator);
-+ foreach $i (0..$#$temparrayref) {
-+ $$temparrayref[$i] = qx{cygpath -m "$$temparrayref[$i]"};
-+ chomp($$temparrayref[$i]);
-+ }
- # has to be converted to DOS style for further use.
- $local_pathseparator = ';';
-+ $pathvariable = join($local_pathseparator, @$temparrayref);
- }
- my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
-
---
-1.7.0.1
-
diff --git a/patches/dev300/win32-dxsdk-200908.diff b/patches/dev300/win32-dxsdk-200908.diff
deleted file mode 100644
index d4415a1..0000000
--- a/patches/dev300/win32-dxsdk-200908.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- canvas/source/directx/dx_winstuff.hxx | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git canvas/source/directx/dx_winstuff.hxx canvas/source/directx/dx_winstuff.hxx
-index 50e38d8..1c3841b 100755
---- canvas/source/directx/dx_winstuff.hxx
-+++ canvas/source/directx/dx_winstuff.hxx
-@@ -84,9 +84,14 @@
-
- #else
-
-+ #include <dxsdkver.h>
- #include <d3d9.h>
- #include <d3dx9.h>
--// #include <dxerr9.h> #i107614# removing include, it has been changed in the latest sdk fron August2009 from dxerr9.h into dxerr.h
-+ #if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
-+ #include <dxerr9.h>
-+ #else
-+ #include <dxerr.h>
-+ #endif
-
- typedef IDirect3DSurface9 surface_type;
-
---
-1.7.0.1
-
diff --git a/patches/dev300/win32-sdk7.diff b/patches/dev300/win32-sdk7.diff
deleted file mode 100644
index fbedb89..0000000
--- a/patches/dev300/win32-sdk7.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- configure.in | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git configure.in configure.in
-index 071bb8f..daf6ef9 100644
---- configure.in
-+++ configure.in
-@@ -5486,6 +5486,9 @@ dnl Check if this is the right SDK.
- elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([Found Windows SDK 6.0 ($PSDK_HOME)])
- WINDOWS_VISTA_PSDK=TRUE
-+ elif echo $PSDK_HOME | grep "v7" >/dev/null 2>/dev/null; then
-+ AC_MSG_RESULT([Found Windows SDK 7 ($PSDK_HOME)])
-+ WINDOWS_VISTA_PSDK=TRUE
- else
- AC_MSG_RESULT([Found Legacy Windows Platform SDK ($PSDK_HOME)])
- fi
---
-1.7.0.1
-
diff --git a/patches/dev300/win32-tooltips.diff b/patches/dev300/win32-tooltips.diff
deleted file mode 100644
index 41ce5f6..0000000
--- a/patches/dev300/win32-tooltips.diff
+++ /dev/null
@@ -1,92 +0,0 @@
----
- scp2/source/base/folderitem_base.scp | 1 -
- scp2/source/calc/folderitem_calc.scp | 1 -
- scp2/source/draw/folderitem_draw.scp | 1 -
- scp2/source/impress/folderitem_impress.scp | 1 -
- scp2/source/math/folderitem_math.scp | 1 -
- scp2/source/ooo/folderitem_ooo.scp | 2 --
- scp2/source/writer/folderitem_writer.scp | 1 -
- 7 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git scp2/source/base/folderitem_base.scp scp2/source/base/folderitem_base.scp
-index c678e74..9fdb4b7 100644
---- scp2/source/base/folderitem_base.scp
-+++ scp2/source/base/folderitem_base.scp
-@@ -37,5 +37,4 @@ FolderItem gid_Folderitem_Sbase
- WkDir = gid_Dir_Program;
- Parameter = "";
- Styles = (NOWEB, NON_ADVERTISED);
-- ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
- End
-diff --git scp2/source/calc/folderitem_calc.scp scp2/source/calc/folderitem_calc.scp
-index 36cd965..73b9b48 100644
---- scp2/source/calc/folderitem_calc.scp
-+++ scp2/source/calc/folderitem_calc.scp
-@@ -37,5 +37,4 @@ FolderItem gid_Folderitem_Scalc
- WkDir = gid_Dir_Program;
- Parameter = "";
- Styles = (NOWEB, NON_ADVERTISED);
-- ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
- End
-diff --git scp2/source/draw/folderitem_draw.scp scp2/source/draw/folderitem_draw.scp
-index 4a73948..1427d3d 100644
---- scp2/source/draw/folderitem_draw.scp
-+++ scp2/source/draw/folderitem_draw.scp
-@@ -37,5 +37,4 @@ FolderItem gid_Folderitem_Sdraw
- WkDir = gid_Dir_Program;
- Parameter = "";
- Styles = (NOWEB, NON_ADVERTISED);
-- ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
- End
-diff --git scp2/source/impress/folderitem_impress.scp scp2/source/impress/folderitem_impress.scp
-index db7b0c3..fcc09a5 100644
---- scp2/source/impress/folderitem_impress.scp
-+++ scp2/source/impress/folderitem_impress.scp
-@@ -37,5 +37,4 @@ FolderItem gid_Folderitem_Simpress
- WkDir = gid_Dir_Program;
- Parameter = "";
- Styles = (NOWEB, NON_ADVERTISED);
-- ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
- End
-diff --git scp2/source/math/folderitem_math.scp scp2/source/math/folderitem_math.scp
-index 2decfb2..2304a65 100644
---- scp2/source/math/folderitem_math.scp
-+++ scp2/source/math/folderitem_math.scp
-@@ -37,5 +37,4 @@ FolderItem gid_Folderitem_Smath
- WkDir = gid_Dir_Program;
- Parameter = "";
- Styles = (NOWEB, NON_ADVERTISED);
-- ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
- End
-diff --git scp2/source/ooo/folderitem_ooo.scp scp2/source/ooo/folderitem_ooo.scp
-index b6ef81e..beaadaf 100644
---- scp2/source/ooo/folderitem_ooo.scp
-+++ scp2/source/ooo/folderitem_ooo.scp
-@@ -37,7 +37,6 @@ FolderItem gid_Folderitem_Soffice
- WkDir = gid_Dir_Program;
- Parameter = "";
- Styles = (NOWEB, NON_ADVERTISED);
-- ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
- End
-
- FolderItem gid_Folderitem_Soffice_Desktop
-@@ -51,6 +50,5 @@ FolderItem gid_Folderitem_Soffice_Desktop
- WkDir = gid_Dir_Program;
- Parameter = "";
- Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
-- ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
- ComponentCondition = "CREATEDESKTOPLINK=1";
- End
-diff --git scp2/source/writer/folderitem_writer.scp scp2/source/writer/folderitem_writer.scp
-index 7541e1d..c0fb790 100644
---- scp2/source/writer/folderitem_writer.scp
-+++ scp2/source/writer/folderitem_writer.scp
-@@ -37,5 +37,4 @@ FolderItem gid_Folderitem_Swriter
- WkDir = gid_Dir_Program;
- Parameter = "";
- Styles = (NOWEB, NON_ADVERTISED);
-- ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
- End
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list