summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-02-24 12:28:00 +0100
committerAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-02-24 12:28:00 +0100
commitcffaca9d5e2f7b60e2e7c9a767f958202ff2d159 (patch)
tree79e93cc0b65485ee1c8050171a7a60214915e829 /app-text/libabw
parentdev-libs/libixion: Fix build, EAPI=6 (diff)
downloadgentoo-cffaca9d5e2f7b60e2e7c9a767f958202ff2d159.tar.gz
gentoo-cffaca9d5e2f7b60e2e7c9a767f958202ff2d159.tar.bz2
gentoo-cffaca9d5e2f7b60e2e7c9a767f958202ff2d159.zip
app-text/libabw: Fix build with boost-1.59, bug 575524
Package-Manager: portage-2.2.27
Diffstat (limited to 'app-text/libabw')
-rw-r--r--app-text/libabw/files/libabw-0.1.1-boost-1.59.patch22
-rw-r--r--app-text/libabw/libabw-0.1.1.ebuild1
2 files changed, 23 insertions, 0 deletions
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
new file mode 100644
index 00000000000..f2e745a44d2
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
@@ -0,0 +1,22 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 30 Aug 2015 06:05:31 +0000 (+0200)
+Subject: fix build with boost 1.59
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=ee2d0729315888d1847587ad556470d2fdc883a7;hp=7ea0b5530cf321cd80231b84421e4c107d1cc479
+
+fix build with boost 1.59
+
+Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23
+---
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 5766f39..d12d8e2 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -26,6 +26,7 @@ generated_files = \
+ $(top_builddir)/src/lib/tokens.h \
+ $(top_builddir)/src/lib/tokenhash.h
+
++libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild
index d51442b28cf..e11dd9b388d 100644
--- a/app-text/libabw/libabw-0.1.1.ebuild
+++ b/app-text/libabw/libabw-0.1.1.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
# from git master
"${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch"
"${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch"
+ "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
)
src_configure() {