add arm patch

Package-Manager: portage-2.2.0_alpha188
RepoMan-Options: --force
This commit is contained in:
Mario Fetka 2013-11-22 09:15:19 +01:00
parent 27338ee5e3
commit 217fc3cde4
3 changed files with 50 additions and 1 deletions

View File

@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
22 Nov 2013; Mario Fetka <mario.fetka@gmail.com>
+files/7.1.7.42779/zarafa-7.0.8-va_list.patch:
add arm patch
*zarafa-7.1.7.42779 (12 Oct 2013)
12 Oct 2013; Mario Fetka <mario.fetka@gmail.com>

View File

@ -21,6 +21,7 @@ AUX 7.1.7.42779/zarafa-22-gcc47.patch 6805 SHA256 00a70d2e2b73ff81081302247e7a2a
AUX 7.1.7.42779/zarafa-23-newclucene.patch 6766 SHA256 794e0b8db4d8775a34d04a758aeb19ae6c50255955d78a2e0ecbadee8a7add50 SHA512 96d399ee72347d35f5b580f7760a729955d746937a0f56347d1558405064642a84803e39322816faa865ce0bf80aa5a6d576f3efc88bb81c8292e2f7c411608c WHIRLPOOL 781ee12b336f5410049b6454f2c671c9ec7e83f30684f4263814663bb4ae840e4cd24f89126cb06742ef184d1225497b37451305711c70157084415e624bd044
AUX 7.1.7.42779/zarafa-24-undefined-behavior.patch 1002 SHA256 f3156cd7f17a7c3feaa66cbb52f8d4d1a3d22135054d6131cb76784b2f2dcb0b SHA512 3b67835052cfffa071e0f5a06de9b12c5018ced84a4bc48ada54d5eb1da2fa63fa7274882e70b43fcc3780c74bd6b216fdf26fa38a4633238a8dae0ca53e39bc WHIRLPOOL 6530d5caef06c007eb7b0941c4c6274cfd1dc1860f88a8037f540b7626dca90147ffd9595fad8c74015283a7b466c9450e8f7eb621673b1743eafa9502a23edd
AUX 7.1.7.42779/zarafa-7.0.3-sysconfig2confd-1.patch 4843 SHA256 c9196a886f8435dcb2f82b92c6ee4769daf1eeb76b2fdfad4980a88cff461359 SHA512 6b683018a834ca666b0c96226a63280f3a3cde5e1e392e1e9f5681fa870669bbff27ebd719390aeebf670bcf3ba7b05ef0c27a77a039c0099fdc97dec4f0f36d WHIRLPOOL dd8e19057dc40785bee25846b399fec8ec5b61fd43586361a5131ef2a9f3e1dcd36db8290e7a0695b6a0a2fa01dca42581dc8e517bafe9290008f3ec38c3a372
AUX 7.1.7.42779/zarafa-7.0.8-va_list.patch 1550 SHA256 cb2ebbd61a1eb304f3d674b0d463cc3b0d8f325e3926c7f16308868ac420ad1d SHA512 6f77181ec0a5f9d6774ebd928cb47c73c35923d158266827d9b23c55b9d70dfc45247d944dc78e5e5d915670e9d8df0d2d19c0b1509139533cc371e92582bf8a WHIRLPOOL d0400e15358caae2e7a627f83d1ae4c72353b16995ec1b07db4327fca08e0dd873df19bbe1f0f2346c7e3f5554d3cb838dee1bf4e17b9f10060fce834aa29eb9
AUX 7.1.7.42779/zarafa-7.1.4-tcmalloc.patch 679 SHA256 3f982a2a37a42092a4878c7d7af0b235ae8327f26c0f5fe0ea253cbfcc236018 SHA512 086cbabb7d87ee3218de76f3f42cf3fcd9e1abdc289c6a9280556e3ef8812142da68dadb2e0d4da3355382fea27f3f3f3a37d943ef926f064d4bc9f0884c78de WHIRLPOOL 8e1d57b82d896127b384159ebb4b19457a3431250af1029d5cf214f5492f8f78b3c3baa8cf12baa39b2dbeddfa5672c4d5ce97b6a44bf230469d6074a02c829b
AUX 7.1.7.42779/zarafa-7.1.5-gentoo-swig1.3.patch 621 SHA256 12666f1a041d4dde86577860c96fd7ca67f6e2ce33b981e8f57ac336bba48f19 SHA512 419b4f0b12ab18ec140e2d829a1355236f2fbecfa4c26262c7044142a6c56299e053cff4a21a50e5793b45419431c078080f8ff4dc715ad89725aa9921e320fa WHIRLPOOL 8adbad8396d1151942ea78daf52a11f050d59fabe476159afac86c7178e01733cf9848a163031663fdbf7858994c569318495181a196e710a06d54b621185908
AUX junklearn.dspam 924 SHA256 5060aa1c0fd3e103c0243f5372ec4a393d4aebc7ed7c69a9475adead50d6b37e SHA512 43321b5245a5a6b6032fe8f34382826dbc3630e03ff43eda5c41d5782e0df72a2e784638e3047ba141141e4d3d99ef11e555117fb77fc2555e3ce07c7b28f65c WHIRLPOOL 983c2d5c87145a38bb87044cb6b9050092fa7c05bfa6de5317890103663550a86ccdb5af71966e86062943f5e39b6fbb990617048380aab94920602ed5b9d214
@ -66,5 +67,5 @@ DIST zcp-7.1.7-42779-ubuntu-12.04-x86_64-free.tar.gz 44458878 SHA256 fec8a131a4b
DIST zcp-7.1.7.tar.gz 6458814 SHA256 61aa2fb1180e061afc733e1b911ae08aa7c923be8759af4e3b5bcdc851be108e SHA512 cd631d87b58f7131ad3865e8dd89f92c236d48651375d9443a67208768954bae43f3a1a332b587a601948b19ec38c4317df6164110c9cb64e911d7388ffb2d1b WHIRLPOOL 3ffb588d016a8e41e642e7619fe77bfdb1128bf8385f8ab809534b89617a941f70af529fc7573c7efebba60aac65b7e6131d910ddf8d632736a5b40e72a3dbbe
EBUILD zarafa-7.1.5.42059.ebuild 7515 SHA256 adaf2c5273e36ade2f8fdbf1ff482dd86dee4f7c065a2381a7f6427cff24db9a SHA512 ceece57ed8df3cf3bf4a539da0f69f1f796de8501cb1a600b0cfb9f2ee613c8b427433f51f62244c39820fff9320d7a0d2a719eca4506774986dec9c2973cd36 WHIRLPOOL bdd33cad7e3d2601d40a8e24be46933a60893c8b8630bbbcb10451728fccb7e5ed505c2a6bfa09960741616a2362b2537a467526906ddb8d12b85b7ddefed54c
EBUILD zarafa-7.1.7.42779.ebuild 7546 SHA256 79ec1f68a5582c9670c8213162b0f163462ba8047cb14ca3b9fe8f09140984a1 SHA512 af3dd84248c8c0e500f88992950da0e266b057fba563b02ce2720e2a4ed58b399ec58b62e359d256fac5605cefed94a28ccf6f7f34aea0388f47ffe5742fbbcb WHIRLPOOL b48bdf2b8e0eaf9deb35091e989532ade33dc7852bdc90fd6ca38a3422d45fe48445d9ffef062f24c35793fe81ecfcbf9617e44ea3112c3ac7a5018f2cd01121
MISC ChangeLog 25056 SHA256 9fb5ff1457156c2304ebe940d3c086a24c734f86dc3621ee7fa52d2b1aefd584 SHA512 ea61ae5d59a861f6858b010c48a4e8d9eceb2e690c121c1071be2b9ef54fa736b8fd95f513693380ee3779ff1d94b14979f235d8a8e753a3697a2c84c2a4c86c WHIRLPOOL 570189b698f296f7e7b249b883a58ccd96704e9ed89395a2243d0b076feb45923a096d1511f83d920c4417e830c184d7b918b8476933bae316b2abdab0a044c1
MISC ChangeLog 25173 SHA256 8f0570878ebc5e4677cf5cec5dbfb448c4d0fecfb9ce4274c9a3393b5dd3acce SHA512 78d6a2e082f59500a6bc1e6e5d6594e71d45adcf64a926859347831269c6f0e1cadea4df885ffecc27ec5bacf3c97d91bba5a05aa681a7d48d0b1575a50c15cc WHIRLPOOL 252e7e0f92b7d79d28448913627f7374d7e9a5447d8d8bae265941391c483c1875d00f55090222e1b2c7a2229b2a412ad60e9d45cd7f769859512baae8a174ca
MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9

