[Libreoffice-commits] core.git: download.lst external/libabw solenv/flatpak-manifest.in

2019-08-17 Thread David Tardon (via logerrit) 
 download.lst  |4 +-
 external/libabw/UnpackedTarball_libabw.mk |4 --
 external/libabw/libabw-msvc.patch.1   |   46 --
 solenv/flatpak-manifest.in|6 +--
 4 files changed, 5 insertions(+), 55 deletions(-)

New commits:
commit 2a733f30cc994ead8cc3d1e64947bba6e8fe3924
Author: David Tardon 
AuthorDate: Sat Aug 17 16:46:47 2019 +0200
Commit: David Tardon 
CommitDate: Sat Aug 17 18:28:21 2019 +0200

upload libabw 0.1.3

Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951
Reviewed-on: https://gerrit.libreoffice.org/77639
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index 046b440cd379..2491472e574a 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-export ABW_SHA256SUM := 
0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
-export ABW_TARBALL := libabw-0.1.2.tar.xz
+export ABW_SHA256SUM := 
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
+export ABW_TARBALL := libabw-0.1.3.tar.xz
 export APACHE_COMMONS_LOGGING_SHA256SUM := 
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
 export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
 export APR_SHA256SUM := 
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 212abfbc4674..bb7e1fb4ae8c 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
-external/libabw/libabw-msvc.patch.1 \
-))
-
 ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,libabw, \
 external/libabw/ubsan-visibility.patch \
diff --git a/external/libabw/libabw-msvc.patch.1 
b/external/libabw/libabw-msvc.patch.1
deleted file mode 100644
index d14b122f9575..
--- a/external/libabw/libabw-msvc.patch.1
+++ /dev/null
@@ -1,46 +0,0 @@
-From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna 
-Date: Wed, 2 Aug 2017 14:53:36 +0200
-Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still
-
-See e.g.
-,
-on MSVC we can't depend on the value of __cplusplus, since that one is a
-too low value, even if everything else works fine.

- m4/ax_cxx_compile_stdcxx.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff -Naur a/configure b/configure
 a/configure2017-08-02 14:50:09.0 +0200
-+++ b/configure2017-08-02 14:50:57.0 +0200
-@@ -16001,7 +16001,7 @@
- 
- #error "This is not a C++ compiler"
- 
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
- 
- #error "This is not a C++11 compiler"
- 
-@@ -16314,7 +16314,7 @@
- 
- #error "This is not a C++ compiler"
- 
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
- 
- #error "This is not a C++11 compiler"
- 
-@@ -16636,7 +16636,7 @@
- 
- #error "This is not a C++ compiler"
- 
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
- 
- #error "This is not a C++11 compiler"
- 
--- 
-2.12.3
-
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ba51f89fb7af..c4a36fc0d8dc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -203,10 +203,10 @@
 "dest-filename": 
"external/tarballs/libgpg-error-1.27.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz;,
-"sha256": 
"0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485",
+"url": 
"https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz;,
+"sha256": 
"e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed",
 "type": "file",
-"dest-filename": "external/tarballs/libabw-0.1.2.tar.xz"
+"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libabw solenv/flatpak-manifest.in

2018-01-06 Thread David Tardon 
 download.lst  |4 +-
 external/libabw/ExternalProject_libabw.mk |3 -
 external/libabw/UnpackedTarball_libabw.mk |4 ++
 external/libabw/libabw-msvc.patch.1   |   46 ++
 solenv/flatpak-manifest.in|6 +--
 5 files changed, 56 insertions(+), 7 deletions(-)

New commits:
commit f04ad5673a9de1eda94ed3ae5719d8b761da80bb
Author: David Tardon 
Date:   Tue Jan 2 09:54:19 2018 +0100

upload libabw 0.1.2

