diff options
| -rwxr-xr-x | download.lst | 4 | ||||
| -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 |
4 files changed, 5 insertions, 14 deletions
diff --git a/download.lst b/download.lst index 007ab3d0d9c5..eabdbcfd3c95 100755 --- a/download.lst +++ b/download.lst @@ -97,8 +97,8 @@ export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe export MDDS_TARBALL := mdds_0.12.1.tar.bz2 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 -export MWAW_MD5SUM := a8364bf2e4ece2860ab96d6bee75f1d7 -export MWAW_VERSION_MICRO := 6 +export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb +export MWAW_VERSION_MICRO := 7 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2 export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz 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) { |