diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-05 12:51:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-05 12:57:43 +0100 |
| commit | 54d9022c39cf6a6cd8610a49dd767583ef2ff444 (patch) | |
| tree | 40517730f0ea76dc9becf8af5b1872ddf523e742 /libexttextcat | |
| parent | 6be6700edb3b704d62d8b331ba95f227617c57d3 (diff) | |
bump libexttextcat
Change-Id: If6a89aa46a4252e2652062288f19173267daf03a
Diffstat (limited to 'libexttextcat')
| -rw-r--r-- | libexttextcat/UnpackedTarball_exttextcat.mk | 5 | ||||
| -rw-r--r-- | libexttextcat/android.patch | 20 | ||||
| -rw-r--r-- | libexttextcat/exttextcat-memcpy.patch.1 | 16 |
3 files changed, 0 insertions, 41 deletions
diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk b/libexttextcat/UnpackedTarball_exttextcat.mk index 1bf53fb1c567..9a272b5720e3 100644 --- a/libexttextcat/UnpackedTarball_exttextcat.mk +++ b/libexttextcat/UnpackedTarball_exttextcat.mk @@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat)) $(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\ - libexttextcat/android.patch \ - libexttextcat/exttextcat-memcpy.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libexttextcat/android.patch b/libexttextcat/android.patch deleted file mode 100644 index 467caba7b266..000000000000 --- a/libexttextcat/android.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- misc/libexttextcat-3.4.0/config.sub -+++ misc/build/libexttextcat-3.4.0/config.sub -@@ -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* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) -@@ -1250,7 +1250,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/libexttextcat/exttextcat-memcpy.patch.1 b/libexttextcat/exttextcat-memcpy.patch.1 deleted file mode 100644 index b3e399a36072..000000000000 --- a/libexttextcat/exttextcat-memcpy.patch.1 +++ /dev/null @@ -1,16 +0,0 @@ -fix overlapped memcpy in heapextract - ---- a/src/fingerprint.c 2013-07-04 22:53:25.674741538 +0200 -+++ b/src/fingerprint.c 2013-07-04 22:54:09.009741166 +0200 -@@ -254,7 +254,10 @@ - p = &(t->heap[0]); - - memcpy(item, p, sizeof(entry_t)); -- memcpy(&(t->heap[0]), &(t->heap[t->size - 1]), sizeof(entry_t)); -+ if (t->size > 1) -+ { -+ memcpy(&(t->heap[0]), &(t->heap[t->size - 1]), sizeof(entry_t)); -+ } - - siftdown(t, t->size, 0); - t->size--; |