[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libcdr/msvc2008.patch.1 libcdr/UnpackedTarball_cdr.mk

[Michael Stahl]

 libcdr/UnpackedTarball_cdr.mk |    4 ++++
 libcdr/msvc2008.patch.1       |   13 +++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit 29296665015f4b21e28b88818a35442fdc7c2816
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu May 30 17:42:27 2013 +0200

    libcdr: fix build with MSVC2008
    
    Change-Id: I70731e13ab4ef0d6eadd803b8f6a24f565be5346
    Reviewed-on: https://gerrit.libreoffice.org/4109
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..8affb0b 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+	libcdr/msvc2008.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/msvc2008.patch.1 b/libcdr/msvc2008.patch.1
new file mode 100644
index 0000000..27e327a
--- /dev/null
+++ b/libcdr/msvc2008.patch.1
@@ -0,0 +1,13 @@
+Fix broken MSVC 2008 project file
+
+--- cdr/build/win32/libcdr.vcproj	2013-05-30 17:36:43.084800000 +0200
++++ cdr/build/win32/libcdr.vcproj	2013-05-30 17:36:52.710000000 +0200
+@@ -217,7 +217,7 @@
+ 				</FileConfiguration>
+ 			</File>
+ 			<File
+-				RelativePath="..\..\inc\libcdr\CDRDocument.cpp"
++				RelativePath="..\..\src\lib\CDRDocument.cpp"
+ 				>
+ 				<FileConfiguration
+ 					Name="Debug|Win32"