diff options
| author | David Tardon <dtardon@redhat.com> | 2014-12-20 20:45:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-22 09:59:02 +0000 |
| commit | b550b9711cffe43c9b200c0bdf5ce70515b15ebc (patch) | |
| tree | 7639b4e6726328688eb1efa4254a2a9a411e4f3c | |
| parent | d0379e8f220941087ea025b37b0f70eb25f8de07 (diff) | |
upload libabw 0.1.1
Change-Id: Idbe25949adab4ac20613a4c14885d4b1a4c40775
(cherry picked from commit bc4bbf802fd2729ec70cd33a143d7c4c856fa317)
Reviewed-on: https://gerrit.libreoffice.org/13565
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libabw/UnpackedTarball_libabw.mk | 4 | ||||
| -rw-r--r-- | external/libabw/libabw_quote.patch.1 | 11 |
3 files changed, 2 insertions, 17 deletions
diff --git a/download.lst b/download.lst index c2e5949314db..5dbdc8fcf696 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -export ABW_MD5SUM := 9317e967c8fa8ff50e049744c4b33c87 -export ABW_TARBALL := libabw-0.1.0.tar.bz2 +export ABW_MD5SUM := 7a3815b506d064313ba309617b6f5a0b +export ABW_TARBALL := libabw-0.1.1.tar.bz2 export APACHE_COMMONS_CODEC_TARBALL := $(if $(filter TRUE,$(HAVE_JAVA6))\ ,048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip\ ,2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz\ diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index 70ac11fae7ce..6288b0ef83aa 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw)) $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_patches,libabw,\ - external/libabw/libabw_quote.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libabw/libabw_quote.patch.1 b/external/libabw/libabw_quote.patch.1 deleted file mode 100644 index 619351fcd517..000000000000 --- a/external/libabw/libabw_quote.patch.1 +++ /dev/null @@ -1,11 +0,0 @@ ---- libabw/src/lib/Makefile.in.orig 2014-06-01 21:15:14.647200000 +0200 -+++ libabw/src/lib/Makefile.in 2014-06-01 21:15:24.865200000 +0200 -@@ -716,7 +716,7 @@ - - $(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf - $(GPERF) --compare-strncmp -C -m 20 $(top_builddir)/src/lib/tokens.gperf \ -- | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" > $(top_builddir)/src/lib/tokenhash.h -+ | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h - - $(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl - perl $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \ |