Fixed compilation problem with missing inttypes.h.

Package-Manager: portage-2.0.53_rc5

diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index f9b13b78cfba382755bbf38d95a9c4b51bfb20c4..3296ae5912beb000fdc6a0da8c3fd7877bdaa7dc 100644 (file)
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,17 +1,17 @@
+MD5 5cb3102b5887be89c0079df0a6028d51 kdeaddons-3.4.1.ebuild 1350
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 3a692b7c76a442ddec552bbb5786d366 kdeaddons-3.3.2.ebuild 994
+MD5 8f2fe7652226cdad1fe0fdad6b04e5ea ChangeLog 18404
+MD5 4fb37a8ed82c2ebe893f1e9e4e243018 kdeaddons-3.4.3.ebuild 1548
 MD5 986da28bb575012cb5ecd4b5beaf8cd8 kdeaddons-3.5_beta1.ebuild 1142
 MD5 4b184080c3a26edabff3c4d61409516d kdeaddons-3.4.2.ebuild 1549
 MD5 b57253163536c2af268e0468ab4ad51c kdeaddons-3.5.0_beta2.ebuild 1144
-MD5 7b01a56ca3f27b934564a14a556947d6 kdeaddons-3.4.1.ebuild 1350
-MD5 475d7c4b297667bae6a8e1463809cec3 ChangeLog 18298
-MD5 3a692b7c76a442ddec552bbb5786d366 kdeaddons-3.3.2.ebuild 994
-MD5 4fb37a8ed82c2ebe893f1e9e4e243018 kdeaddons-3.4.3.ebuild 1548
+MD5 bed9e2e46d8e7de37c5996e1ad3025bd files/digest-kdeaddons-3.4.2 69
+MD5 f510fb4a423935c458f3e01d994b5bd2 files/digest-kdeaddons-3.3.2 69
+MD5 0759d28e218dffee9d6e880b105aefc0 files/digest-kdeaddons-3.5.0_beta2 70
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-kdeaddons-3.4.3 69
 MD5 b222a3f919d71f11915038fe18b0a7d7 files/digest-kdeaddons-3.4.1 69
 MD5 6ec5a8a3f0f5ae85d431525c926c27fe files/noatun-oblique-db-location-3.4.0.diff 625
 MD5 76a1c9bb2b631b0233e79ed5ab7eb20e files/kdeaddons-3.4-configure.patch 3422
 MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
-MD5 bed9e2e46d8e7de37c5996e1ad3025bd files/digest-kdeaddons-3.4.2 69
-MD5 f510fb4a423935c458f3e01d994b5bd2 files/digest-kdeaddons-3.3.2 69
 MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-kdeaddons-3.5_beta1 70
-MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-kdeaddons-3.4.3 69
-MD5 0759d28e218dffee9d6e880b105aefc0 files/digest-kdeaddons-3.5.0_beta2 70

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 86443f751e844590ea5eefb12d84f89a62780154..c5fb67324d4acb1859323b284fe37b85c46bb6cf 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.282 2005/10/17 23:26:36 puggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.283 2005/10/18 19:24:55 eradicator Exp $
+
+  18 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/kdelibs-3.4.3-inttypes.patch, kdelibs-3.4.3.ebuild:
+  Fixed compilation problem with missing inttypes.h.
 
   17 Oct 2005; Douglas Russell <puggy@gentoo.org>
   +files/kdelibs-3.5.0_beta2-kwallet-stdint.patch,

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 17e8698a0156e921fb12cd4662eba6c5b41f2f33..89cfaaa0602f9d4cd3dfa1fc7db81b74331b3d2d 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,31 +1,42 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 2fd53a7c014e4527505ec32ec5425575 kdelibs-3.4.2.ebuild 3346
-MD5 a0eb7bb0201886c13fd7dcfee1e436a2 kdelibs-3.5.0_beta2.ebuild 3582
-MD5 a0a423eb46bcca9f140b0a97645a0177 kdelibs-3.3.2-r10.ebuild 4318
-MD5 05a09bc0f0f7710f7b2fd1a5602a19eb kdelibs-3.5_beta1-r1.ebuild 3751
-MD5 176460cf9160b02b1a157612af59e346 kdelibs-3.4.1-r1.ebuild 3363
-MD5 4414889382560907625e02e040c867eb ChangeLog 45232
-MD5 b75b773aa95374e55799e86e678173d6 kdelibs-3.4.1-r2.ebuild 3364
-MD5 a2b24bf20dd499efc40bf7708ca0c20f kdelibs-3.4.3.ebuild 3278
-MD5 12b3f3cc444cc940ed50e352054ccb7f kdelibs-3.4.2-r1.ebuild 3341
-MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
-MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 908dda682bf712500e5c785cd3d15f85 ChangeLog 45409
 MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r10 517
-MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
-MD5 4f827df22c4b05fdb50535c985ff5cb1 files/kdelibs-3.4.2-gmail-fix.patch 724
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
+MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2 68
 MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2-r1 68
-MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558
-MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
+MD5 e7fe23c3618de82d63dfdc90fb483a86 files/digest-kdelibs-3.4.3 68
 MD5 1021a06a0034a59f2eb8fe6ccd2ee2b5 files/digest-kdelibs-3.5.0_beta2 69
+MD5 481aadcb2e3cd311fce3a29b12c86b83 files/digest-kdelibs-3.5_beta1-r1 69
 MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
-MD5 1faf357303566f52581151bc68a6d245 files/kioslave-pumount-devname.patch 461
-MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
-MD5 3c54378872cb0af555c68a12dddf156d files/kdelibs-3.5_beta1-configure-acl.patch 1457
 MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
-MD5 e7fe23c3618de82d63dfdc90fb483a86 files/digest-kdelibs-3.4.3 68
-MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2 68
+MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
+MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558
 MD5 b291a4a134cac9072ad1140a78eee9ce files/kdelibs-3.4.1-kntlm.patch 1323
-MD5 481aadcb2e3cd311fce3a29b12c86b83 files/digest-kdelibs-3.5_beta1-r1 69
+MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
+MD5 4f827df22c4b05fdb50535c985ff5cb1 files/kdelibs-3.4.2-gmail-fix.patch 724
+MD5 b0a18256a9bb33e81f45573f07a341e1 files/kdelibs-3.4.3-inttypes.patch 365
 MD5 6b409debc4458da8e18975d681e5f622 files/kdelibs-3.5.0_beta2-kwallet-stdint.patch 332
+MD5 3c54378872cb0af555c68a12dddf156d files/kdelibs-3.5_beta1-configure-acl.patch 1457
+MD5 1faf357303566f52581151bc68a6d245 files/kioslave-pumount-devname.patch 461
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
 MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212
+MD5 a0a423eb46bcca9f140b0a97645a0177 kdelibs-3.3.2-r10.ebuild 4318
+MD5 176460cf9160b02b1a157612af59e346 kdelibs-3.4.1-r1.ebuild 3363
+MD5 b75b773aa95374e55799e86e678173d6 kdelibs-3.4.1-r2.ebuild 3364
+MD5 12b3f3cc444cc940ed50e352054ccb7f kdelibs-3.4.2-r1.ebuild 3341
+MD5 2fd53a7c014e4527505ec32ec5425575 kdelibs-3.4.2.ebuild 3346
+MD5 3330ac71c4b6ed681121c32ef0c814d3 kdelibs-3.4.3.ebuild 3393
+MD5 a0eb7bb0201886c13fd7dcfee1e436a2 kdelibs-3.5.0_beta2.ebuild 3582
+MD5 05a09bc0f0f7710f7b2fd1a5602a19eb kdelibs-3.5_beta1-r1.ebuild 3751
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVUwkOpjtAl+gMRURAnOCAKCujqYbABx/BW9pSo4o/m6wLn1nwwCcDJI+
+xlVn2aE8PulgfANOWaTkiSQ=
+=nph6
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kdelibs/files/kdelibs-3.4.3-inttypes.patch b/kde-base/kdelibs/files/kdelibs-3.4.3-inttypes.patch
new file mode 100644 (file)
index 0000000..17897d6
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.4.3-inttypes.patch
@@ -0,0 +1,12 @@
+--- kdelibs-3.4.3/kwallet/backend/sha1.cc.orig 2005-10-18 10:18:33.000000000 -0700
++++ kdelibs-3.4.3/kwallet/backend/sha1.cc      2005-10-18 10:20:53.000000000 -0700
+@@ -25,6 +25,9 @@
+ #ifdef HAVE_SYS_BITYPES_H
+ #include <sys/bitypes.h> /* For uintXX_t on Tru64 */
+ #endif
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
+ 
+ #include "sha1.h"
+ #include <string.h>

diff --git a/kde-base/kdelibs/kdelibs-3.4.3.ebuild b/kde-base/kdelibs/kdelibs-3.4.3.ebuild
index 6780a0f67e3cdcfa4cdf511e113c086bcfbd2e51..4c420b22baa26adf35f8069a74e4c4ac78762903 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.4.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.3.ebuild,v 1.1 2005/10/12 13:20:16 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.3.ebuild,v 1.2 2005/10/18 19:24:55 eradicator Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.4
@@ -56,6 +56,9 @@ src_unpack() {
        # Configure patch. Applied for 3.5.
        epatch "${FILESDIR}/kdelibs-3.4.1-configure.patch"
 
+       # Missing <inttypes.h> include causes compilation to bork
+       epatch "${FILESDIR}/kdelibs-3.4.3-inttypes.patch"
+
        # for the configure patch
        make -f admin/Makefile.common || die
 }