Add patch to build with GCC 4.1, patch from Sebastian T. Hafner in bug #129094.

Package-Manager: portage-2.1_pre7-r4

4 files changed, 63 insertions, 6 deletions

diff --git a/app-doc/kchmviewer/ChangeLog b/app-doc/kchmviewer/ChangeLog
index cb0fdf05bb5c..6b9732cf3f67 100644
--- a/app-doc/kchmviewer/ChangeLog
+++ b/app-doc/kchmviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/kchmviewer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.12 2006/04/06 14:48:05 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/ChangeLog,v 1.13 2006/04/07 11:12:43 flameeyes Exp $
+
+  07 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kchmviewer-2.5-gcc41.patch, kchmviewer-2.5.ebuild:
+  Add patch to build with GCC 4.1, patch from Sebastian T. Hafner in bug #129094.
 
 *kchmviewer-2.5 (06 Apr 2006)
 
diff --git a/app-doc/kchmviewer/Manifest b/app-doc/kchmviewer/Manifest
index 92fe322c4137..dad88aa9a411 100644
--- a/app-doc/kchmviewer/Manifest
+++ b/app-doc/kchmviewer/Manifest
@@ -1,14 +1,55 @@
-MD5 6caae78eb7d91a318258bfe8a5e4257f ChangeLog 1831
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 87813e1ee57aa0346bdd7b3b889cc0e2 ChangeLog 2031
+RMD160 d7f4f3fc90f32b57256f35077c3db481c2641f8c ChangeLog 2031
+SHA256 310c92c85b2dfe1207eef09c6187c004447c131712580dc89026aacf2b57ed8e ChangeLog 2031
 MD5 94e60c0a9492507bdd6050ad834e6a99 files/digest-kchmviewer-1.1 66
+RMD160 5078a981a5ec09c3dfd9f95fee6f18762e1625f3 files/digest-kchmviewer-1.1 66
+SHA256 718461587a58b5f158f2c5a5f1b9594edbaf83b7d97e19a8a8cbcae04babae99 files/digest-kchmviewer-1.1 66
 MD5 b8902955df9ce8d874fd742ec0767021 files/digest-kchmviewer-1.2 66
+RMD160 195e89dc356cfe79a63f0d40cb5aaf120ad3b2e3 files/digest-kchmviewer-1.2 66
+SHA256 51d9ec78d11df90226c29304a18ca4a41225d59ae02afb801fd0e5a3441d2c6e files/digest-kchmviewer-1.2 66
 MD5 aa907c518cc0b8e5bdd7b4b35ab936bf files/digest-kchmviewer-1.3 66
+RMD160 0f9a98ffb2eaf758f75f403d7a238d4d17e8f892 files/digest-kchmviewer-1.3 66
+SHA256 b96373166bb047cd5d41d3620e9e8c831026fd9607b40b6b6293f1b6e1ee7e5f files/digest-kchmviewer-1.3 66
 MD5 8369a0025ea435acdae1ecf87170f57e files/digest-kchmviewer-2.0 244
+RMD160 548c42fe5abd7dfbdbdc2540d6db6d8629ffdd98 files/digest-kchmviewer-2.0 244
+SHA256 4eece2212611a5f0d045846067b07dda7b9205d057418a0d6aa8ecd40ad608a9 files/digest-kchmviewer-2.0 244
 MD5 1571ca6fbb973778f8bb3f3e0ff1418f files/digest-kchmviewer-2.0-r1 66
+RMD160 c0bc99425607dce90230ab218892c354c48d5dc2 files/digest-kchmviewer-2.0-r1 66
+SHA256 e16c8505f0a7f647f42c30085126230843a5776ebe7ca45fefa6775c9880ed11 files/digest-kchmviewer-2.0-r1 66
 MD5 d95e348b10495529e3d549e1551a079b files/digest-kchmviewer-2.5 66
+RMD160 ce6281f8da43cda1bc9c8fc580cda5b5b1145e90 files/digest-kchmviewer-2.5 66
+SHA256 2ae35633fc83716a17724c800661e92da2e0fe60746089197b644957d3c27a52 files/digest-kchmviewer-2.5 66
+MD5 38c09653219e8b651c80336bfbb054bf files/kchmviewer-2.5-gcc41.patch 510
+RMD160 db21d66ed392cbce3cf06993cc098bad3ecaf4e5 files/kchmviewer-2.5-gcc41.patch 510
+SHA256 944d8ffb37f536c3c79b241a4d2da8c57af6faed5f2df6ac76e23a784b9044a7 files/kchmviewer-2.5-gcc41.patch 510
 MD5 b7e29b38474772ed2c00e13106b7f265 kchmviewer-1.1.ebuild 1116
+RMD160 95a69045b3246424b347eca317c142b1bcc09b7a kchmviewer-1.1.ebuild 1116
+SHA256 10bdc22e8d6e9a2b9f800a5b23c6ae98559ee2606af4486cea77903b9e3a406c kchmviewer-1.1.ebuild 1116
 MD5 7a62fa28fcd0b9a810e161a8179f56dc kchmviewer-1.2.ebuild 1117
+RMD160 40a983635b5a12bf85dacb98ee187a1f13cf9363 kchmviewer-1.2.ebuild 1117
+SHA256 4793e08faab379af4b8c63ab1266f633e6722f7b23a050fd0c108c62a52bdc8f kchmviewer-1.2.ebuild 1117
 MD5 e3ac9d0377035c0441a1f7047f97e338 kchmviewer-1.3.ebuild 1117
+RMD160 c5203a9e97c63ec281072cf9eea83bf851f9a7c2 kchmviewer-1.3.ebuild 1117
+SHA256 23e40abaed23694860c91c055abb4cd3eff79d83ccb033b5976a4deeca93b8c8 kchmviewer-1.3.ebuild 1117
 MD5 d3d2990be182fe75a73987e931e0779c kchmviewer-2.0-r1.ebuild 1303
+RMD160 d81290b3a6dbafebc646cd7ccded5d142f571b54 kchmviewer-2.0-r1.ebuild 1303
+SHA256 159227765e24e8408e28fe2771dd618967674d5bc518122abfb5a393caec1911 kchmviewer-2.0-r1.ebuild 1303
 MD5 e5c89afeb32fc87f063addaf439e6843 kchmviewer-2.0.ebuild 1218
-MD5 3252376968958f497cb78c8565094eb6 kchmviewer-2.5.ebuild 1300
+RMD160 9660e0489822208234287fec11225914b5d2ed46 kchmviewer-2.0.ebuild 1218
+SHA256 0e150b54d551d2c6c9953b4eb6797804270291c181524ff959cbb5360f9c6469 kchmviewer-2.0.ebuild 1218
+MD5 5c20a0cc0aa5873e9e4d7aa5be5bcbc2 kchmviewer-2.5.ebuild 1225
+RMD160 9b981d1ba69e513bde83d8c80b67f45829f35545 kchmviewer-2.5.ebuild 1225
+SHA256 cd7e8ec7afeb645e7e68d60c11961e60e7cf02d1dc9a9f0aa63c7ad529ba3227 kchmviewer-2.5.ebuild 1225
 MD5 bc5757868e9f06d6048259da3a5918aa metadata.xml 157
+RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb metadata.xml 157
+SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 metadata.xml 157
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFENklTAiZjviIA2XgRAobWAKCS57VvhY7+YYMSU9nVll7f+k4enACfdWhs
+GrPFjkS6HhcA8XUbQ+iFS/U=
+=mU/F
+-----END PGP SIGNATURE-----
diff --git a/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch b/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch
new file mode 100644
index 000000000000..f6fd7e656d39
--- /dev/null
+++ b/app-doc/kchmviewer/files/kchmviewer-2.5-gcc41.patch
@@ -0,0 +1,11 @@
+--- ./origin/src/iconstorage.h	2006-04-02 04:09:14.000000000 +0200
++++ ./kchmviewer-2.5/src/iconstorage.h	2006-04-07 09:41:34.000000000 +0200
+@@ -57,7 +57,7 @@
+ 	const QPixmap * getBookIconPixmap (unsigned int id);
+ 	const QPixmap * getToolbarPixmap (pixmap_index_t pix);
+ 	const QPixmap * getApplicationIcon();
+-	const QPixmap * KCHMIconStorage::getCloseWindowIcon();
++	const QPixmap * getCloseWindowIcon();
+ 
+ private:
+ 	const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image);
diff --git a/app-doc/kchmviewer/kchmviewer-2.5.ebuild b/app-doc/kchmviewer/kchmviewer-2.5.ebuild
index 9f660b26b82c..ce61cb6d1c86 100644
--- a/app-doc/kchmviewer/kchmviewer-2.5.ebuild
+++ b/app-doc/kchmviewer/kchmviewer-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-2.5.ebuild,v 1.1 2006/04/06 14:48:05 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/kchmviewer/kchmviewer-2.5.ebuild,v 1.2 2006/04/07 11:12:43 flameeyes Exp $
 
 inherit kde-functions eutils
 
@@ -30,8 +30,9 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	# broken configure script, assure it doesn't fall back to internal libs
-	echo "# We use the external chmlib!" > chmlib/chm_lib.h
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 }
 src_compile() {
 	set-kdedir 3