diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-14 15:27:56 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-14 15:28:34 +0200 |
| commit | 372063ac1363a9dfda6b2df94ef22fe1f3828fd4 (patch) | |
| tree | 80de21482c6062ef9cf35ab5945b6d354416d573 /libmwaw | |
| parent | 9f3f93b74b20822344cd8b21e69c4aee6c0bbaca (diff) | |
Uploading libmwaw 0.1.9
Change-Id: I9f6f9d6a162e0aed49754229357fc2731a4037d0
Diffstat (limited to 'libmwaw')
| -rw-r--r-- | libmwaw/ExternalPackage_libmwaw.mk | 6 | ||||
| -rw-r--r-- | libmwaw/UnpackedTarball_libmwaw.mk | 7 | ||||
| -rw-r--r-- | libmwaw/libmwaw-0.1.7-autotools.patch | 20 | ||||
| -rw-r--r-- | libmwaw/libmwaw-0.1.8-cctype.patch | 10 |
4 files changed, 3 insertions, 40 deletions
diff --git a/libmwaw/ExternalPackage_libmwaw.mk b/libmwaw/ExternalPackage_libmwaw.mk index 2bfd9c970886..6608cb13f374 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 a5d9c015b60b..96fe9df6afa0 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 70787895e0ca..000000000000 --- 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 de515d62eccb..000000000000 --- 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> |