View File

@ -0,0 +1,44 @@
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 7.0.8, which works
around the insane written C/C++ code. I am not a C/C++ developer, but you only can
use four macros for handling va_list at all: va_start, va_arg, va_copy and va_end.
As a developer you should not assume that va_list is always internally typed as an
integer because it is case on i?86 and x86_64 for example. Architectures like ARM
handle va_list not as an integer and thus fail during compiling like this:
Trace.cpp:129:16: error: invalid operands of types 'va_list {aka __va_list}' and
'int' to binary 'operator!='
Trace.cpp:142:16: error: invalid operands of types 'va_list {aka __va_list}' and
'int' to binary 'operator!='
As it is unfortunately not safe to assume that format does not contain attributes
while va is empty this workaround is only applied on the affected ARM architecture
for now. The only real solution is a clean rewrite of the code that should happen
upstream.
--- zarafa-7.0.8/common/Trace.cpp 2012-06-18 18:55:29.000000000 +0200
+++ zarafa-7.0.8/common/Trace.cpp.va_list 2012-06-20 01:20:06.000000000 +0200
@@ -126,7 +126,11 @@
len = pos + 3;
+#if defined __ARM_EABI__
+ if (format) {
+#else
if (format && va) {
+#endif
va_copy(va_lentest, va);
len += _vsnprintf(NULL, 0, format, va_lentest);
va_end(va_lentest);
@@ -139,7 +143,11 @@
memcpy(buffer, debug, pos);
+#if defined __ARM_EABI__
+ if (format)
+#else
if (format && va)
+#endif
pos = _vsnprintf(buffer+pos, len-pos, format, va);
if(pos == -1) {