Add patch for GCC 4.2. Bug #186905 by Kent Fredric.

Package-Manager: portage-2.1.3.14

4 files changed, 44 insertions, 15 deletions

diff --git a/sci-electronics/ktechlab/ChangeLog b/sci-electronics/ktechlab/ChangeLog
index a4c960559446..c306895f50d6 100644
--- a/sci-electronics/ktechlab/ChangeLog
+++ b/sci-electronics/ktechlab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/ktechlab
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ktechlab/ChangeLog,v 1.12 2007/07/18 01:55:33 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ktechlab/ChangeLog,v 1.13 2007/10/17 00:33:18 dirtyepic Exp $
+
+  17 Oct 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/ktechlab-0.3.6-gcc42.patch, ktechlab-0.3.6.ebuild:
+  Add patch for GCC 4.2.  Bug #186905 by Kent Fredric.
 
   18 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org> -ktechlab-0.3.ebuild,
   ktechlab-0.3.6.ebuild:
diff --git a/sci-electronics/ktechlab/Manifest b/sci-electronics/ktechlab/Manifest
index 500fd28409bd..5b2e3e8a1199 100644
--- a/sci-electronics/ktechlab/Manifest
+++ b/sci-electronics/ktechlab/Manifest
@@ -5,15 +5,19 @@ AUX ktechlab-0.3-gcc-4.1.patch 277 RMD160 1a58d5476b953276eb2950a35f78e6d0f981d8
 MD5 2a5ce05e9393261fba290ac466f7f761 files/ktechlab-0.3-gcc-4.1.patch 277
 RMD160 1a58d5476b953276eb2950a35f78e6d0f981d87c files/ktechlab-0.3-gcc-4.1.patch 277
 SHA256 e620f27aa9ba40c3e287d38dc15facd7c99d72ce81667fb449ae26c5db507795 files/ktechlab-0.3-gcc-4.1.patch 277
+AUX ktechlab-0.3.6-gcc42.patch 1017 RMD160 75036ead760dfca7afd3cfdd578656c7c84de564 SHA1 e33cd8aba85a5e0bfdf7980cbe87da54beba4c58 SHA256 fc0c31f3d4207584b29e3da125e61f649f8ad910b963d71069217b1ff3b6418e
+MD5 7f8908b0f866f4b55a5a07d519bc6ae7 files/ktechlab-0.3.6-gcc42.patch 1017
+RMD160 75036ead760dfca7afd3cfdd578656c7c84de564 files/ktechlab-0.3.6-gcc42.patch 1017
+SHA256 fc0c31f3d4207584b29e3da125e61f649f8ad910b963d71069217b1ff3b6418e files/ktechlab-0.3.6-gcc42.patch 1017
 DIST ktechlab-0.3.6.tar.bz2 1223310 RMD160 9cdb7e60bc7792a4bcad0d2cd67214334288034a SHA1 46a7e9e31fbeb4c9eb96df6ac671a9f41e1beb42 SHA256 61f4c270c2db5d0de7456524d39009b830b97640bebc9fb764de7b0d97003e80
-EBUILD ktechlab-0.3.6.ebuild 653 RMD160 9e2f62974e28688ab4170f33b88cfba32206d77d SHA1 8ca4789796e59830ea2b70fc4e9e1aca51767a74 SHA256 49b2002fa8be80a3bb5fc32774d149e896f4124c37cffec4af316631c541aa6b
-MD5 4d2ee05e28befd5f33878b33e3db2dc1 ktechlab-0.3.6.ebuild 653
-RMD160 9e2f62974e28688ab4170f33b88cfba32206d77d ktechlab-0.3.6.ebuild 653
-SHA256 49b2002fa8be80a3bb5fc32774d149e896f4124c37cffec4af316631c541aa6b ktechlab-0.3.6.ebuild 653
-MISC ChangeLog 2062 RMD160 01ada156d8245c11c5937f013cdb36bd7985e985 SHA1 6b37697652394971ad25fdd96b34a806ab255a1c SHA256 177dea2a71ce36a5a7197fa807a9a2ef22cf9046f742205a7d04cf40acd587a4
-MD5 00dced4002974e46c721a2844383c7ab ChangeLog 2062
-RMD160 01ada156d8245c11c5937f013cdb36bd7985e985 ChangeLog 2062
-SHA256 177dea2a71ce36a5a7197fa807a9a2ef22cf9046f742205a7d04cf40acd587a4 ChangeLog 2062
+EBUILD ktechlab-0.3.6.ebuild 686 RMD160 cefbbe76f1626659f69041005d4aca9e5520fc83 SHA1 8630924a5ea48f452ca9f6f7b6f20b33b93a49ac SHA256 6478ef2fae491d09091ed221b67c2f35d33baeb34481fbe2c12d8ecdf5a88b7b
+MD5 f71e5b7ac6aecbe7fcfa0b5453c8fcf9 ktechlab-0.3.6.ebuild 686
+RMD160 cefbbe76f1626659f69041005d4aca9e5520fc83 ktechlab-0.3.6.ebuild 686
+SHA256 6478ef2fae491d09091ed221b67c2f35d33baeb34481fbe2c12d8ecdf5a88b7b ktechlab-0.3.6.ebuild 686
+MISC ChangeLog 2230 RMD160 b2ed744d8ccc78ea421a2f8b542bae1dedec92aa SHA1 92d4bfcb8a72c4db463c9828be75db6eceb51319 SHA256 3a17547ea7f1f205af4180d5b5b081bcf535da95f114c8eb27b5d119ae8fad7e
+MD5 63f03c815919ee7393c6e48059271192 ChangeLog 2230
+RMD160 b2ed744d8ccc78ea421a2f8b542bae1dedec92aa ChangeLog 2230
+SHA256 3a17547ea7f1f205af4180d5b5b081bcf535da95f114c8eb27b5d119ae8fad7e ChangeLog 2230
 MISC metadata.xml 562 RMD160 6817b8aff93cc8b515e9aab82ef360d2be6a3740 SHA1 e9f07dd6e8c989ccb9c1917119ff26102e4eabbb SHA256 224d547024b704798e3a67e46eb21f544a1e790eb830ccf69635efe66001ba03
 MD5 4868dfe4d4921d9edc360a43352ddfa4 metadata.xml 562
 RMD160 6817b8aff93cc8b515e9aab82ef360d2be6a3740 metadata.xml 562
