download.lst | 2 +-
libexttextcat/UnpackedTarball_exttextcat.mk | 5 -----
libexttextcat/android.patch | 20 --------------------
libexttextcat/exttextcat-memcpy.patch.1 | 16 ----------------
4 files changed, 1 insertion(+), 42 deletions(-)
New commits:
commit 54d9022c39cf6a6cd8610a49dd767583ef2ff444
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jul 5 12:51:24 2013 +0100
bump libexttextcat
Change-Id: If6a89aa46a4252e2652062288f19173267daf03a
diff --git a/download.lst b/download.lst
index 9d73b8d..e5b5704 100644
--- a/download.lst
+++ b/download.lst
@@ -56,7 +56,7 @@ export JFREEREPORT_SAC_TARBALL :=
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.z
export JPEG_TARBALL := a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
export LANGUAGETOOL_TARBALL :=
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
export LCMS2_TARBALL := 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
-export LIBEXTTEXTCAT_TARBALL :=
dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2
+export LIBEXTTEXTCAT_TARBALL :=
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
export LIBLANGTAG_TARBALL :=
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
export LIBXMLSEC_TARBALL :=
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
export LIBXML_TARBALL := 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk
b/libexttextcat/UnpackedTarball_exttextcat.mk
index 1bf53fb..9a272b5 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 467caba..0000000
--- 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 b3e399a..0000000
--- 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--;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
