[ooo-build-commit] .: patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 04:13:30 PDT 2010
patches/dev300/apply | 10
patches/dev300/python-win32-buildfix.diff | 429 ----------------------------
patches/dev300/win32-force-version-fix.diff | 131 --------
patches/dev300/win32-vs2005-compat.diff | 89 -----
patches/dev300/win32-vs2005-oldsdk.diff | 91 -----
5 files changed, 750 deletions(-)
New commits:
commit 9ba526c05fddb936ed4a0473034b0b017bb7789b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 13:09:29 2010 +0200
Moving to git some of Thorsten's VS2005 fixes.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 653d25a..d9eba7a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3287,16 +3287,6 @@ evaluation-row-limit.diff
valgrind-fixes.diff, thorsten
framework-menubar-fix.diff, thorsten
-[ BuildBits ]
-# make python build properly on win32
-python-win32-buildfix.diff, thorsten
-# force WINVER when using non-std win api
-win32-force-version-fix.diff, thorsten
-# workaround a few VS8.0 compat problems
-win32-vs2005-compat.diff, thorsten
-# hard disabling of certain vista-sdk-only things
-#win32-vs2005-oldsdk.diff, thorsten
-
[ Netbook ]
vcl-netbook.diff, rodo
diff --git a/patches/dev300/python-win32-buildfix.diff b/patches/dev300/python-win32-buildfix.diff
deleted file mode 100644
index 0c17fe1..0000000
--- a/patches/dev300/python-win32-buildfix.diff
+++ /dev/null
@@ -1,429 +0,0 @@
---- python/Python-2.6.1.patch
-+++ python/Python-2.6.1.patch
-@@ -120,6 +120,180 @@
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
- ProjectSection(ProjectDependencies) = postProject
- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+--- misc/Python-2.6.1/PC/VS7.1/pcbuild.sln 2007-06-10 23:01:17.000000000 +0200
-++++ misc/build/Python-2.6.1/PC/VS7.1/pcbuild.sln 2010-02-16 01:49:18.810375000 +0100
-+@@ -1,36 +1,36 @@
-+ Microsoft Visual Studio Solution File, Format Version 8.00
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- EndProjectSection
-+-EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{E1DBB220-D64B-423D-A545-539A55AA7FE2}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# EndProjectSection
-++#EndProject
-+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcproj", "{324F66C2-44D0-4D50-B979-F9DAE7FD36DB}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+ EndProjectSection
-+ EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}
-+- EndProjectSection
-+-EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{8E85BA54-8A47-4C8B-B72E-8E17579CC6D7}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058} = {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}
-++# EndProjectSection
-++#EndProject
-+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{59CBF474-9E06-4C50-9142-C44A118BB447}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+ EndProjectSection
-+ EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- EndProjectSection
-+-EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- EndProjectSection
-+-EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{5B51DFF7-5DC0-41F8-8791-A4AB7114A151}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# EndProjectSection
-++#EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{AC557788-6354-43F7-BE05-C9C8C59A344A}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# EndProjectSection
-++#EndProject
-+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo.vcproj", "{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ EndProjectSection
-+@@ -99,11 +99,11 @@
-+ {F22F40F4-D318-40DC-96B3-88DC81CE0894} = {F22F40F4-D318-40DC-96B3-88DC81CE0894}
-+ EndProjectSection
-+ EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- EndProjectSection
-+-EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{2FF0A312-22F9-4C34-B070-842916DE27A9}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# EndProjectSection
-++#EndProject
-+ Global
-+ GlobalSection(SolutionConfiguration) = preSolution
-+ Debug = Debug
-+--- misc/Python-2.6.1/PC/VS8.0/pcbuild.sln 2008-09-02 23:17:05.000000000 +0200
-++++ misc/build/Python-2.6.1/PC/VS8.0/pcbuild.sln 2010-02-16 01:33:51.185375000 +0100
-+@@ -38,12 +38,12 @@
-+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+ EndProjectSection
-+ EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- EndProjectSection
-+-EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# EndProjectSection
-++#EndProject
-+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+@@ -69,12 +69,12 @@
-+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+ EndProjectSection
-+ EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
-+- EndProjectSection
-+-EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA}
-++# EndProjectSection
-++#EndProject
-+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-+@@ -87,16 +87,16 @@
-+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+ EndProjectSection
-+ EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- EndProjectSection
-+-EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- EndProjectSection
-+-EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# EndProjectSection
-++#EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# EndProjectSection
-++#EndProject
-+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+@@ -114,17 +114,17 @@
-+ EndProject
-+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
-+ EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-+- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-+- EndProjectSection
-+-EndProject
-+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
-+- ProjectSection(ProjectDependencies) = postProject
-+- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-+- EndProjectSection
-+-EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
-++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-++# EndProjectSection
-++#EndProject
-++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}"
-++# ProjectSection(ProjectDependencies) = postProject
-++# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31}
-++# EndProjectSection
-++#EndProject
-+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
-+ ProjectSection(ProjectDependencies) = postProject
-+ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- --- misc/Python-2.6.1/Lib/test/test_threading.py.bak 2009-03-12 07:59:17.000000000 +0000
- +++ misc/build/Python-2.6.1/Lib/test/test_threading.py 2009-03-12 10:48:04.000000000 +0000
- @@ -382,7 +382,7 @@
---- python/Python-ssl.patch
-+++ python/Python-ssl.patch
-@@ -208,3 +208,165 @@
-
-
- # SGI IRIX specific modules -- off by default.
-+--- misc/Python-2.6.1/PC/VS7.1/build_ssl.py 2007-12-31 15:59:26.000000000 +0100
-++++ misc/build/Python-2.6.1/PC/VS7.1/build_ssl.py 2010-02-16 01:43:48.872875000 +0100
-+@@ -178,4 +178,4 @@
-+ sys.exit(rc)
-+
-+ if __name__=='__main__':
-+- main()
-++ sys.exit(0)
-+--- misc/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2008-06-14 00:38:33.000000000 +0200
-++++ misc/build/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2010-02-16 01:38:22.044750000 +0100
-+@@ -43,7 +43,7 @@
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+- AdditionalIncludeDirectories="$(opensslDir)\inc32"
-++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+@@ -57,7 +57,7 @@
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+@@ -106,7 +106,7 @@
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+- AdditionalIncludeDirectories="$(opensslDir)\inc64"
-++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+@@ -120,7 +120,7 @@
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+@@ -169,7 +169,7 @@
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+- AdditionalIncludeDirectories="$(opensslDir)\inc32"
-++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+@@ -183,7 +183,7 @@
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+@@ -233,7 +233,7 @@
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+- AdditionalIncludeDirectories="$(opensslDir)\inc64"
-++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+@@ -247,7 +247,7 @@
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+@@ -296,7 +296,7 @@
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+- AdditionalIncludeDirectories="$(opensslDir)\inc32"
-++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+@@ -310,7 +310,7 @@
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+@@ -360,7 +360,7 @@
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+- AdditionalIncludeDirectories="$(opensslDir)\inc64"
-++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+@@ -374,7 +374,7 @@
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
-+ TargetMachine="17"
-+ />
-+ <Tool
-+@@ -424,7 +424,7 @@
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+- AdditionalIncludeDirectories="$(opensslDir)\inc32"
-++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+@@ -438,7 +438,7 @@
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
-++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
-+ />
-+ <Tool
-+ Name="VCALinkTool"
-+@@ -488,7 +488,7 @@
-+ />
-+ <Tool
-+ Name="VCCLCompilerTool"
-+- AdditionalIncludeDirectories="$(opensslDir)\inc64"
-++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
-+ />
-+ <Tool
-+ Name="VCManagedResourceCompilerTool"
-+@@ -502,7 +502,7 @@
-+ />
-+ <Tool
-+ Name="VCLinkerTool"
-+- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
-+ TargetMachine="17"
-+ />
-+ <Tool
-+--- misc/Python-2.6.1/PC/VS8.0/build_ssl.py 2008-01-02 18:43:40.000000000 +0100
-++++ misc/build/Python-2.6.1/PC/VS8.0/build_ssl.py 2010-02-16 01:40:40.560375000 +0100
-+@@ -247,4 +247,4 @@
-+ sys.exit(rc)
-+
-+ if __name__=='__main__':
-+- main()
-++ sys.exit(0)
---- python/makefile.mk
-+++ python/makefile.mk
-@@ -113,16 +113,20 @@
- #.ENDIF #"$(WINDOWS_VISTA_PSDK)"!=""
- #.ENDIF
-
-+.IF "$(CCNUMVER)" >= "001500000000"
- BUILD_DIR=PCbuild
-+.ELIF "$(CCNUMVER)" >= "001400000000"
-+BUILD_DIR=PC/VS8.0
-+.ELIF "$(CCNUMVER)" >= "001310000000"
-+BUILD_DIR=PC/VS7.1
-+.ELSE
-+BUILD_DIR=PC/VC6
-+.ENDIF
-
- # Build python executable and then runs a minimal script. Running the minimal script
- # ensures that certain *.pyc files are generated which would otherwise be created on
- # solver during registration in insetoo_native
--.IF "$(SYSBASE)" != ""
--BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32"
--.ELSE
- BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32"
--.ENDIF # "$(SYSBASE)" != ""
- .ENDIF
- .ENDIF
-
---- python/prj/d.lst
-+++ python/prj/d.lst
-@@ -104,6 +104,48 @@
- ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
- ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
- ..\%__SRC%\misc\build\Python-2.6.1\PCbuild\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python.exe %_DEST%\bin%_EXT%\python.exe
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.dll %_DEST%\bin%_EXT%\python26.dll
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\python26.lib %_DEST%\lib%_EXT%\python26.lib
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS8.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python.exe %_DEST%\bin%_EXT%\python.exe
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.dll %_DEST%\bin%_EXT%\python26.dll
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\python26.lib %_DEST%\lib%_EXT%\python26.lib
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VS7.1\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python.exe %_DEST%\bin%_EXT%\python.exe
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.dll %_DEST%\bin%_EXT%\python26.dll
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\python26.lib %_DEST%\lib%_EXT%\python26.lib
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\select.pyd %_DEST%\lib%_EXT%\python\select.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd
-+..\%__SRC%\misc\build\Python-2.6.1\PC\VC6\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd
-
- #linklib: libpython.so.*.*.*
-
diff --git a/patches/dev300/win32-force-version-fix.diff b/patches/dev300/win32-force-version-fix.diff
deleted file mode 100644
index 6a3a91b..0000000
--- a/patches/dev300/win32-force-version-fix.diff
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
---- canvas/source/cairo/cairo_win32_cairo.cxx
-+++ canvas/source/cairo/cairo_win32_cairo.cxx
-@@ -28,6 +28,8 @@
- *
- ************************************************************************/
-
-+#define _WIN32_WINNT 0x0500
-+
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_canvas.hxx"
-
-diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
---- connectivity/source/drivers/ado/ADriver.cxx
-+++ connectivity/source/drivers/ado/ADriver.cxx
-@@ -28,6 +28,8 @@
- *
- ************************************************************************/
-
-+#define _WIN32_WINNT 0x0501
-+
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_connectivity.hxx"
- #include "ado/ADriver.hxx"
-diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
---- desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-+++ desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-@@ -29,6 +29,8 @@
- *
- ************************************************************************/
-
-+#define _WIN32_WINNT 0x0500
-+
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_desktop.hxx"
-
-diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
---- desktop/win32/source/setup/setup.cpp
-+++ desktop/win32/source/setup/setup.cpp
-@@ -29,6 +29,7 @@
- ************************************************************************/
-
- #define WIN // scope W32 API
-+#define _WIN32_WINNT 0x0501
-
- #if defined _MSC_VER
- #pragma warning(push, 1)
-diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
---- fpicker/source/win32/filepicker/FileOpenDlg.cxx
-+++ fpicker/source/win32/filepicker/FileOpenDlg.cxx
-@@ -28,6 +28,8 @@
- *
- ************************************************************************/
-
-+#define _WIN32_WINNT 0x0500
-+
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_fpicker.hxx"
-
-diff --git a/i18npool/source/isolang/inwnt.cxx b/i18npool/source/isolang/inwnt.cxx
---- i18npool/source/isolang/inwnt.cxx
-+++ i18npool/source/isolang/inwnt.cxx
-@@ -32,6 +32,8 @@
-
- #include <sal/config.h>
-
-+#define WINVER 0x0500
-+
- #ifdef _MSC_VER
- #pragma warning(push,1) // disable warnings within system headers
- #endif
-diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
---- sal/osl/w32/file_dirvol.cxx
-+++ sal/osl/w32/file_dirvol.cxx
-@@ -30,7 +30,7 @@
-
- #define UNICODE
- #define _UNICODE
--#define _WIN32_WINNT_0x0500
-+#define _WIN32_WINNT 0x0500
- #include "systools/win32/uwinapi.h"
-
- #include "osl/file.h"
-diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
---- sal/osl/w32/file_error.c
-+++ sal/osl/w32/file_error.c
-@@ -30,7 +30,7 @@
-
- #define UNICODE
- #define _UNICODE
--#define _WIN32_WINNT_0x0500
-+#define _WIN32_WINNT 0x0500
- #include "systools/win32/uwinapi.h"
-
- #include "file_error.h"
-diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
---- sal/osl/w32/file_url.cxx
-+++ sal/osl/w32/file_url.cxx
-@@ -30,7 +30,7 @@
-
- #define UNICODE
- #define _UNICODE
--#define _WIN32_WINNT_0x0500
-+#define _WIN32_WINNT 0x0500
- #include "systools/win32/uwinapi.h"
-
- #include "file_url.h"
-diff --git a/sal/osl/w32/tempfile.cxx b/sal/osl/w32/tempfile.cxx
---- sal/osl/w32/tempfile.cxx
-+++ sal/osl/w32/tempfile.cxx
-@@ -30,7 +30,7 @@
-
- #define UNICODE
- #define _UNICODE
--#define _WIN32_WINNT_0x0500
-+#define _WIN32_WINNT 0x0500
- #include "systools/win32/uwinapi.h"
-
- #include "osl/file.h"
-diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
---- vcl/win/source/gdi/salprn.cxx
-+++ vcl/win/source/gdi/salprn.cxx
-@@ -31,6 +31,8 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_vcl.hxx"
-
-+#define WINVER 0x0500
-+
- #include <string.h>
- #include <tools/svwin.h>
-
diff --git a/patches/dev300/win32-vs2005-compat.diff b/patches/dev300/win32-vs2005-compat.diff
deleted file mode 100644
index 33498dc..0000000
--- a/patches/dev300/win32-vs2005-compat.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h
---- cppu/inc/com/sun/star/uno/Reference.h
-+++ cppu/inc/com/sun/star/uno/Reference.h
-@@ -242,13 +242,13 @@
- public:
- // these are here to force memory de/allocation to sal lib.
- /** @internal */
-- inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW( () )
-+ inline static void * SAL_CALL operator new ( ::size_t nSize ) SAL_THROW( () )
- { return ::rtl_allocateMemory( nSize ); }
- /** @internal */
- inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () )
- { ::rtl_freeMemory( pMem ); }
- /** @internal */
-- inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW( () )
-+ inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) SAL_THROW( () )
- { return pMem; }
- /** @internal */
- inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () )
-diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h
---- cppu/inc/com/sun/star/uno/Sequence.h
-+++ cppu/inc/com/sun/star/uno/Sequence.h
-@@ -72,7 +72,7 @@
- public:
- // these are here to force memory de/allocation to sal lib.
- /** @internal */
-- inline static void * SAL_CALL operator new ( size_t nSize )
-+ inline static void * SAL_CALL operator new ( ::size_t nSize )
- SAL_THROW( () )
- { return ::rtl_allocateMemory( nSize ); }
- /** @internal */
-@@ -80,7 +80,7 @@
- SAL_THROW( () )
- { ::rtl_freeMemory( pMem ); }
- /** @internal */
-- inline static void * SAL_CALL operator new ( size_t, void * pMem )
-+ inline static void * SAL_CALL operator new ( ::size_t, void * pMem )
- SAL_THROW( () )
- { return pMem; }
- /** @internal */
-diff --git a/setup_native/source/win32/customactions/rebase/rebase.cxx b/setup_native/source/win32/customactions/rebase/rebase.cxx
---- setup_native/source/win32/customactions/rebase/rebase.cxx
-+++ setup_native/source/win32/customactions/rebase/rebase.cxx
-@@ -68,8 +68,8 @@
- ULONG_PTR lpNewImageBase = reinterpret_cast<ULONG_PTR>(address);
-
- BOOL bResult = ReBaseImage(
-- filePath.c_str(),
-- "",
-+ (PSTR)filePath.c_str(),
-+ (PSTR)"",
- TRUE,
- FALSE,
- FALSE,
-diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
---- sw/source/filter/ww8/wrtw8nds.cxx
-+++ sw/source/filter/ww8/wrtw8nds.cxx
-@@ -701,14 +701,14 @@
- /*Get defaults if no formatting on ruby text*/
-
- const SfxItemPool *pPool = rNode.GetSwAttrSet().GetPool();
-- const SfxItemPool &rPool = pPool ? *pPool : m_rWW8Export.pDoc->GetAttrPool();
-+ pPool = pPool ? pPool : &m_rWW8Export.pDoc->GetAttrPool();
-
-- const SvxFontItem &rFont = DefaultItemGet< SvxFontItem >( rPool,
-+ const SvxFontItem &rFont = DefaultItemGet< SvxFontItem >( *pPool,
- GetWhichOfScript( RES_CHRATR_FONT,nRubyScript ) );
- sFamilyName = rFont.GetFamilyName();
-
- const SvxFontHeightItem &rHeight = DefaultItemGet< SvxFontHeightItem >
-- ( rPool, GetWhichOfScript( RES_CHRATR_FONTSIZE, nRubyScript ) );
-+ ( *pPool, GetWhichOfScript( RES_CHRATR_FONTSIZE, nRubyScript ) );
- nHeight = rHeight.GetHeight();
- }
- nHeight = (nHeight + 5)/10;
-diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx
---- vos/inc/vos/object.hxx
-+++ vos/inc/vos/object.hxx
-@@ -73,8 +73,8 @@
- /** Define private new and delete operator because of compiler bug,
- when allocating and deleteing a exported class
- */
-- void* SAL_CALL operator new(size_t size);
-- void* SAL_CALL operator new(size_t size, void* p);
-+ void* SAL_CALL operator new(::size_t size);
-+ void* SAL_CALL operator new(::size_t size, void* p);
-
- void SAL_CALL operator delete(void* p);
-
diff --git a/patches/dev300/win32-vs2005-oldsdk.diff b/patches/dev300/win32-vs2005-oldsdk.diff
deleted file mode 100644
index 51b4cd7..0000000
--- a/patches/dev300/win32-vs2005-oldsdk.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -r a230682fb6d7 extensions/prj/build.lst
---- extensions/prj/build.lst Sat Feb 20 01:07:32 2010 +0100
-+++ extensions/prj/build.lst Tue Feb 23 15:33:37 2010 +0100
-@@ -6,8 +6,6 @@
- ex extensions\source\plugin\workben get - all ex_plwkb ex_inc NULL
- ex extensions\source\plugin\inc\plugin\win get - all ex_piwi ex_inc NULL
- ex extensions\source\plugin\inc\plugin\unx get - all ex_piux ex_inc NULL
--ex extensions\source\activex\msidl nmake - w ex_axmsidl ex_inc NULL
--ex extensions\source\activex\main nmake - w ex_axmain ex_axmsidl.w ex_inc NULL
- ex extensions\source\ole nmake - w ex_ole ex_xmlextr ex_inc NULL
- ex extensions\source\resource nmake - all ex_resrc ex_inc NULL
- ex extensions\source\plugin\aqua nmake - u ex_plaqua ex_plbase NULL
-diff -r a230682fb6d7 fpicker/source/win32/filepicker/FPentry.cxx
---- fpicker/source/win32/filepicker/FPentry.cxx Sat Feb 20 01:07:32 2010 +0100
-+++ fpicker/source/win32/filepicker/FPentry.cxx Tue Feb 23 15:33:37 2010 +0100
-@@ -41,7 +41,7 @@
- #include "FPServiceInfo.hxx"
-
- #pragma warning (disable:4917)
--#include "VistaFilePicker.hxx"
-+//#include "VistaFilePicker.hxx"
- #include "..\misc\WinImplHelper.hxx"
- #include <stdio.h>
-
-@@ -68,6 +68,7 @@
- Reference< XInterface > xDlg;
- bool bVistaOrNewer = IsWindowsVistaOrNewer();
-
-+#if 0
- if (bVistaOrNewer)
- {
- fprintf(stdout, "use special (vista) system file picker ...\n");
-@@ -76,6 +77,7 @@
- new ::fpicker::win32::vista::VistaFilePicker( rServiceManager ) ) );
- }
- else
-+#endif
- {
- fprintf(stdout, "use normal system file picker ...\n");
- xDlg.set(
-diff -r a230682fb6d7 fpicker/source/win32/filepicker/makefile.mk
---- fpicker/source/win32/filepicker/makefile.mk Sat Feb 20 01:07:32 2010 +0100
-+++ fpicker/source/win32/filepicker/makefile.mk Tue Feb 23 15:33:37 2010 +0100
-@@ -77,9 +77,6 @@
- $(SLO)$/customcontrolfactory.obj\
- $(SLO)$/dialogcustomcontrols.obj\
- $(SLO)$/asyncrequests.obj\
-- $(SLO)$/VistaFilePickerEventHandler.obj\
-- $(SLO)$/VistaFilePickerImpl.obj\
-- $(SLO)$/VistaFilePicker.obj\
- $(SLO)$/SolarMutex.obj
-
- # --- Targets ------------------------------------------------------
-diff -r a230682fb6d7 scp2/source/activex/makefile.mk
---- scp2/source/activex/makefile.mk Sat Feb 20 01:07:32 2010 +0100
-+++ scp2/source/activex/makefile.mk Tue Feb 23 15:33:37 2010 +0100
-@@ -47,12 +47,6 @@
-
- SCP_PRODUCT_TYPE=osl
-
--.IF "$(GUI)"=="WNT"
--PARFILES= \
-- module_activex.par \
-- file_activex.par
--.ENDIF
--
- ULFFILES= \
- module_activex.ulf
-
-diff -r a230682fb6d7 vcl/win/source/gdi/salnativewidgets-luna.cxx
---- vcl/win/source/gdi/salnativewidgets-luna.cxx Sat Feb 20 01:07:32 2010 +0100
-+++ vcl/win/source/gdi/salnativewidgets-luna.cxx Tue Feb 23 15:33:37 2010 +0100
-@@ -1109,7 +1109,9 @@
- bRet = TRUE;
- }
- }
--
-+
-+// building with vista sdk?
-+#if defined(EP_BACKGROUNDWITHBORDER)
- if( (nType == CTRL_LISTBOX || nType == CTRL_COMBOBOX ) && nPart == PART_ENTIRE_CONTROL )
- {
- HTHEME hTheme = getThemeHandle( mhWnd, L"Combobox");
-@@ -1165,6 +1167,7 @@
- }
- }
- }
-+#endif
-
- ReleaseDC( mhWnd, hDC );
- return( bRet );
More information about the ooo-build-commit
mailing list