diff options
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | external/mythes/UnpackedTarball_mythes.mk | 2 | ||||
| -rw-r--r-- | external/mythes/mythes-1.2.0-android.patch | 20 | ||||
| -rw-r--r-- | external/mythes/mythes-ssizet.patch | 20 |
4 files changed, 1 insertions, 43 deletions
diff --git a/download.lst b/download.lst index 2f45c356a9ea..28f2df387906 100644 --- a/download.lst +++ b/download.lst @@ -100,7 +100,7 @@ export MSPUB_TARBALL := libmspub-0.1.0.tar.bz2 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6 export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz -export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz +export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export NSS_TARBALL := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7 diff --git a/external/mythes/UnpackedTarball_mythes.mk b/external/mythes/UnpackedTarball_mythes.mk index 7571c34e3a37..42e6524b8323 100644 --- a/external/mythes/UnpackedTarball_mythes.mk +++ b/external/mythes/UnpackedTarball_mythes.mk @@ -13,8 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,mythes,\ external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \ - external/mythes/mythes-1.2.0-android.patch \ - external/mythes/mythes-ssizet.patch \ external/mythes/mythes-fdo48017-wfopen.patch \ )) diff --git a/external/mythes/mythes-1.2.0-android.patch b/external/mythes/mythes-1.2.0-android.patch deleted file mode 100644 index 9b5293876281..000000000000 --- a/external/mythes/mythes-1.2.0-android.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/mythes-1.2.3/config.sub 2010-02-27 16:52:52.000000000 +0100 -+++ misc/build/mythes-1.2.3/config.sub 2011-09-26 23:39:04.000000000 +0200 -@@ -123,7 +123,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* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1294,7 +1294,7 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -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/external/mythes/mythes-ssizet.patch b/external/mythes/mythes-ssizet.patch deleted file mode 100644 index 25d95165d8f2..000000000000 --- a/external/mythes/mythes-ssizet.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/mythes-1.2.3/mythes.cxx 2012-06-29 13:16:55.812939142 +0100 -+++ misc/build/mythes-1.2.3/mythes.cxx 2012-06-29 13:17:21.159198507 +0100 -@@ -48,7 +48,7 @@ - len = readLine(pifile,wrd,MAX_WD_LEN); - int idxsz = atoi(wrd); - -- if (idxsz <= 0 || idxsz > std::numeric_limits<ssize_t>::max() / sizeof(sizeof(char*))) { -+ if (idxsz <= 0 || idxsz > std::numeric_limits<int>::max() / sizeof(sizeof(char*))) { - fprintf(stderr,"Error - bad index %d\n", idxsz); - fclose(pifile); - return 0; -@@ -176,7 +176,7 @@ - return 0; - } - int nmeanings = atoi(buf+np+1); -- if (nmeanings < 0 || nmeanings > std::numeric_limits<ssize_t>::max() / sizeof(mentry)) -+ if (nmeanings < 0 || nmeanings > std::numeric_limits<int>::max() / sizeof(mentry)) - nmeanings = 0; - *pme = (mentry*)(nmeanings ? malloc(nmeanings * sizeof(mentry)) : NULL); - if (!(*pme)) { |