From: Carsten Lohrke Date: Mon, 18 Oct 2004 15:03:39 +0000 (+0000) Subject: gcc-3.4 compatibility patch X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff9ba9bc16f3b32e4e77465149d5b140f8e13196;p=gentoo.git gcc-3.4 compatibility patch --- diff --git a/net-misc/kickpim/ChangeLog b/net-misc/kickpim/ChangeLog index b6cbeb68a733..f0a2b2de2d98 100644 --- a/net-misc/kickpim/ChangeLog +++ b/net-misc/kickpim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/kickpim # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/kickpim/ChangeLog,v 1.7 2004/08/08 00:23:30 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/kickpim/ChangeLog,v 1.8 2004/10/18 15:03:39 carlo Exp $ + + 18 Oct 2004; Carsten Lohrke + +files/kickpim-0.5.3-gcc3.4.patch, kickpim-0.5.3.ebuild: + gcc-3.4 compatibility patch 08 Aug 2004; Tom Martin kickpim-0.5.3.ebuild: Typo in DESCRIPTION: Adressbook -> Addressbook. Bug 59717. diff --git a/net-misc/kickpim/Manifest b/net-misc/kickpim/Manifest index 24e334ba34e8..e8e908ac6b4c 100644 --- a/net-misc/kickpim/Manifest +++ b/net-misc/kickpim/Manifest @@ -1,5 +1,6 @@ -MD5 53a345dd137dd11711b250439409b7c2 ChangeLog 996 +MD5 9d839065d46adc5a6db2a8c43c35f3fd ChangeLog 1134 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162 -MD5 127e650eded7d8bdf931986ba4de74ab kickpim-0.5.3.ebuild 552 +MD5 a80a49c7a29ca6820dbe31f274a87625 kickpim-0.5.3.ebuild 589 MD5 26afc3fcba026cf83bad3f5d6c625c40 files/kickpim-0.5.3-fPIC.patch 1384 +MD5 2362fd167742f9ac1f4eb698fc95e948 files/kickpim-0.5.3-gcc3.4.patch 2959 MD5 7d8f01840667f295b0a5a4cbcafe2327 files/digest-kickpim-0.5.3 66 diff --git a/net-misc/kickpim/files/kickpim-0.5.3-gcc3.4.patch b/net-misc/kickpim/files/kickpim-0.5.3-gcc3.4.patch new file mode 100644 index 000000000000..a668d8d5a642 --- /dev/null +++ b/net-misc/kickpim/files/kickpim-0.5.3-gcc3.4.patch @@ -0,0 +1,114 @@ +diff -ur kickpim-0.5.3.orig/src/dialogs/kickpimcard.cpp kickpim-0.5.3/src/dialogs/kickpimcard.cpp +--- kickpim-0.5.3.orig/src/dialogs/kickpimcard.cpp 2003-12-04 14:13:33.000000000 +0100 ++++ kickpim-0.5.3/src/dialogs/kickpimcard.cpp 2004-10-17 23:29:55.751344904 +0200 +@@ -309,7 +309,7 @@ + if (prefFound) m_content[PHONE]->selectContent( i18n("Preferred Number") ); + else if (homeFound) m_content[PHONE]->selectContent( i18n("home phone") ); + else m_content[PHONE]->selectContent( i18n(phoneMap.begin().key()) ); +-}; ++} + + + void KickPimCard::setAddressContent() +@@ -352,7 +352,7 @@ + if (type && KABC::Address::Pref) text+="Pref
"; + */ + return text; +-}; ++} + + void KickPimCard::setBirthdayContent () + { +diff -ur kickpim-0.5.3.orig/src/kickpimcontactview.cpp kickpim-0.5.3/src/kickpimcontactview.cpp +--- kickpim-0.5.3.orig/src/kickpimcontactview.cpp 2003-11-30 14:40:02.000000000 +0100 ++++ kickpim-0.5.3/src/kickpimcontactview.cpp 2004-10-17 23:32:48.107142840 +0200 +@@ -111,7 +111,7 @@ + setSorting(0); + sort(); + setSorting(-1); +-}; ++} + + void KickPimContactView::onContactsDoubleClick(QListViewItem* qitem) + { +@@ -129,7 +129,7 @@ + KickPimContactViewItem* item = 0; + item = new KickPimContactViewItem( this, 0, KickPIM::rep()->displayName(contact) ); + item->setContact(contact); +-}; ++} + + void KickPimContactView::addDistributionList(DistributionList* distList) + { +@@ -137,7 +137,7 @@ + KickPimContactViewItem* item = 0; + item = new KickPimContactViewItem( this, lastItem(), "["+distList->name()+"]" ); + item->setDistributionList(distList); +-}; ++} + + int KickPimContactView::preferredHeight() + { +diff -ur kickpim-0.5.3.orig/src/kpcontactevent.cpp kickpim-0.5.3/src/kpcontactevent.cpp +--- kickpim-0.5.3.orig/src/kpcontactevent.cpp 2003-09-06 13:42:07.000000000 +0200 ++++ kickpim-0.5.3/src/kpcontactevent.cpp 2004-10-17 23:34:03.972609536 +0200 +@@ -24,7 +24,7 @@ + m_text = ""; + m_date = QDate(25,61,61); // invalid + m_contact = 0; +-}; ++} + + KPContactEvent::~KPContactEvent() + { +diff -ur kickpim-0.5.3.orig/src/kpkabcontact.cpp kickpim-0.5.3/src/kpkabcontact.cpp +--- kickpim-0.5.3.orig/src/kpkabcontact.cpp 2003-11-15 00:09:16.000000000 +0100 ++++ kickpim-0.5.3/src/kpkabcontact.cpp 2004-10-17 23:34:59.549160616 +0200 +@@ -240,7 +240,7 @@ + { + m_addr->insertEmail(emailAddr, preferred); + } +-}; ++} + + + +@@ -255,7 +255,7 @@ + ++itor; + } + +-}; ++} + + void KPKabContact::addPhoneNumber(QString number, QString key) + { +@@ -270,20 +270,20 @@ + } + } + } +-}; ++} + + void KPKabContact::setBirthday ( QDate date ) + { + if (!m_addr) return; + m_addr->setBirthday(date); +-}; ++} + + void KPKabContact::setAnniversary ( QDate date ) + { + if (!m_addr) return; + QString dateStr = date.toString( Qt::ISODate ); + m_addr->insertCustom( "KADDRESSBOOK", "X-Anniversary" , dateStr ); +-}; ++} + + + bool KPKabContact::edit() +@@ -322,4 +322,4 @@ + } + } + KABC::StdAddressBook::save(); +-}; ++} diff --git a/net-misc/kickpim/kickpim-0.5.3.ebuild b/net-misc/kickpim/kickpim-0.5.3.ebuild index 58699994aea4..a81fd852379f 100644 --- a/net-misc/kickpim/kickpim-0.5.3.ebuild +++ b/net-misc/kickpim/kickpim-0.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/kickpim/kickpim-0.5.3.ebuild,v 1.7 2004/08/08 00:23:30 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/kickpim/kickpim-0.5.3.ebuild,v 1.8 2004/10/18 15:03:39 carlo Exp $ inherit kde eutils @@ -18,4 +18,5 @@ need-kde 3 src_unpack() { kde_src_unpack epatch ${FILESDIR}/${P}-fPIC.patch + epatch ${FILESDIR}/${P}-gcc3.4.patch }