Change-Id: I972ff9e0dbb73f6a38c886e1acd03cc4d62da2ec
Reviewed-on: https://gerrit.libreoffice.org/47251
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index 6e2be6621236..d2b8140c4e0e 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-export ABW_SHA256SUM := 
7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199
-export ABW_TARBALL := libabw-0.1.1.tar.bz2
+export ABW_SHA256SUM := 
0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
+export ABW_TARBALL := libabw-0.1.2.tar.xz
 export APACHE_COMMONS_LOGGING_SHA256SUM := 
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
 export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
 export APR_SHA256SUM := 
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
diff --git a/external/libabw/ExternalProject_libabw.mk 
b/external/libabw/ExternalProject_libabw.mk
index d8e4d112ea35..c8c2bd2e9882 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
-   CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) \
-   -DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
+   CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 7b9ba49e7e69..27195d3a0ab3 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
+external/libabw/libabw-msvc.patch.1 \
+))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libabw, \
diff --git a/external/libabw/libabw-msvc.patch.1 
b/external/libabw/libabw-msvc.patch.1
new file mode 100644
index ..d14b122f9575
--- /dev/null
+++ b/external/libabw/libabw-msvc.patch.1
@@ -0,0 +1,46 @@
+From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Wed, 2 Aug 2017 14:53:36 +0200
+Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still
+
+See e.g.
+,
+on MSVC we can't depend on the value of __cplusplus, since that one is a
+too low value, even if everything else works fine.
+---
+ m4/ax_cxx_compile_stdcxx.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff -Naur a/configure b/configure
+--- a/configure2017-08-02 14:50:09.0 +0200
 b/configure2017-08-02 14:50:57.0 +0200
+@@ -16001,7 +16001,7 @@
+ 
+ #error "This is not a C++ compiler"
+ 
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+ 
+ #error "This is not a C++11 compiler"
+ 
+@@ -16314,7 +16314,7 @@
+ 
+ #error "This is not a C++ compiler"
+ 
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+ 
+ #error "This is not a C++11 compiler"
+ 
+@@ -16636,7 +16636,7 @@
+ 
+ #error "This is not a C++ compiler"
+ 
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+ 
+ #error "This is not a C++11 compiler"
+ 
+-- 
+2.12.3
+
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index b5af365cde4e..b9eaa71beb67 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -182,10 +182,10 @@
 "dest-filename": 
"external/tarballs/libgpg-error-1.27.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2;,
-"sha256":

[Libreoffice-commits] core.git: download.lst external/libabw

2014-12-20 Thread David Tardon 
 download.lst  |4 ++--
 external/libabw/UnpackedTarball_libabw.mk |4 
 external/libabw/libabw_quote.patch.1  |   11 ---
 3 files changed, 2 insertions(+), 17 deletions(-)

New commits:
commit bc4bbf802fd2729ec70cd33a143d7c4c856fa317
Author: David Tardon dtar...@redhat.com
Date:   Sat Dec 20 20:45:45 2014 +0100

upload libabw 0.1.1

Change-Id: Idbe25949adab4ac20613a4c14885d4b1a4c40775

diff --git a/download.lst b/download.lst
index 2bb91ca..fc2941a 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 70ac11f..6288b0e 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 619351f..000
--- a/external/libabw/libabw_quote.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
 libabw/src/lib/Makefile.in.orig2014-06-01 21:15:14.64720 +0200
-+++ libabw/src/lib/Makefile.in 2014-06-01 21:15:24.86520 +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 
\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libabw

2014-02-10 Thread David Tardon 
 download.lst   |4 
 external/libabw/UnpackedTarball_libabw.mk  |6 -
 external/libabw/libabw-0.0.1-badtable.patch.1  |  100 -
 external/libabw/libabw-0.0.1-inttypes.patch.1  |   36 --
 external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 |   11 -
 5 files changed, 2 insertions(+), 155 deletions(-)

New commits:
commit baa84c47a1637898560162ef5d24530eef81b10d
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 10 16:05:56 2014 +0100

upload libabw 0.0.2

Change-Id: I2b73c5546e767030344f787efb9a9cafa9635ad3

diff --git a/download.lst b/download.lst
index 19615f6..cea2517 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
-export ABW_TARBALL := libabw-0.0.1.tar.bz2
+ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d
+export ABW_TARBALL := libabw-0.0.2.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 8e28755..6288b0e 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,10 +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-0.0.1-inttypes.patch.1 \
-   external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \
-   external/libabw/libabw-0.0.1-badtable.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-badtable.patch.1 
b/external/libabw/libabw-0.0.1-badtable.patch.1
deleted file mode 100644
index ddb0c8f..000
--- a/external/libabw/libabw-0.0.1-badtable.patch.1
+++ /dev/null
@@ -1,100 +0,0 @@
 a/src/lib/ABWContentCollector.cpp
