[Libreoffice-commits] .: libcdr/libcdr-msvc.patch libcdr/UnpackedTarball_cdr.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Oct 5 22:10:31 PDT 2012
libcdr/UnpackedTarball_cdr.mk | 3
libcdr/libcdr-msvc.patch | 200 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 203 insertions(+)
New commits:
commit 2ca57fb3a9b3666409dadc515f76942a06902d72
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Oct 6 07:09:46 2012 +0200
Fix libcdr windows build
Change-Id: I33a6c4659cf9e3792f17f73977637dab4667f58e
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 32d898b..3b02022 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
$(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
+
$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
libcdr/libcdr-configure.patch.1 \
+ libcdr/libcdr-msvc.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-msvc.patch b/libcdr/libcdr-msvc.patch
new file mode 100755
index 0000000..cf18fb9
--- /dev/null
+++ b/libcdr/libcdr-msvc.patch
@@ -0,0 +1,200 @@
+--- cdr/build/win32/cdr2raw.vcproj 2012-10-06 06:45:36.436443100 +0200
++++ cdr/build/win32/cdr2raw.vcproj 2012-10-06 06:46:42.153510700 +0200
+@@ -69,7 +69,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
++ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ OutputFile="Debug\bin\cdr2raw.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+@@ -157,7 +157,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
++ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ OutputFile="Release\bin\cdr2raw.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+--- cdr/build/win32/cdr2raw.vcxproj 2012-10-06 06:45:36.436443100 +0200
++++ cdr/build/win32/cdr2raw.vcxproj 2012-10-06 06:46:42.153510700 +0200
+@@ -68,7 +68,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>Debug\bin\cdr2raw.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+@@ -109,7 +109,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>Release\bin\cdr2raw.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+--- cdr/build/win32/cdr2xhtml.vcproj 2012-10-06 06:45:36.436443100 +0200
++++ cdr/build/win32/cdr2xhtml.vcproj 2012-10-06 06:46:42.169135300 +0200
+@@ -67,7 +67,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
++ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ OutputFile="Release\bin\cdr2xhtml.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+@@ -156,7 +156,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
++ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ OutputFile="Debug\bin\cdr2xhtml.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+--- cdr/build/win32/cdr2xhtml.vcxproj 2012-10-06 06:45:36.452067700 +0200
++++ cdr/build/win32/cdr2xhtml.vcxproj 2012-10-06 06:46:42.169135300 +0200
+@@ -66,7 +66,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>Release\bin\cdr2xhtml.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+@@ -108,7 +108,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>Debug\bin\cdr2xhtml.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+--- cdr/build/win32/cmx2raw.vcproj 2012-10-06 06:45:36.452067700 +0200
++++ cdr/build/win32/cmx2raw.vcproj 2012-10-06 06:46:42.169135300 +0200
+@@ -69,7 +69,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
++ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ OutputFile="Debug\bin\cmx2raw.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+@@ -157,7 +157,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
++ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ OutputFile="Release\bin\cmx2raw.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+--- cdr/build/win32/cmx2raw.vcxproj 2012-10-06 06:45:36.452067700 +0200
++++ cdr/build/win32/cmx2raw.vcxproj 2012-10-06 06:46:42.184759900 +0200
+@@ -68,7 +68,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>Debug\bin\cmx2raw.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+@@ -109,7 +109,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>Release\bin\cmx2raw.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+--- cdr/build/win32/cmx2xhtml.vcproj 2012-10-06 06:45:36.452067700 +0200
++++ cdr/build/win32/cmx2xhtml.vcproj 2012-10-06 06:46:42.184759900 +0200
+@@ -69,7 +69,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
++ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ OutputFile="Debug\bin\cmx2xhtml.exe"
+ LinkIncremental="2"
+ SuppressStartupBanner="true"
+@@ -157,7 +157,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="libcdr-0.2.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
++ AdditionalDependencies="libcdr-0.0.lib libwpd-stream-0.9.lib libwpd-0.9.lib"
+ OutputFile="Release\bin\cmx2xhtml.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+--- cdr/build/win32/cmx2xhtml.vcxproj 2012-10-06 06:45:36.467692300 +0200
++++ cdr/build/win32/cmx2xhtml.vcxproj 2012-10-06 06:46:42.184759900 +0200
+@@ -68,7 +68,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>Debug\bin\cmx2xhtml.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>Debug\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+@@ -109,7 +109,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Link>
+- <AdditionalDependencies>libcdr-0.2.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
++ <AdditionalDependencies>libcdr-0.0.lib;libwpd-stream-0.9.lib;libwpd-0.9.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>Release\bin\cmx2xhtml.exe</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <AdditionalLibraryDirectories>Release\lib;$(LIBWPD_LIB_DIR);$(LCMS2_LIB_DIR);$(ZLIB_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+--- cdr/build/win32/libcdr.vcproj 2012-10-06 06:45:36.483316900 +0200
++++ cdr/build/win32/libcdr.vcproj 2012-10-06 06:46:42.216009100 +0200
+@@ -67,7 +67,7 @@
+ />
+ <Tool
+ Name="VCLibrarianTool"
+- OutputFile="Debug\lib\libcdr-0.2.lib"
++ OutputFile="Debug\lib\libcdr-0.0.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+@@ -141,7 +141,7 @@
+ />
+ <Tool
+ Name="VCLibrarianTool"
+- OutputFile="Release\lib\libcdr-0.2.lib"
++ OutputFile="Release\lib\libcdr-0.0.lib"
+ SuppressStartupBanner="true"
+ />
+ <Tool
+--- cdr/build/win32/libcdr.vcxproj 2012-10-06 06:45:36.483316900 +0200
++++ cdr/build/win32/libcdr.vcxproj 2012-10-06 06:46:42.231633700 +0200
+@@ -61,7 +61,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Lib>
+- <OutputFile>Debug\lib\libcdr-0.2.lib</OutputFile>
++ <OutputFile>Debug\lib\libcdr-0.0.lib</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
+@@ -91,7 +91,7 @@
+ <Culture>0x0409</Culture>
+ </ResourceCompile>
+ <Lib>
+- <OutputFile>Release\lib\libcdr-0.2.lib</OutputFile>
++ <OutputFile>Release\lib\libcdr-0.0.lib</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </Lib>
+ <Bscmake>
More information about the Libreoffice-commits
mailing list