1 |
commit: cffaca9d5e2f7b60e2e7c9a767f958202ff2d159 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Feb 24 11:28:00 2016 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 24 11:28:00 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cffaca9d |
7 |
|
8 |
app-text/libabw: Fix build with boost-1.59, bug 575524 |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
.../libabw/files/libabw-0.1.1-boost-1.59.patch | 22 ++++++++++++++++++++++ |
13 |
app-text/libabw/libabw-0.1.1.ebuild | 1 + |
14 |
2 files changed, 23 insertions(+) |
15 |
|
16 |
diff --git a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch |
17 |
new file mode 100644 |
18 |
index 0000000..f2e745a |
19 |
--- /dev/null |
20 |
+++ b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch |
21 |
@@ -0,0 +1,22 @@ |
22 |
+From: David Tardon <dtardon@××××××.com> |
23 |
+Date: Sun, 30 Aug 2015 06:05:31 +0000 (+0200) |
24 |
+Subject: fix build with boost 1.59 |
25 |
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=ee2d0729315888d1847587ad556470d2fdc883a7;hp=7ea0b5530cf321cd80231b84421e4c107d1cc479 |
26 |
+ |
27 |
+fix build with boost 1.59 |
28 |
+ |
29 |
+Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23 |
30 |
+--- |
31 |
+ |
32 |
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am |
33 |
+index 5766f39..d12d8e2 100644 |
34 |
+--- a/src/lib/Makefile.am |
35 |
++++ b/src/lib/Makefile.am |
36 |
+@@ -26,6 +26,7 @@ generated_files = \ |
37 |
+ $(top_builddir)/src/lib/tokens.h \ |
38 |
+ $(top_builddir)/src/lib/tokenhash.h |
39 |
+ |
40 |
++libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED |
41 |
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@ |
42 |
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@ |
43 |
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) |
44 |
|
45 |
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild |
46 |
index d51442b..e11dd9b 100644 |
47 |
--- a/app-text/libabw/libabw-0.1.1.ebuild |
48 |
+++ b/app-text/libabw/libabw-0.1.1.ebuild |
49 |
@@ -31,6 +31,7 @@ PATCHES=( |
50 |
# from git master |
51 |
"${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch" |
52 |
"${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch" |
53 |
+ "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch" |
54 |
) |
55 |
|
56 |
src_configure() { |