1 |
commit: 9527828aa0d2513706c55063a2d04eb783d6a808 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 6 22:22:35 2016 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 22 17:06:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9527828a |
7 |
|
8 |
dev-cpp/libcmis: Add upstream patches to fix bugs 556914, 569614 |
9 |
|
10 |
All tests passed. |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
.../files/libcmis-0.5.0-boost-linking.patch | 21 +++++++++++ |
15 |
dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch | 44 ++++++++++++++++++++++ |
16 |
dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild | 18 +++++---- |
17 |
dev-cpp/libcmis/libcmis-9999.ebuild | 19 ++++++---- |
18 |
4 files changed, 87 insertions(+), 15 deletions(-) |
19 |
|
20 |
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch b/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch |
21 |
new file mode 100644 |
22 |
index 0000000..348a590 |
23 |
--- /dev/null |
24 |
+++ b/dev-cpp/libcmis/files/libcmis-0.5.0-boost-linking.patch |
25 |
@@ -0,0 +1,21 @@ |
26 |
+From b572b60a5fdc630f7f3b31dfd5dbdd1ed48659ca Mon Sep 17 00:00:00 2001 |
27 |
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@××××.fr> |
28 |
+Date: Thu, 16 Jul 2015 16:22:11 +0200 |
29 |
+Subject: [PATCH] Fix linking error when building with --with-boot |
30 |
+ |
31 |
+--- |
32 |
+ src/libcmis/Makefile.am | 1 + |
33 |
+ 1 file changed, 1 insertion(+) |
34 |
+ |
35 |
+diff --git a/src/libcmis/Makefile.am b/src/libcmis/Makefile.am |
36 |
+index 3915d45..1955ea6 100644 |
37 |
+--- a/src/libcmis/Makefile.am |
38 |
++++ b/src/libcmis/Makefile.am |
39 |
+@@ -144,6 +144,7 @@ libcmis_@LIBCMIS_API_VERSION@_la_LIBADD = \ |
40 |
+ $(XML2_LIBS) \ |
41 |
+ $(CURL_LIBS) \ |
42 |
+ $(BOOST_SMART_PTR_LIBS) \ |
43 |
++ $(BOOST_DATE_TIME_LDFLAGS) \ |
44 |
+ $(BOOST_DATE_TIME_LIBS) |
45 |
+ |
46 |
+ libcmis_@LIBCMIS_API_VERSION@_la_includedir = $(includedir)/libcmis-@LIBCMIS_API_VERSION@/libcmis |
47 |
|
48 |
diff --git a/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch b/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch |
49 |
new file mode 100644 |
50 |
index 0000000..8c89ab8 |
51 |
--- /dev/null |
52 |
+++ b/dev-cpp/libcmis/files/libcmis-0.5.0-cppcheck.patch |
53 |
@@ -0,0 +1,44 @@ |
54 |
+From 0ad3ec084d918be503a8ce971af1b54887d7726f Mon Sep 17 00:00:00 2001 |
55 |
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cedric.bosdonnat@××××.fr> |
56 |
+Date: Thu, 16 Jul 2015 16:23:06 +0200 |
57 |
+Subject: [PATCH] Getting cppcheck-test to pass again |
58 |
+ |
59 |
+--- |
60 |
+ Makefile.am | 1 + |
61 |
+ cppcheck-suppress | 3 +++ |
62 |
+ cppcheck-test.sh.in | 4 +++- |
63 |
+ 3 files changed, 7 insertions(+), 1 deletion(-) |
64 |
+ create mode 100644 cppcheck-suppress |
65 |
+ |
66 |
+diff --git a/Makefile.am b/Makefile.am |
67 |
+index ebf1f3b..9263497 100644 |
68 |
+--- a/Makefile.am |
69 |
++++ b/Makefile.am |
70 |
+@@ -35,6 +35,7 @@ EXTRA_DIST = \ |
71 |
+ COPYING.LGPL \ |
72 |
+ doc/cmis-client.xml \ |
73 |
+ cppcheck-test.sh \ |
74 |
++ cppcheck-suppress \ |
75 |
+ qa/libcmis/data |
76 |
+ |
77 |
+ if ENABLE_CPPCHECK |
78 |
+diff --git a/cppcheck-suppress b/cppcheck-suppress |
79 |
+new file mode 100644 |
80 |
+index 0000000..9ef8482 |
81 |
+--- /dev/null |
82 |
++++ b/cppcheck-suppress |
83 |
+@@ -0,0 +1,3 @@ |
84 |
++publicAllocationError:qa/libcmis/test-decoder.cxx |
85 |
++noExplicitConstructor |
86 |
++noExplicitCopyMoveConstructor |
87 |
+diff --git a/cppcheck-test.sh.in b/cppcheck-test.sh.in |
88 |
+index 20a73f8..175e0f5 100755 |
89 |
+--- a/cppcheck-test.sh.in |
90 |
++++ b/cppcheck-test.sh.in |
91 |
+@@ -1,3 +1,5 @@ |
92 |
+ #!/bin/sh |
93 |
+-@CPPCHECK@ -q --enable=style,performance,portability,information --error-exitcode=1 @SRCDIR@ |
94 |
++@CPPCHECK@ -q --enable=style,performance,portability,information \ |
95 |
++ --suppressions-list=./cppcheck-suppress \ |
96 |
++ --error-exitcode=1 @SRCDIR@ |
97 |
+ exit $? |
98 |
|
99 |
diff --git a/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild b/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild |
100 |
index 96b3308..38a6a64 100644 |
101 |
--- a/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild |
102 |
+++ b/dev-cpp/libcmis/libcmis-0.5.0-r1.ebuild |
103 |
@@ -1,4 +1,4 @@ |
104 |
-# Copyright 1999-2015 Gentoo Foundation |
105 |
+# Copyright 1999-2016 Gentoo Foundation |
106 |
# Distributed under the terms of the GNU General Public License v2 |
107 |
# $Id$ |
108 |
|
109 |
@@ -22,16 +22,12 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" |
110 |
|
111 |
IUSE="static-libs man test" |
112 |
|
113 |
-RDEPEND=" |
114 |
- !dev-cpp/libcmis:0 |
115 |
- !dev-cpp/libcmis:0.2 |
116 |
- !dev-cpp/libcmis:0.3 |
117 |
- !dev-cpp/libcmis:0.4 |
118 |
+COMMON_DEPEND=" |
119 |
dev-libs/boost:= |
120 |
dev-libs/libxml2 |
121 |
net-misc/curl |
122 |
" |
123 |
-DEPEND="${RDEPEND} |
124 |
+DEPEND="${COMMON_DEPEND} |
125 |
virtual/pkgconfig |
126 |
man? ( |
127 |
app-text/docbook2X |
128 |
@@ -42,9 +38,17 @@ DEPEND="${RDEPEND} |
129 |
dev-util/cppunit |
130 |
) |
131 |
" |
132 |
+RDEPEND="${COMMON_DEPEND} |
133 |
+ !dev-cpp/libcmis:0 |
134 |
+ !dev-cpp/libcmis:0.2 |
135 |
+ !dev-cpp/libcmis:0.3 |
136 |
+ !dev-cpp/libcmis:0.4 |
137 |
+" |
138 |
|
139 |
src_prepare() { |
140 |
epatch "${WORKDIR}/${P}-gcc5.patch" |
141 |
+ epatch "${FILESDIR}/${P}-boost-linking.patch" \ |
142 |
+ "${FILESDIR}/${P}-cppcheck.patch" |
143 |
eautoreconf |
144 |
} |
145 |
|
146 |
|
147 |
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild |
148 |
index dfc6902..c208611 100644 |
149 |
--- a/dev-cpp/libcmis/libcmis-9999.ebuild |
150 |
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild |
151 |
@@ -1,8 +1,8 @@ |
152 |
-# Copyright 1999-2015 Gentoo Foundation |
153 |
+# Copyright 1999-2016 Gentoo Foundation |
154 |
# Distributed under the terms of the GNU General Public License v2 |
155 |
# $Id$ |
156 |
|
157 |
-EAPI=5 |
158 |
+EAPI=6 |
159 |
|
160 |
EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code" |
161 |
[[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3" |
162 |
@@ -22,16 +22,12 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" |
163 |
|
164 |
IUSE="static-libs man test" |
165 |
|
166 |
-RDEPEND=" |
167 |
- !dev-cpp/libcmis:0 |
168 |
- !dev-cpp/libcmis:0.2 |
169 |
- !dev-cpp/libcmis:0.3 |
170 |
- !dev-cpp/libcmis:0.4 |
171 |
+COMMON_DEPEND=" |
172 |
dev-libs/boost:= |
173 |
dev-libs/libxml2 |
174 |
net-misc/curl |
175 |
" |
176 |
-DEPEND="${RDEPEND} |
177 |
+DEPEND="${COMMON_DEPEND} |
178 |
virtual/pkgconfig |
179 |
man? ( |
180 |
app-text/docbook2X |
181 |
@@ -42,8 +38,15 @@ DEPEND="${RDEPEND} |
182 |
dev-util/cppunit |
183 |
) |
184 |
" |
185 |
+RDEPEND="${COMMON_DEPEND} |
186 |
+ !dev-cpp/libcmis:0 |
187 |
+ !dev-cpp/libcmis:0.2 |
188 |
+ !dev-cpp/libcmis:0.3 |
189 |
+ !dev-cpp/libcmis:0.4 |
190 |
+" |
191 |
|
192 |
src_prepare() { |
193 |
+ eapply_user |
194 |
[[ ${PV} == 9999 ]] && eautoreconf |
195 |
} |