summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-crypt/qca-pkcs11/ChangeLog8
-rw-r--r--app-crypt/qca-pkcs11/Manifest15
-rw-r--r--app-crypt/qca-pkcs11/files/qca-pkcs11-2.0.0_beta2-gcc44.patch12
-rw-r--r--app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild10
4 files changed, 29 insertions, 16 deletions
diff --git a/app-crypt/qca-pkcs11/ChangeLog b/app-crypt/qca-pkcs11/ChangeLog
index 5e68176ec99d..b1f80a4458fb 100644
--- a/app-crypt/qca-pkcs11/ChangeLog
+++ b/app-crypt/qca-pkcs11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/qca-pkcs11
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-pkcs11/ChangeLog,v 1.4 2008/08/08 18:49:15 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-pkcs11/ChangeLog,v 1.5 2009/07/24 17:38:20 ssuominen Exp $
+
+ 24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+ qca-pkcs11-2.0.0_beta2.ebuild, +files/qca-pkcs11-2.0.0_beta2-gcc44.patch:
+ Fix building with GCC 4.4 wrt #276890.
08 Aug 2008; Alexis Ballier <aballier@gentoo.org>
qca-pkcs11-2.0.0_beta2.ebuild:
diff --git a/app-crypt/qca-pkcs11/Manifest b/app-crypt/qca-pkcs11/Manifest
index bfd6646d3447..a219e0db3515 100644
--- a/app-crypt/qca-pkcs11/Manifest
+++ b/app-crypt/qca-pkcs11/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX qca-pkcs11-2.0.0_beta2-gcc44.patch 376 RMD160 a30b4331f6d46a32ec890ef123a2ece02a6bc276 SHA1 88a2ef72f2813ea596f8041de82511d667b6a60e SHA256 e92c7fac15a3e8765ea2e7e1be9cf31f2a8731c704f192e7f1c1290903df766b
DIST qca-pkcs11-2.0.0-beta2.tar.bz2 30383 RMD160 4e1271897cfefb42a86ecad127285d39b017ef00 SHA1 23660e8c96c82565a886e7d7d87923c01d7a016b SHA256 959ab33ff16f2d28035025a9c06b2e6b89c1b3a52605811b51a73076f381e6c5
-EBUILD qca-pkcs11-2.0.0_beta2.ebuild 1468 RMD160 742ddbe25643d6a9648d98b9c3132ec79ca927ae SHA1 a2008b4ac6a271f50877a7c50e0a97541bd41e04 SHA256 0bc296f53e0c669c6e31ec96118df8021cb13bc6a5c8ebf2aed1bd0c5643e985
-MISC ChangeLog 1765 RMD160 2bb754549bd95f0660a3195588a8ae53f340ce3c SHA1 6df967c9c1cfb8c3c063d0cdba9e282ae915f925 SHA256 518a57ca4f80baea662f91e86f1fc05b9d808344e3606ab2be3ed8d79c94d67f
+EBUILD qca-pkcs11-2.0.0_beta2.ebuild 1550 RMD160 da4061a28b590998331b1494318073303ca0c7cf SHA1 10aad311e3dbaac086ac0ade183e020f1840389d SHA256 553d3bae27d9f1e12b6c62d816da91ef1d13c866b5913abcb5d49e68698443d1
+MISC ChangeLog 1938 RMD160 dc3ff62fe468c1dcc4d2047a57b2deb0fd9ab3d0 SHA1 66c9f321da72d25de81973bdbf3c256460b2d9c7 SHA256 d5375529cb697bddc4c216caa611abc93442cf5a5d77720d5541f10607d28b9d
MISC metadata.xml 192 RMD160 745ecce4d913885d0c5794b96fafd63a29a6e19e SHA1 fe4c3a2accae45b2ade98c5b45a3bd4533aac681 SHA256 2f70cf009da734f5a0166d90a267b186b6a4148cec4778a7f27ca8ef38709096
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiclTAACgkQvFcC4BYPU0ooNACfRz/afW6L1r+P//wJR4xSWyYY
-33wAnio1X7Pk90vEybZN+gVre1BHK6XK
-=TJnh
------END PGP SIGNATURE-----
diff --git a/app-crypt/qca-pkcs11/files/qca-pkcs11-2.0.0_beta2-gcc44.patch b/app-crypt/qca-pkcs11/files/qca-pkcs11-2.0.0_beta2-gcc44.patch
new file mode 100644
index 000000000000..353feee42381
--- /dev/null
+++ b/app-crypt/qca-pkcs11/files/qca-pkcs11-2.0.0_beta2-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur qca-pkcs11-2.0.0-beta2.orig/qca-pkcs11.cpp qca-pkcs11-2.0.0-beta2/qca-pkcs11.cpp
+--- qca-pkcs11-2.0.0-beta2.orig/qca-pkcs11.cpp 2007-11-05 07:21:51.000000000 +0200
++++ qca-pkcs11-2.0.0-beta2/qca-pkcs11.cpp 2009-07-24 20:36:03.000000000 +0300
+@@ -18,6 +18,8 @@
+ *
+ */
+
++#include <cstdio>
++
+ #include <QtCrypto>
+ #include <qcaprovider.h>
+ #include <qplatformdefs.h>
diff --git a/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild b/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild
index c1ab59864971..2d9076fbaf0e 100644
--- a/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild
+++ b/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild,v 1.4 2008/08/08 18:49:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild,v 1.5 2009/07/24 17:38:20 ssuominen Exp $
inherit eutils qt4
@@ -36,6 +36,12 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
src_compile() {
# cannot use econf because of non-standard configure script
./configure \