@@ -22,9 +26,9 @@ MD5 d204c21e4130ba7b4aa1fc53d565981f files/digest-ktechlab-0.3.6 250
 RMD160 82cf13ef3bd42cc9c53686988f0c3a4709192019 files/digest-ktechlab-0.3.6 250
 SHA256 37aff70d623f98816342d63d7833a7d01367669dea05e84122b09bcf50029970 files/digest-ktechlab-0.3.6 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGnXMWntT9W3vfTuoRAoBhAJ9ar+PKpeGFTS8RxwBsRYq/Oeoc+ACcDekX
-c7bH8PT7cr2NtIZLcRE82yo=
-=WGzZ
+iD8DBQFHFVhZiqiDRvmkBmIRAhEIAKCb/eEaNE6iaQxB+j7vUdHukyhWWgCeP6Mf
+8hvO1aCE737pW2itOGlxw08=
+=D/9A
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/ktechlab/files/ktechlab-0.3.6-gcc42.patch b/sci-electronics/ktechlab/files/ktechlab-0.3.6-gcc42.patch
new file mode 100644
index 000000000000..77f5c1312396
--- /dev/null
+++ b/sci-electronics/ktechlab/files/ktechlab-0.3.6-gcc42.patch
@@ -0,0 +1,21 @@
+diff -Naur ktechlab-0.3-orig/src/itemdocument.h ktechlab-0.3/src/itemdocument.h
+--- ktechlab-0.3-orig/src/itemdocument.h	2007-08-06 12:52:55.000000000 -0600
++++ ktechlab-0.3/src/itemdocument.h	2007-08-06 12:55:24.000000000 -0600
+@@ -112,7 +112,7 @@
+ 		 * (such as PIC/START) have restrictions, and can only have one instance of
+ 		 * themselves on the canvas, and adds the operation to the undo list
+ 		 */
+-		virtual Item* addItem( const QString &id, const QPoint &p, bool newItem ) = 0l;
++		virtual Item* addItem( const QString &id, const QPoint &p, bool newItem ) = 0;
+ 		/**
+ 		 * @returns A pointer to the canvas
+ 		 */
+@@ -215,7 +215,7 @@
+ 		 * Set the given QCanvasItem (which will attempt to be casted to known
+ 		 * items to be deleted.
+ 		 */
+-		virtual void appendDeleteList( QCanvasItem * ) = 0l;
++		virtual void appendDeleteList( QCanvasItem * ) = 0;
+ 		/**
+ 		 * Save the current state of the document to the undo/redo history.
+ 		 * @param actionTicket if this is non-negative, and the last state save
diff --git a/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild b/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild
index 9b9806c8ee6c..598cebeda930 100644
--- a/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild
+++ b/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild,v 1.2 2007/07/18 01:55:33 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ktechlab/ktechlab-0.3.6.ebuild,v 1.3 2007/10/17 00:33:18 dirtyepic Exp $
 
 inherit kde
 
@@ -22,4 +22,4 @@ UNSERMAKE=""
 
 S="${WORKDIR}/${PN}-0.3"
 
-PATCHES="${FILESDIR}/${PN}-0.3-gcc-4.1.patch"
+PATCHES="${FILESDIR}/${PN}-0.3-gcc-4.1.patch ${FILESDIR}/${P}-gcc42.patch"