-+++ b/src/lib/ABWContentCollector.cpp
-@@ -1492,26 +1492,32 @@ void libabw::ABWContentCollector::closeTable()
- 
- void libabw::ABWContentCollector::openCell(const char *props)
- {
--  if (props)
--parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
--  int currentRow(0);
--  if (!findInt(_findCellProperty(top-attach), currentRow))
--currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
--  while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
-+  if (!m_ps-m_tableStates.empty())
-   {
--if (m_ps-m_tableStates.top().m_currentTableRow = 0)
--  _closeTableRow();
--_openTableRow();
--  }
-+if (props)
-+  parsePropString(props, 
m_ps-m_tableStates.top().m_currentCellProperties);
-+int currentRow(0);
-+if (!findInt(_findCellProperty(top-attach), currentRow))
-+  currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
-+while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
-+{
-+  if (m_ps-m_tableStates.top().m_currentTableRow = 0)
-+_closeTableRow();
-+  _openTableRow();
-+}
- 
--  if (!findInt(_findCellProperty(left-attach), 
m_ps-m_tableStates.top().m_currentTableCol))
--m_ps-m_tableStates.top().m_currentTableCol++;
-+if (!findInt(_findCellProperty(left-attach), 
m_ps-m_tableStates.top().m_currentTableCol))
-+  m_ps-m_tableStates.top().m_currentTableCol++;
-+  }
- }
- 
- void libabw::ABWContentCollector::closeCell()
- {
--  _closeTableCell();
--  m_ps-m_tableStates.top().m_currentCellProperties.clear();
-+  if (!m_ps-m_tableStates.empty())
-+  {
-+_closeTableCell();
-+m_ps-m_tableStates.top().m_currentCellProperties.clear();
-+  }
- }
- 
- void libabw::ABWContentCollector::collectData(const char *, const char *, 
const WPXBinaryData )
 a/src/lib/ABWStylesCollector.cpp
-+++ b/src/lib/ABWStylesCollector.cpp
-@@ -167,28 +167,32 @@ void libabw::ABWStylesCollector::closeTable()
- 
- void libabw::ABWStylesCollector::openCell(const char *props)
- {
--  if (props)
--parsePropString(props, m_ps-m_tableStates.top().m_currentCellProperties);
--  int currentRow(0);
--  if (!findInt(_findCellProperty(top-attach), currentRow))
--currentRow = m_ps-m_tableStates.top().m_currentTableRow + 1;
--  while (m_ps-m_tableStates.top().m_currentTableRow  currentRow)
--m_ps-m_tableStates.top().m_currentTableRow++;
--
--  if (!m_ps-m_tableStates.empty()  0 == 
m_ps-m_tableStates.top().m_currentTableRow)
-+  if (!m_ps-m_tableStates.empty())
-   {
--int leftAttach(0);
--int rightAttach(0);
--if (findInt(_findCellProperty(left-attach), leftAttach)  
findInt(_findCellProperty(right-attach), rightAttach))
--  m_ps-m_tableStates.top().m_currentTableWidth += rightAttach - 
leftAttach;
--else
--  m_ps-m_tableStates.top().m_currentTableWidth++;
-+if (props)
-+  parsePropString(props, 
m_ps-m_tableStates.top().m_currentCellProperties);
-+int currentRow(0);
-+if

[Libreoffice-commits] core.git: download.lst external/libabw filter/source

2014-01-15 Thread Fridrich Štrba 
 download.lst |4 
 external/libabw/ExternalProject_libabw.mk|3 
 external/libabw/UnpackedTarball_libabw.mk|6 
 external/libabw/libabw-0.0.0-footendnote.patch.1 |  101 
--
 external/libabw/libabw-0.0.0-listshape.patch.1   |   67 --
 external/libabw/libabw-0.0.0-mimetype.patch.1|   13 -
 filter/source/config/fragments/types/writer_AbiWord_Document.xcu |2 
 7 files changed, 4 insertions(+), 192 deletions(-)

New commits:
commit 838c8889491b7e5b08f681b7f85740784c0c1a3b
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jan 15 13:57:57 2014 +0100

Uploading libabw-0.0.1 (support of zabw files too)

Change-Id: Ie04cae9b9a362cb43b671fe8986545865822a953

diff --git a/download.lst b/download.lst
index dad1352..acbe37b 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-ABW_MD5SUM := dffe43760ff660c831c9a89c992dd18c
-export ABW_TARBALL := libabw-0.0.0.tar.bz2
+ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
+export ABW_TARBALL := libabw-0.0.1.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
diff --git a/external/libabw/ExternalProject_libabw.mk 
b/external/libabw/ExternalProject_libabw.mk
index 5d6b62d..d3b3b9f 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_use_externals,libabw,\
boost_headers \
libxml2 \
wpd \
+   zlib \
 ))
 
 $(call gb_ExternalProject_get_state_target,libabw,build) :
