download.lst | 4 +--
libmspub/UnpackedTarball_mspub.mk | 6 -----
libmspub/libmspub-0.0.4-boost.patch | 42 ------------------------------------
3 files changed, 2 insertions(+), 50 deletions(-)
New commits:
commit ede5fccc348986528d52149426d344f880790637
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Feb 18 12:26:54 2013 +0100
Update the internal libmspub to 0.0.5
Change-Id: Ia1e2807a9f8d624e734afa93102fb6ff27eee091
diff --git a/download.lst b/download.lst
index 663d727..1131379 100644
--- a/download.lst
+++ b/download.lst
@@ -1,7 +1,7 @@
CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b
export CDR_TARBALL := libcdr-0.0.10.tar.bz2
-MSPUB_MD5SUM := aafd3687297bfc3967847d2213d08071
-export MSPUB_TARBALL := libmspub-0.0.4.tar.bz2
+MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
+export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea
export VISIO_TARBALL := libvisio-0.0.24.tar.bz2
diff --git a/libmspub/UnpackedTarball_mspub.mk
b/libmspub/UnpackedTarball_mspub.mk
index 92552bd..5193169 100644
--- a/libmspub/UnpackedTarball_mspub.mk
+++ b/libmspub/UnpackedTarball_mspub.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mspub))
$(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,mspub,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,mspub,\
- libmspub/libmspub-0.0.4-boost.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libmspub/libmspub-0.0.4-boost.patch
b/libmspub/libmspub-0.0.4-boost.patch
deleted file mode 100644
index 16cde8b..0000000
--- a/libmspub/libmspub-0.0.4-boost.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/build/win32/libmspub.vcproj
-+++ b/build/win32/libmspub.vcproj
-@@ -42,7 +42,7 @@
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
--
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
-+
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
-
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- RuntimeLibrary="2"
-@@ -116,7 +116,7 @@
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
--
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
-+
AdditionalIncludeDirectories="$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR)"
-
PreprocessorDefinitions="_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
-diff --git a/build/win32/libmspub.vcxproj b/build/win32/libmspub.vcxproj
-index 1a3bae4..c233331 100644
---- a/build/win32/libmspub.vcxproj
-+++ b/build/win32/libmspub.vcxproj
-@@ -102,7 +102,7 @@
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
--
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-@@ -132,7 +132,7 @@
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
--
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+
<AdditionalIncludeDirectories>$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
<PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
