[Libreoffice-commits] core.git: download.lst libmwaw/ExternalPackage_libmwaw.mk libmwaw/libmwaw-0.1.7-autotools.patch libmwaw/libmwaw-0.1.8-cctype.patch libmwaw/UnpackedTarball_libmwaw.mk

[Fridrich Å trba]

 download.lst                          |    4 ++--
 libmwaw/ExternalPackage_libmwaw.mk    |    6 +++---
 libmwaw/UnpackedTarball_libmwaw.mk    |    7 -------
 libmwaw/libmwaw-0.1.7-autotools.patch |   20 --------------------
 libmwaw/libmwaw-0.1.8-cctype.patch    |   10 ----------
 5 files changed, 5 insertions(+), 42 deletions(-)

New commits:
commit 372063ac1363a9dfda6b2df94ef22fe1f3828fd4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 14 15:27:56 2013 +0200

    Uploading libmwaw 0.1.9
    
    Change-Id: I9f6f9d6a162e0aed49754229357fc2731a4037d0

diff --git a/download.lst b/download.lst
index a5742c7..6165f69 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00
 export CDR_TARBALL := libcdr-0.0.13.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
-MWAW_MD5SUM := 7515f94bce7d8685561132ef858828b3
-export MWAW_TARBALL := libmwaw-0.1.8.tar.bz2
+MWAW_MD5SUM := 2090daf6e8a27b52e8c5f26c915bd7c5
+export MWAW_TARBALL := libmwaw-0.1.9.tar.bz2
 VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e
 export VISIO_TARBALL := libvisio-0.0.26.tar.bz2
 
diff --git a/libmwaw/ExternalPackage_libmwaw.mk b/libmwaw/ExternalPackage_libmwaw.mk
index 2bfd9c9..6608cb1 100644
--- a/libmwaw/ExternalPackage_libmwaw.mk
+++ b/libmwaw/ExternalPackage_libmwaw.mk
@@ -10,9 +10,9 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libmwaw,libmwaw))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libmwaw,inc/external/libmwaw,\
-	src/lib/libmwaw.hxx \
-	src/lib/MWAWDocument.hxx \
-	src/lib/MWAWPropertyHandler.hxx \
+	inc/libmwaw/libmwaw.hxx \
+	inc/libmwaw/MWAWDocument.hxx \
+	inc/libmwaw/MWAWPropertyHandler.hxx \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw))
diff --git a/libmwaw/UnpackedTarball_libmwaw.mk b/libmwaw/UnpackedTarball_libmwaw.mk
index a5d9c01..96fe9df 100644
--- a/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/libmwaw/UnpackedTarball_libmwaw.mk
@@ -11,11 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
-       libmwaw/libmwaw-0.1.7-autotools.patch \
-       libmwaw/libmwaw-0.1.8-cctype.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libmwaw/libmwaw-0.1.7-autotools.patch b/libmwaw/libmwaw-0.1.7-autotools.patch
deleted file mode 100644
index 7078789..0000000
--- a/libmwaw/libmwaw-0.1.7-autotools.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libmwaw-0.1.7/config.sub	2013-03-13 15:40:57.748451338 +0100
-+++ libmwaw-0.1.7/config.sub	2013-03-13 15:41:39.717433203 +0100
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-@@ -1211,7 +1211,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/libmwaw/libmwaw-0.1.8-cctype.patch b/libmwaw/libmwaw-0.1.8-cctype.patch
deleted file mode 100644
index de515d6..0000000
--- a/libmwaw/libmwaw-0.1.8-cctype.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libmwaw-0.1.8/src/lib/MWAWOLEStream.cxx
-+++ libmwaw-0.1.8/src/lib/MWAWOLEStream.cxx
-@@ -43,6 +43,7 @@
- #endif
- 
- #include <cstring>
-+#include <cctype>
- #include <iostream>
- #include <list>
- #include <set>