@@ -35,8 +36,6 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call 
gb_UnpackedTarball_get_dir,boost) 
-I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call 
gb_UnpackedTarball_get_dir,xml2)/include) \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-   LIBXML2_CFLAGS=$(LIBXML_CFLAGS) \
-   LIBXML2_LIBS=$(LIBXML_LIBS) \
 (cd $(EXTERNAL_WORKDIR)/src/lib  \
$(if $(VERBOSE)$(verbose),V=1) \
$(MAKE)) \
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 843100c..6288b0e 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,10 +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-0.0.0-footendnote.patch.1 \
-   external/libabw/libabw-0.0.0-listshape.patch.1 \
-   external/libabw/libabw-0.0.0-mimetype.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.0-footendnote.patch.1 
b/external/libabw/libabw-0.0.0-footendnote.patch.1
deleted file mode 100644
index 4c9e813..000
--- a/external/libabw/libabw-0.0.0-footendnote.patch.1
+++ /dev/null
@@ -1,101 +0,0 @@
 a/src/lib/ABWContentCollector.cpp
-+++ b/src/lib/ABWContentCollector.cpp
-@@ -289,6 +289,7 @@ libabw::ABWContentParsingState::ABWContentParsingState() :
-   m_isSpanOpened(false),
-   m_isParagraphOpened(false),
-   m_isListElementOpened(false),
-+  m_inParagraphOrListElement(false),
- 
-   m_currentSectionStyle(),
-   m_currentParagraphStyle(),
-@@ -334,6 +335,7 @@ 
libabw::ABWContentParsingState::ABWContentParsingState(const ABWContentParsingSt
-   m_isSpanOpened(ps.m_isSpanOpened),
-   m_isParagraphOpened(ps.m_isParagraphOpened),
-   m_isListElementOpened(ps.m_isListElementOpened),
-+  m_inParagraphOrListElement(ps.m_inParagraphOrListElement),
- 
-   m_currentSectionStyle(ps.m_currentSectionStyle),
-   m_currentParagraphStyle(ps.m_currentParagraphStyle),
-@@ -500,6 +502,7 @@ void 
libabw::ABWContentCollector::collectParagraphProperties(const char *level,
- parsePropString(props, tmpProps);
-   for (std::mapstd::string, std::string::const_iterator iter = 
tmpProps.begin(); iter != tmpProps.end(); ++iter)
- m_ps-m_currentParagraphStyle[iter-first] = iter-second;
-+  m_ps-m_inParagraphOrListElement = true;
- }
- 
- void libabw::ABWContentCollector::collectCharacterProperties(const char 
*style, const char *props)
-@@ -748,6 +751,7 @@ void 
libabw::ABWContentCollector::closeParagraphOrListElement()
-   _closeParagraph();
-   _closeListElement();
-   m_ps-m_currentParagraphStyle.clear();
-+  m_ps-m_inParagraphOrListElement = false;
- }
- 
- void libabw::ABWContentCollector::openLink(const char *href)
-@@ -807,6 +811,8 @@ void libabw::ABWContentCollector::insertPageBreak()
- 
- void