From bc991675f62098597aaf0c2ffb3e9ab3968f9e3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Mon, 5 Jun 2006 22:55:34 +0000 Subject: [PATCH] Add patch for GCC 4.1 compatibility from Piotr Jaroszynski in bug #135635 reported by Robert Spencer. Package-Manager: portage-2.1_rc4-r2 --- app-arch/karchiver/ChangeLog | 9 ++++-- app-arch/karchiver/Manifest | 32 +++++++++++++++++-- .../karchiver/files/digest-karchiver-3.1.1-r1 | 2 ++ .../files/karchiver-3.1.1-gcc41.patch | 11 +++++++ app-arch/karchiver/karchiver-3.1.1-r1.ebuild | 6 ++-- 5 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 app-arch/karchiver/files/karchiver-3.1.1-gcc41.patch diff --git a/app-arch/karchiver/ChangeLog b/app-arch/karchiver/ChangeLog index c20e0f4df090..ba34265f2392 100644 --- a/app-arch/karchiver/ChangeLog +++ b/app-arch/karchiver/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/karchiver -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/karchiver/ChangeLog,v 1.27 2005/08/09 23:21:04 metalgod Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/karchiver/ChangeLog,v 1.28 2006/06/05 22:55:34 flameeyes Exp $ + + 05 Jun 2006; Diego Pettenò + +files/karchiver-3.1.1-gcc41.patch, karchiver-3.1.1-r1.ebuild: + Add patch for GCC 4.1 compatibility from Piotr Jaroszynski in bug #135635 + reported by Robert Spencer. 10 Aug 2005; Luis Medinas karchiver-3.1.1-r1.ebuild: Marked Testing on AMD64. Closes bug #101870 . diff --git a/app-arch/karchiver/Manifest b/app-arch/karchiver/Manifest index d2a45b6b79fd..5ff9da44fda9 100644 --- a/app-arch/karchiver/Manifest +++ b/app-arch/karchiver/Manifest @@ -1,4 +1,30 @@ -MD5 ebf08f4400720b8ba88011b55ad053ba ChangeLog 2997 -MD5 45da4e8ee971c98c6b09a2f65d6de726 karchiver-3.1.1-r1.ebuild 763 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX karchiver-3.1.1-gcc41.patch 503 RMD160 84afc87de783d7ef4350b7c1a0cc669142c20507 SHA1 9807ad7a60044b15272f724d8e4f81c87f7f3bb3 SHA256 a43f5c811f5015504295bdd77393d80a80b7c9d5442ec8feb9e479a189331735 +MD5 8df119aaa64bf8c176cff5768ca158ee files/karchiver-3.1.1-gcc41.patch 503 +RMD160 84afc87de783d7ef4350b7c1a0cc669142c20507 files/karchiver-3.1.1-gcc41.patch 503 +SHA256 a43f5c811f5015504295bdd77393d80a80b7c9d5442ec8feb9e479a189331735 files/karchiver-3.1.1-gcc41.patch 503 +DIST karchiver-3.1.1.tar.bz2 1708212 RMD160 387887edafeb68de5fe478fcd1d532dce9e1d485 SHA1 9e66e99c292e2ad085feba9a9265ea00fc70c7c5 SHA256 6670bc4bee8f587f1d1b34cd1af24d66970f3c5574e733c8d8736549c924f9e6 +EBUILD karchiver-3.1.1-r1.ebuild 804 RMD160 d71c7c990d902bba6464ad14e479daa7b2a0f142 SHA1 9be2c6a4c50e0298af31eec5da7af5e9fccac564 SHA256 704d36f05460bd82db212c45bf403637503456d993bd2704f88dbeb5a7fb15ec +MD5 9ce68ff3a6d51bba3ea1afaf070b497b karchiver-3.1.1-r1.ebuild 804 +RMD160 d71c7c990d902bba6464ad14e479daa7b2a0f142 karchiver-3.1.1-r1.ebuild 804 +SHA256 704d36f05460bd82db212c45bf403637503456d993bd2704f88dbeb5a7fb15ec karchiver-3.1.1-r1.ebuild 804 +MISC ChangeLog 3223 RMD160 8a08d1c2921111140937c5fa9b0ec90c3bede990 SHA1 827425517278cd1668067bb1ec7e992db5f21e74 SHA256 1ad7f25f8f9a393d9c5c4bc71397c05e0e6b9ff08fb708f911d2d00fd0bcd09c +MD5 eff356b6aef06147789dbc34a3c04a6a ChangeLog 3223 +RMD160 8a08d1c2921111140937c5fa9b0ec90c3bede990 ChangeLog 3223 +SHA256 1ad7f25f8f9a393d9c5c4bc71397c05e0e6b9ff08fb708f911d2d00fd0bcd09c ChangeLog 3223 +MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 -MD5 e2b5f2ff231e408d4238aa6098148da1 files/digest-karchiver-3.1.1-r1 69 +RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 +SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156 +MD5 11c0cd8eb932e0829daf9de457a14c1f files/digest-karchiver-3.1.1-r1 253 +RMD160 8c8878578151577d17c0ca0f07e7490695bfc0d0 files/digest-karchiver-3.1.1-r1 253 +SHA256 5da8c14b833fdf1f9466242ec4b58e919609729a0f9e042023c4ada0fbf28e5b files/digest-karchiver-3.1.1-r1 253 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEhLZ1AiZjviIA2XgRAnJ2AJ9mJQXZK1Yl9MGAZg7zInzLVjBm3gCgj8un +giv7MOQNaFLuzhebiJ5KMKw= +=CVOC +-----END PGP SIGNATURE----- diff --git a/app-arch/karchiver/files/digest-karchiver-3.1.1-r1 b/app-arch/karchiver/files/digest-karchiver-3.1.1-r1 index 5f5bde719d1d..41d29563d684 100644 --- a/app-arch/karchiver/files/digest-karchiver-3.1.1-r1 +++ b/app-arch/karchiver/files/digest-karchiver-3.1.1-r1 @@ -1 +1,3 @@ MD5 820386e5dae11957116298cda7ae052f karchiver-3.1.1.tar.bz2 1708212 +RMD160 387887edafeb68de5fe478fcd1d532dce9e1d485 karchiver-3.1.1.tar.bz2 1708212 +SHA256 6670bc4bee8f587f1d1b34cd1af24d66970f3c5574e733c8d8736549c924f9e6 karchiver-3.1.1.tar.bz2 1708212 diff --git a/app-arch/karchiver/files/karchiver-3.1.1-gcc41.patch b/app-arch/karchiver/files/karchiver-3.1.1-gcc41.patch new file mode 100644 index 000000000000..52a8b4785603 --- /dev/null +++ b/app-arch/karchiver/files/karchiver-3.1.1-gcc41.patch @@ -0,0 +1,11 @@ +--- karchiver-3.1.1-orig/karchiver/cpreferences.h 2005-02-28 16:33:37.000000000 +0100 ++++ karchiver-3.1.1/karchiver/cpreferences.h 2006-06-06 00:14:43.000000000 +0200 +@@ -71,7 +71,7 @@ + * uncompressing gzip and bzip2 archives */ + bool getOverwriteGzip(); + /** return true if we will use RAR header encryption */ +- bool CPreferences::getHeaderEncryption(); ++ bool getHeaderEncryption(); + /** return 0 if we'll display small icons, 1 for medium, + * 2 for large */ + int getSizeofIconListe(); diff --git a/app-arch/karchiver/karchiver-3.1.1-r1.ebuild b/app-arch/karchiver/karchiver-3.1.1-r1.ebuild index c175a67e2e0e..422b8073ffcc 100644 --- a/app-arch/karchiver/karchiver-3.1.1-r1.ebuild +++ b/app-arch/karchiver/karchiver-3.1.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/karchiver/karchiver-3.1.1-r1.ebuild,v 1.5 2005/08/09 23:21:04 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/karchiver/karchiver-3.1.1-r1.ebuild,v 1.6 2006/06/05 22:55:34 flameeyes Exp $ inherit kde @@ -15,6 +15,8 @@ IUSE="" need-kde 3.1 +PATCHES="${FILESDIR}/${P}-gcc41.patch" + # Nasty packaging... src_unpack() { kde_src_unpack -- 2.26.2