From d57669e2be369fb75097b75f50b199c0201f1698 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Sun, 26 Feb 2006 09:25:28 +0000 Subject: Fix broken compilation on gcc-4.1 (#123682). (Portage version: 2.0.54) --- app-mobilephone/ksms/ChangeLog | 10 ++++-- app-mobilephone/ksms/Manifest | 17 +++------ .../ksms/files/ksms-0.1.2.4-empty-store.diff | 40 ---------------------- .../ksms/files/ksms-0.1.2.4-empty-store.patch | 40 ++++++++++++++++++++++ .../ksms/files/ksms-0.1.2.4-gcc41.patch | 12 +++++++ app-mobilephone/ksms/ksms-0.1.2.4.ebuild | 7 ++-- 6 files changed, 68 insertions(+), 58 deletions(-) delete mode 100644 app-mobilephone/ksms/files/ksms-0.1.2.4-empty-store.diff create mode 100644 app-mobilephone/ksms/files/ksms-0.1.2.4-empty-store.patch create mode 100644 app-mobilephone/ksms/files/ksms-0.1.2.4-gcc41.patch (limited to 'app-mobilephone') diff --git a/app-mobilephone/ksms/ChangeLog b/app-mobilephone/ksms/ChangeLog index 7525f37ab851..fce6862a9ecd 100644 --- a/app-mobilephone/ksms/ChangeLog +++ b/app-mobilephone/ksms/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-mobilephone/ksms -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ksms/ChangeLog,v 1.1 2005/05/15 20:20:52 mrness Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ksms/ChangeLog,v 1.2 2006/02/26 09:25:28 mrness Exp $ + + 26 Feb 2006; Alin Nastac + -files/ksms-0.1.2.4-empty-store.diff, + +files/ksms-0.1.2.4-empty-store.patch, +files/ksms-0.1.2.4-gcc41.patch, + ksms-0.1.2.4.ebuild: + Fix broken compilation on gcc-4.1 (#123682). 15 May 2005; Alin Nastac metadata.xml: Moved from net-misc/ksms to app-mobilephone/ksms. diff --git a/app-mobilephone/ksms/Manifest b/app-mobilephone/ksms/Manifest index e2fb1794d9aa..b081f8cd4aa8 100644 --- a/app-mobilephone/ksms/Manifest +++ b/app-mobilephone/ksms/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 d66ee50306dea64ba89dff80e7ee0d9f ChangeLog 1096 -MD5 0b7ac24556163e9422de8a1bf294bc9d ksms-0.1.2.4.ebuild 635 -MD5 0aaa351977f37d9091c513d1cffbc903 metadata.xml 305 -MD5 0a133a035198c2b1b93889e64ae59428 files/ksms-0.1.2.4-empty-store.diff 1146 MD5 ecc65f8ac26e4ac07e86386738599bdb files/digest-ksms-0.1.2.4 64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCh687jiC39V7gKu0RAmgHAJ0dheRAN7Rz1Z31MUbGgIuImoTPNgCg2aGN -AOLoWVfuGDV4bnZxkhsCCeg= -=IhS4 ------END PGP SIGNATURE----- +MD5 0a133a035198c2b1b93889e64ae59428 files/ksms-0.1.2.4-empty-store.patch 1146 +MD5 e701d27f8376c84131f536f42f694ac5 files/ksms-0.1.2.4-gcc41.patch 308 +MD5 48309273dc08c0e160044873647cfff8 ksms-0.1.2.4.ebuild 667 +MD5 0aaa351977f37d9091c513d1cffbc903 metadata.xml 305 diff --git a/app-mobilephone/ksms/files/ksms-0.1.2.4-empty-store.diff b/app-mobilephone/ksms/files/ksms-0.1.2.4-empty-store.diff deleted file mode 100644 index 9b68e384fc80..000000000000 --- a/app-mobilephone/ksms/files/ksms-0.1.2.4-empty-store.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- ksms/messagestore.cpp.orig 2002-11-23 01:35:30.000000000 +0100 -+++ ksms/messagestore.cpp 2003-08-17 21:10:36.000000000 +0200 -@@ -150,20 +150,25 @@ - messages_.clear(); - - QFile xmlFile( messagesFile_ ); -- MessageStore::ReaderProgress progress( this ); -- XmlInputSourceWithProgress source( &xmlFile, &progress ); -- QXmlSimpleReader reader; -- MessagesParser handler( this ); -- reader.setContentHandler( &handler ); -- reader.setDTDHandler( &handler ); -- source.reset(); -- reader.parse( source ); -- -- reading_ = false; -+ if (xmlFile.exists()) { -+ MessageStore::ReaderProgress progress( this ); -+ XmlInputSourceWithProgress source( &xmlFile, &progress ); -+ QXmlSimpleReader reader; -+ MessagesParser handler( this ); -+ reader.setContentHandler( &handler ); -+ reader.setDTDHandler( &handler ); -+ source.reset(); -+ reader.parse( source ); -+ -+ reading_ = false; - -- emit storeChanged(); -+ emit storeChanged(); - -- modified_ = false; -+ modified_ = false; -+ } else { -+ reading_ = false; -+ modified_ = false; -+ } - } - - diff --git a/app-mobilephone/ksms/files/ksms-0.1.2.4-empty-store.patch b/app-mobilephone/ksms/files/ksms-0.1.2.4-empty-store.patch new file mode 100644 index 000000000000..9b68e384fc80 --- /dev/null +++ b/app-mobilephone/ksms/files/ksms-0.1.2.4-empty-store.patch @@ -0,0 +1,40 @@ +--- ksms/messagestore.cpp.orig 2002-11-23 01:35:30.000000000 +0100 ++++ ksms/messagestore.cpp 2003-08-17 21:10:36.000000000 +0200 +@@ -150,20 +150,25 @@ + messages_.clear(); + + QFile xmlFile( messagesFile_ ); +- MessageStore::ReaderProgress progress( this ); +- XmlInputSourceWithProgress source( &xmlFile, &progress ); +- QXmlSimpleReader reader; +- MessagesParser handler( this ); +- reader.setContentHandler( &handler ); +- reader.setDTDHandler( &handler ); +- source.reset(); +- reader.parse( source ); +- +- reading_ = false; ++ if (xmlFile.exists()) { ++ MessageStore::ReaderProgress progress( this ); ++ XmlInputSourceWithProgress source( &xmlFile, &progress ); ++ QXmlSimpleReader reader; ++ MessagesParser handler( this ); ++ reader.setContentHandler( &handler ); ++ reader.setDTDHandler( &handler ); ++ source.reset(); ++ reader.parse( source ); ++ ++ reading_ = false; + +- emit storeChanged(); ++ emit storeChanged(); + +- modified_ = false; ++ modified_ = false; ++ } else { ++ reading_ = false; ++ modified_ = false; ++ } + } + + diff --git a/app-mobilephone/ksms/files/ksms-0.1.2.4-gcc41.patch b/app-mobilephone/ksms/files/ksms-0.1.2.4-gcc41.patch new file mode 100644 index 000000000000..5cc0e14205c7 --- /dev/null +++ b/app-mobilephone/ksms/files/ksms-0.1.2.4-gcc41.patch @@ -0,0 +1,12 @@ +diff -ur ksms-0.1.2-orig/ksms/msgsender.h ksms-0.1.2/ksms/msgsender.h +--- ksms-0.1.2-orig/ksms/msgsender.h 2006-02-25 20:58:58.000000000 -0500 ++++ ksms-0.1.2/ksms/msgsender.h 2006-02-25 21:08:38.000000000 -0500 +@@ -27,6 +27,7 @@ + + class MsgSender; + class MsgSenderList; ++class MsgSenderContainer; + + + /** + diff --git a/app-mobilephone/ksms/ksms-0.1.2.4.ebuild b/app-mobilephone/ksms/ksms-0.1.2.4.ebuild index a243c0af33ea..d80dcceb5d14 100644 --- a/app-mobilephone/ksms/ksms-0.1.2.4.ebuild +++ b/app-mobilephone/ksms/ksms-0.1.2.4.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-mobilephone/ksms/ksms-0.1.2.4.ebuild,v 1.1 2005/05/15 20:20:52 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ksms/ksms-0.1.2.4.ebuild,v 1.2 2006/02/26 09:25:28 mrness Exp $ inherit kde @@ -18,4 +18,5 @@ IUSE="" DEPEND="app-mobilephone/gsmlib" need-kde 3 -PATCHES="${FILESDIR}/${P}-empty-store.diff" +PATCHES="${FILESDIR}/${P}-empty-store.patch + ${FILESDIR}/${P}-gcc41.patch" -- cgit v1.2.3-65-gdbad