From c731778d6933c9c9cfc965d3589dad913a02a0da Mon Sep 17 00:00:00 2001 From: Jan Brinkmann Date: Fri, 21 Jan 2005 19:55:27 +0000 Subject: added a patch for amd64 to fix bug #76967. --- net-im/centericq/ChangeLog | 8 +- net-im/centericq/Manifest | 11 +- net-im/centericq/centericq-4.13.0.ebuild | 4 +- net-im/centericq/centericq-4.14.0.ebuild | 4 +- net-im/centericq/files/centericq-amd64.patch | 151 +++++++++++++++++++++++++++ 5 files changed, 170 insertions(+), 8 deletions(-) create mode 100644 net-im/centericq/files/centericq-amd64.patch (limited to 'net-im') diff --git a/net-im/centericq/ChangeLog b/net-im/centericq/ChangeLog index bbd64e0079bb..86230ac88a47 100644 --- a/net-im/centericq/ChangeLog +++ b/net-im/centericq/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/centericq # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.53 2005/01/19 12:29:31 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.54 2005/01/21 19:55:27 luckyduck Exp $ + + 21 Jan 2005; Jan Brinkmann + +files/centericq-amd64.patch, centericq-4.13.0.ebuild, + centericq-4.14.0.ebuild: + added a patch for amd64 to fix bug #76967. thanks goes to Julian Rueth + 19 Jan 2005; Wolfram Schlich -centericq-4.9.12-r1.ebuild, -centericq-4.9.12.ebuild: diff --git a/net-im/centericq/Manifest b/net-im/centericq/Manifest index b9803b455efb..00795270a306 100644 --- a/net-im/centericq/Manifest +++ b/net-im/centericq/Manifest @@ -1,10 +1,11 @@ +MD5 0451e644d950cac26e8405617033ca97 centericq-4.13.0.ebuild 2224 +MD5 04de93cc3b082010557d858173c1ecca centericq-4.14.0.ebuild 2224 MD5 e18f868bc611c90fed01c921b2ea4b8d centericq-4.11.0.ebuild 1609 -MD5 43dfc0786e686d2b71d89f5d0024ed51 centericq-4.13.0.ebuild 2171 +MD5 3fb9645acbe6332b8e69bcd0f2db0052 ChangeLog 7976 MD5 7f795e49e944fe6f3aa15fe53e8da366 metadata.xml 693 -MD5 ab09da2203bbaf291e719a5cb225fd80 ChangeLog 7726 MD5 b1866c4b5446820f8e1e991f8e3e0529 centericq-4.12.0.ebuild 2139 -MD5 ee96c97eebc4f8f783184e4d58e61831 centericq-4.14.0.ebuild 2171 -MD5 46e9d0c5b7ea4e05001e593b447715e1 files/digest-centericq-4.13.0 70 +MD5 0f60514eff0a237cf8fbdd13fd88293e files/centericq-amd64.patch 6291 MD5 3ff4d1ed212b9191d78f5d62dbbd4e71 files/digest-centericq-4.11.0 70 -MD5 9e00bb9cbcf5f672594b4307ada536d0 files/digest-centericq-4.14.0 70 MD5 f2b19b888bf1799ee2643a7a832f996b files/digest-centericq-4.12.0 70 +MD5 46e9d0c5b7ea4e05001e593b447715e1 files/digest-centericq-4.13.0 70 +MD5 9e00bb9cbcf5f672594b4307ada536d0 files/digest-centericq-4.14.0 70 diff --git a/net-im/centericq/centericq-4.13.0.ebuild b/net-im/centericq/centericq-4.13.0.ebuild index 841b53b9d6eb..8bca94c33438 100644 --- a/net-im/centericq/centericq-4.13.0.ebuild +++ b/net-im/centericq/centericq-4.13.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.13.0.ebuild,v 1.3 2005/01/19 12:14:37 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.13.0.ebuild,v 1.4 2005/01/21 19:55:27 luckyduck Exp $ inherit eutils @@ -25,6 +25,8 @@ RDEPEND="nls? ( sys-devel/gettext )" src_unpack() { unpack ${A} cd ${S} + + use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch } src_compile() { diff --git a/net-im/centericq/centericq-4.14.0.ebuild b/net-im/centericq/centericq-4.14.0.ebuild index 7233825238cf..fb5ee7eab725 100644 --- a/net-im/centericq/centericq-4.14.0.ebuild +++ b/net-im/centericq/centericq-4.14.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.14.0.ebuild,v 1.1 2005/01/19 12:14:37 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.14.0.ebuild,v 1.2 2005/01/21 19:55:27 luckyduck Exp $ inherit eutils @@ -25,6 +25,8 @@ RDEPEND="nls? ( sys-devel/gettext )" src_unpack() { unpack ${A} cd ${S} + + use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch } src_compile() { diff --git a/net-im/centericq/files/centericq-amd64.patch b/net-im/centericq/files/centericq-amd64.patch new file mode 100644 index 000000000000..e3d7a730a1dd --- /dev/null +++ b/net-im/centericq/files/centericq-amd64.patch @@ -0,0 +1,151 @@ +diff -urpN src.orig/icqdialogs.cc src/icqdialogs.cc +--- src.orig/icqdialogs.cc 2005-01-21 20:37:33.797082840 +0100 ++++ src/icqdialogs.cc 2005-01-21 20:37:48.351870176 +0100 +@@ -100,7 +100,7 @@ bool icqface::sprofmanager(string &name, + conf.getcolor(cp_dialog_selected))); + + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), +- conf.getcolor(cp_dialog_selected), _("Remove"), _("Load"), 0)); ++ conf.getcolor(cp_dialog_selected), _("Remove"), _("Load"), (char*)0)); + + db.addkey(KEY_DC, 0); + +@@ -209,17 +209,17 @@ bool icqface::finddialog(imsearchparams + switch(subj) { + case fsuser: + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), +- _("lOad"), _("sAve"), _("cLear"), _("Change"), _("Search/Add"), 0)); ++ _("lOad"), _("sAve"), _("cLear"), _("Change"), _("Search/Add"), (char*)0)); + break; + + case fschannel: + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), +- _("cLear"), _("Change"), _("Join/Create"), 0)); ++ _("cLear"), _("Change"), _("Join/Create"), (char*)0)); + break; + + case fsrss: + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), +- _("cLear"), _("Change"), _("lInk"), 0)); ++ _("cLear"), _("Change"), _("lInk"), (char*)0)); + break; + } + +@@ -726,7 +726,7 @@ bool icqface::updatedetails(icqcontact * + conf.getcolor(cp_dialog_text))); + + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), +- conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), 0)); ++ conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), (char*)0)); + + db.idle = &detailsidle; + db.addautokeys(); +@@ -1025,7 +1025,7 @@ bool icqface::sendfiles(const imcontact + + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), + conf.getcolor(cp_dialog_selected), +- _("Add"), _("Remove"), _("Comment"), _("Send"), 0)); ++ _("Add"), _("Remove"), _("Comment"), _("Send"), (char*)0)); + + db.addkey(KEY_IC, 0); + db.addkey(KEY_DC, 1); +@@ -1162,7 +1162,7 @@ bool icqface::updateconf(icqconf::regsou + conf.getcolor(cp_dialog_text))); + + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), +- conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), 0)); ++ conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), (char*)0)); + + db.idle = &dialogidle; + db.addautokeys(); +@@ -1553,7 +1553,7 @@ int icqface::groupmanager(const string & + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), + conf.getcolor(cp_dialog_selected), + _("Add"), _("Rename"), _("rEmove"), _("move Up"), _("move Down"), +- sel ? _("Select") : _("Done"), 0)); ++ sel ? _("Select") : _("Done"), (char*)0)); + + db.addautokeys(); + db.getbar()->item = 5; +@@ -1674,7 +1674,7 @@ void icqface::transfermonitor() { + conf.getcolor(cp_dialog_text))); + + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), +- conf.getcolor(cp_dialog_selected), _("Cancel"), _("Remove"), 0)); ++ conf.getcolor(cp_dialog_selected), _("Cancel"), _("Remove"), (char*)0)); + + db.getbar()->item = 1; + db.addautokeys(); +@@ -1886,7 +1886,7 @@ bool icqface::setljparams(imxmlevent *ev + conf.getcolor(cp_dialog_text))); + + db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected), +- _("Change"), _("Detect music"), _("Post"), _("cAncel"), 0)); ++ _("Change"), _("Detect music"), _("Post"), _("cAncel"), (char*)0)); + + db.addautokeys(); + db.idle = &dialogidle; +diff -urpN src.orig/icqface.cc src/icqface.cc +--- src.orig/icqface.cc 2005-01-21 20:37:33.799082536 +0100 ++++ src/icqface.cc 2005-01-21 20:37:51.575380128 +0100 +@@ -742,11 +742,11 @@ bool icqface::findresults(const imsearch + if(!h.getCapabs().count(hookcapab::nochat)) { + db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight), + conf.getcolor(cp_main_selected), _("Details"), _("Message"), +- _("Add"), fauto ? 0 : _("New search"), 0)); ++ _("Add"), fauto ? 0 : _("New search"), (char*)0)); + } else { + db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight), + conf.getcolor(cp_main_selected), _("Details"), _("Add"), +- fauto ? 0 : _("New search"), 0)); ++ fauto ? 0 : _("New search"), (char*)0)); + } + + db.addautokeys(); +@@ -1215,24 +1215,24 @@ void icqface::userinfo(const imcontact & + if(c->inlist() && realinfo != contactroot) { + db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1, + conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), +- _("Info"), _("About"), _("Check"), _("Edit"), islivejournal(c) ? _("LJ") : 0, 0)); ++ _("Info"), _("About"), _("Check"), _("Edit"), islivejournal(c) ? _("LJ") : 0, (char*)0)); + } else { + db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1, + conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), +- _("Info"), _("About"), _("Retreive"), 0)); ++ _("Info"), _("About"), _("Retreive"), (char*)0)); + } + + } else if(cinfo.pname == livejournal) { + db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1, + conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), +- _("Info"), _("Friend of"), 0)); ++ _("Info"), _("Friend of"), (char*)0)); + + + } else { + db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1, + conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected), + _("Info"), _("Home"), _("Work"), _("More"), _("About"), +- cinfo.pname != infocard ? _("Retrieve") : _("Edit"), 0)); ++ cinfo.pname != infocard ? _("Retrieve") : _("Edit"), (char*)0)); + + } + +@@ -1664,7 +1664,7 @@ void icqface::modelist(contactstatus cs) + + db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight), + conf.getcolor(cp_main_selected), +- _("Details"), _("Add"), _("Remove"), _("Move to contacts"), 0)); ++ _("Details"), _("Add"), _("Remove"), _("Move to contacts"), (char*)0)); + + db.addautokeys(); + db.idle = &dialogidle; +@@ -2350,7 +2350,7 @@ bool icqface::eventedit(imevent &ev) { + conf.getcolor(cp_main_selected))); + db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight), + conf.getcolor(cp_main_selected), +- _("Add"), _("Remove"), _("Send"), 0)); ++ _("Add"), _("Remove"), _("Send"), (char*)0)); + + db.addkey(KEY_IC, 0); + db.addkey(KEY_DC, 1); -- cgit v1.2.3-65-gdbad