| 1 |
commit: 3bbf650cf065f002737003db2e0452b6e89255e5 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Feb 6 21:51:53 2016 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 22 17:05:58 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bbf650c |
| 7 |
|
| 8 |
media-libs/libcdr: Fix build with boost-1.59 (bug 574120) |
| 9 |
|
| 10 |
KEYWORDS: Dropped ppc (missing in librevenge) |
| 11 |
Also drop base.eclass |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.27 |
| 14 |
|
| 15 |
.../libcdr/files/libcdr-0.1.1-boost-1.59.patch | 32 ++++++++++++++++++++++ |
| 16 |
media-libs/libcdr/libcdr-0.1.0.ebuild | 11 ++++---- |
| 17 |
media-libs/libcdr/libcdr-0.1.1.ebuild | 11 ++++---- |
| 18 |
...{libcdr-0.1.2.ebuild => libcdr-0.1.2-r1.ebuild} | 8 +++--- |
| 19 |
media-libs/libcdr/libcdr-9999.ebuild | 8 +++--- |
| 20 |
5 files changed, 52 insertions(+), 18 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch b/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch |
| 23 |
new file mode 100644 |
| 24 |
index 0000000..e32f3fe |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-libs/libcdr/files/libcdr-0.1.1-boost-1.59.patch |
| 27 |
@@ -0,0 +1,32 @@ |
| 28 |
+From 882a4b3f83a4b5097da53670c720a26f4e2750eb Mon Sep 17 00:00:00 2001 |
| 29 |
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@×××××××.ch> |
| 30 |
+Date: Sun, 13 Dec 2015 20:37:16 +0100 |
| 31 |
+Subject: [PATCH] Some boost 1.59 fixes |
| 32 |
+ |
| 33 |
+Change-Id: I0054c977a6d8ff5a9b93c147578e890476365999 |
| 34 |
+--- |
| 35 |
+ src/lib/Makefile.am | 11 +++++++++-- |
| 36 |
+ 1 file changed, 9 insertions(+), 2 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am |
| 39 |
+index 3f00cc5..e14fa8c 100644 |
| 40 |
+--- a/src/lib/Makefile.am |
| 41 |
++++ b/src/lib/Makefile.am |
| 42 |
+@@ -13,8 +13,16 @@ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \ |
| 43 |
+ $(top_srcdir)/inc/libcdr/CDRDocument.h \ |
| 44 |
+ $(top_srcdir)/inc/libcdr/CMXDocument.h |
| 45 |
+ |
| 46 |
+-AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1 |
| 47 |
++AM_CXXFLAGS = -I$(top_srcdir)/inc \ |
| 48 |
++ $(REVENGE_CFLAGS) \ |
| 49 |
++ $(LCMS2_CFLAGS) \ |
| 50 |
++ $(ZLIB_CFLAGS) \ |
| 51 |
++ $(ICU_CFLAGS) \ |
| 52 |
++ $(DEBUG_CXXFLAGS) \ |
| 53 |
++ -DLIBCDR_BUILD=1 \ |
| 54 |
++ -DBOOST_ERROR_CODE_HEADER_ONLY \ |
| 55 |
++ -DBOOST_SYSTEM_NO_DEPRECATED |
| 56 |
+ |
| 57 |
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@ |
| 58 |
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = @LIBCDR_WIN32_RESOURCE@ |
| 59 |
+ libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined |
| 60 |
|
| 61 |
diff --git a/media-libs/libcdr/libcdr-0.1.0.ebuild b/media-libs/libcdr/libcdr-0.1.0.ebuild |
| 62 |
index 3484f9b..da99f3d 100644 |
| 63 |
--- a/media-libs/libcdr/libcdr-0.1.0.ebuild |
| 64 |
+++ b/media-libs/libcdr/libcdr-0.1.0.ebuild |
| 65 |
@@ -1,12 +1,12 @@ |
| 66 |
-# Copyright 1999-2015 Gentoo Foundation |
| 67 |
+# Copyright 1999-2016 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
# $Id$ |
| 70 |
|
| 71 |
EAPI=5 |
| 72 |
|
| 73 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/" |
| 74 |
-inherit base eutils |
| 75 |
-[[ ${PV} == 9999 ]] && inherit autotools git-2 |
| 76 |
+inherit autotools eutils |
| 77 |
+[[ ${PV} == 9999 ]] && inherit git-r3 |
| 78 |
|
| 79 |
DESCRIPTION="Library parsing the Corel cdr documents" |
| 80 |
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" |
| 81 |
@@ -32,9 +32,10 @@ DEPEND="${RDEPEND} |
| 82 |
" |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
- base_src_prepare |
| 86 |
+ epatch "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch" |
| 87 |
+ epatch_user |
| 88 |
[[ -d m4 ]] || mkdir "m4" |
| 89 |
- [[ ${PV} == 9999 ]] && eautoreconf |
| 90 |
+ eautoreconf |
| 91 |
} |
| 92 |
|
| 93 |
src_configure() { |
| 94 |
|
| 95 |
diff --git a/media-libs/libcdr/libcdr-0.1.1.ebuild b/media-libs/libcdr/libcdr-0.1.1.ebuild |
| 96 |
index 158c828..c7dba09 100644 |
| 97 |
--- a/media-libs/libcdr/libcdr-0.1.1.ebuild |
| 98 |
+++ b/media-libs/libcdr/libcdr-0.1.1.ebuild |
| 99 |
@@ -1,12 +1,12 @@ |
| 100 |
-# Copyright 1999-2015 Gentoo Foundation |
| 101 |
+# Copyright 1999-2016 Gentoo Foundation |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
# $Id$ |
| 104 |
|
| 105 |
EAPI=5 |
| 106 |
|
| 107 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/" |
| 108 |
-inherit base eutils |
| 109 |
-[[ ${PV} == 9999 ]] && inherit autotools git-2 |
| 110 |
+inherit autotools eutils |
| 111 |
+[[ ${PV} == 9999 ]] && inherit git-r3 |
| 112 |
|
| 113 |
DESCRIPTION="Library parsing the Corel cdr documents" |
| 114 |
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" |
| 115 |
@@ -32,9 +32,10 @@ DEPEND="${RDEPEND} |
| 116 |
" |
| 117 |
|
| 118 |
src_prepare() { |
| 119 |
- base_src_prepare |
| 120 |
+ epatch "${FILESDIR}/${PN}-0.1.1-boost-1.59.patch" |
| 121 |
+ epatch_user |
| 122 |
[[ -d m4 ]] || mkdir "m4" |
| 123 |
- [[ ${PV} == 9999 ]] && eautoreconf |
| 124 |
+ eautoreconf |
| 125 |
} |
| 126 |
|
| 127 |
src_configure() { |
| 128 |
|
| 129 |
diff --git a/media-libs/libcdr/libcdr-0.1.2.ebuild b/media-libs/libcdr/libcdr-0.1.2-r1.ebuild |
| 130 |
similarity index 91% |
| 131 |
rename from media-libs/libcdr/libcdr-0.1.2.ebuild |
| 132 |
rename to media-libs/libcdr/libcdr-0.1.2-r1.ebuild |
| 133 |
index b0fd8db..d818832 100644 |
| 134 |
--- a/media-libs/libcdr/libcdr-0.1.2.ebuild |
| 135 |
+++ b/media-libs/libcdr/libcdr-0.1.2-r1.ebuild |
| 136 |
@@ -2,11 +2,11 @@ |
| 137 |
# Distributed under the terms of the GNU General Public License v2 |
| 138 |
# $Id$ |
| 139 |
|
| 140 |
-EAPI=5 |
| 141 |
+EAPI=6 |
| 142 |
|
| 143 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/" |
| 144 |
-inherit base eutils |
| 145 |
-[[ ${PV} == 9999 ]] && inherit autotools git-2 |
| 146 |
+inherit eutils |
| 147 |
+[[ ${PV} == 9999 ]] && inherit autotools git-r3 |
| 148 |
|
| 149 |
DESCRIPTION="Library parsing the Corel cdr documents" |
| 150 |
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" |
| 151 |
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND} |
| 152 |
" |
| 153 |
|
| 154 |
src_prepare() { |
| 155 |
- base_src_prepare |
| 156 |
+ eapply_user |
| 157 |
[[ -d m4 ]] || mkdir "m4" |
| 158 |
[[ ${PV} == 9999 ]] && eautoreconf |
| 159 |
} |
| 160 |
|
| 161 |
diff --git a/media-libs/libcdr/libcdr-9999.ebuild b/media-libs/libcdr/libcdr-9999.ebuild |
| 162 |
index b0fd8db..d818832 100644 |
| 163 |
--- a/media-libs/libcdr/libcdr-9999.ebuild |
| 164 |
+++ b/media-libs/libcdr/libcdr-9999.ebuild |
| 165 |
@@ -2,11 +2,11 @@ |
| 166 |
# Distributed under the terms of the GNU General Public License v2 |
| 167 |
# $Id$ |
| 168 |
|
| 169 |
-EAPI=5 |
| 170 |
+EAPI=6 |
| 171 |
|
| 172 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libcdr/" |
| 173 |
-inherit base eutils |
| 174 |
-[[ ${PV} == 9999 ]] && inherit autotools git-2 |
| 175 |
+inherit eutils |
| 176 |
+[[ ${PV} == 9999 ]] && inherit autotools git-r3 |
| 177 |
|
| 178 |
DESCRIPTION="Library parsing the Corel cdr documents" |
| 179 |
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" |
| 180 |
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND} |
| 181 |
" |
| 182 |
|
| 183 |
src_prepare() { |
| 184 |
- base_src_prepare |
| 185 |
+ eapply_user |
| 186 |
[[ -d m4 ]] || mkdir "m4" |
| 187 |
[[ ${PV} == 9999 ]] && eautoreconf |
| 188 |
} |
Archives