diff options
| author | David Tardon <dtardon@redhat.com> | 2015-11-27 09:32:40 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-11-27 19:06:49 +0100 |
| commit | 4f088f78050ec1c831b31b3bf3d4e8d5197c7daa (patch) | |
| tree | 16ba1b8d9919f0e9bdd9f2a5a4eed0c36721713f /external | |
| parent | e3e860eccc55e0dac542e680e1b83aedc24df7d1 (diff) | |
upload libmwaw 0.3.7
Change-Id: If0906297e6da53086759f12170bb5d3be69d162b
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmwaw/Library_mwaw.mk | 3 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 1 | ||||
| -rw-r--r-- | external/libmwaw/c++11-narrowing.patch | 11 |
3 files changed, 3 insertions, 12 deletions
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index 90b766555277..072d4bd0aee6 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -152,6 +152,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/NisusWrtParser \ UnpackedTarball/libmwaw/src/lib/NisusWrtStruct \ UnpackedTarball/libmwaw/src/lib/NisusWrtText \ + UnpackedTarball/libmwaw/src/lib/PixelPaintParser \ + UnpackedTarball/libmwaw/src/lib/RagTime5Chart \ UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \ UnpackedTarball/libmwaw/src/lib/RagTime5Graph \ UnpackedTarball/libmwaw/src/lib/RagTime5Layout \ @@ -165,6 +167,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \ UnpackedTarball/libmwaw/src/lib/RagTimeStruct \ UnpackedTarball/libmwaw/src/lib/RagTimeText \ + UnpackedTarball/libmwaw/src/lib/StyleParser \ UnpackedTarball/libmwaw/src/lib/SuperPaintParser \ UnpackedTarball/libmwaw/src/lib/TeachTxtParser \ UnpackedTarball/libmwaw/src/lib/WingzParser \ diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index 0b04abb9d40c..2adf7ffad639 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -36,7 +36,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ endif $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ - external/libmwaw/c++11-narrowing.patch \ external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 \ )) diff --git a/external/libmwaw/c++11-narrowing.patch b/external/libmwaw/c++11-narrowing.patch deleted file mode 100644 index 8695d4471b00..000000000000 --- a/external/libmwaw/c++11-narrowing.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/RagTime5StructManager.cxx -+++ src/lib/RagTime5StructManager.cxx -@@ -307,7 +307,7 @@ - fSz-=4; - long debDataPos=input->tell(); - long endDataPos=debDataPos+fSz; -- switch (type) { -+ switch ((unsigned long) type) { - case 0x360c0: - case 0x368c0: - if (fSz!=1) { |