From: Karol Wojtaszek Date: Thu, 16 Mar 2006 17:40:27 +0000 (+0000) Subject: Added gcc-4 patch, ~amd64 keyworded X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a13f09fe8f93d8c352938605732c745c1717dbd7;p=gentoo.git Added gcc-4 patch, ~amd64 keyworded Package-Manager: portage-2.1_pre6-r3 --- diff --git a/app-pda/multisync/ChangeLog b/app-pda/multisync/ChangeLog index 3a9ffefdbe28..62190175cd50 100644 --- a/app-pda/multisync/ChangeLog +++ b/app-pda/multisync/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-pda/multisync # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.28 2006/02/09 17:07:38 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.29 2006/03/16 17:40:27 sekretarz Exp $ + + 16 Mar 2006; Karol Wojtaszek + +files/multisync-gcc4.patch, multisync-0.83_pre20050414-r3.ebuild: + Added gcc-4 patch, ~amd64 keyworded 09 Feb 2006; Andrej Kacian multisync-0.83_pre20050414-r2.ebuild, diff --git a/app-pda/multisync/Manifest b/app-pda/multisync/Manifest index f6db6e654075..5267f9c5c14b 100644 --- a/app-pda/multisync/Manifest +++ b/app-pda/multisync/Manifest @@ -1,28 +1,31 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3e4d7a40fc1ad1a12b3a367086cedf67 ChangeLog 5130 -RMD160 fa1d2da5cc05a5788936395dfb04328b7b67d815 ChangeLog 5130 -SHA256 5f5bc032d5ea7e5fc2dbe568b6844414f5c71726650fd63f8e806e93563e95f7 ChangeLog 5130 +MD5 038c38450ee60ccc4440aad05fb51dd4 ChangeLog 5296 +RMD160 ea122ff3568e7da353f56f7b0154e50f6f606532 ChangeLog 5296 +SHA256 58c883698d2a138276de43362ca6835a7b0ebe0786f20038f874662c13aae2d5 ChangeLog 5296 MD5 c668aca6eec704faa03632e0588bbe3e files/digest-multisync-0.83_pre20050414-r2 71 RMD160 a69fb0f02fb31237a39196d5cca8530d20e52400 files/digest-multisync-0.83_pre20050414-r2 71 SHA256 99d0e08768d85d3ec7a8fb78a88fba2cf7bdaa8b0208854381017bca7c7522dc files/digest-multisync-0.83_pre20050414-r2 71 MD5 c668aca6eec704faa03632e0588bbe3e files/digest-multisync-0.83_pre20050414-r3 71 RMD160 a69fb0f02fb31237a39196d5cca8530d20e52400 files/digest-multisync-0.83_pre20050414-r3 71 SHA256 99d0e08768d85d3ec7a8fb78a88fba2cf7bdaa8b0208854381017bca7c7522dc files/digest-multisync-0.83_pre20050414-r3 71 +MD5 e1a658a1c5b7926e4f64119c14b71024 files/multisync-gcc4.patch 4578 +RMD160 071dfdcb731f81ebf64b6589392f5fa4dea944d3 files/multisync-gcc4.patch 4578 +SHA256 6e5e34e14709276b72f4efff6ec8aa622d5d5727fc0010673ab24a9b65ce0922 files/multisync-gcc4.patch 4578 MD5 4eb51641834063e986569d108f657719 metadata.xml 450 RMD160 cb27bb1e32585a1eea51391b3e46a4906535bdc7 metadata.xml 450 SHA256 7bd44367e407f89392bf88f1e9de93e92b1eeeff4dc82e1901437ec1daa06ad0 metadata.xml 450 MD5 1b02a3193fee90560f759fa0f4f9e33e multisync-0.83_pre20050414-r2.ebuild 3331 RMD160 d2edd0a52b5e20afc4fc580a86a1fcfb8139b5e2 multisync-0.83_pre20050414-r2.ebuild 3331 SHA256 2e8eb8b59f578dcf3618d133617c6a5da7d8fc9b1f0a37b67499f8b7bc8fed7b multisync-0.83_pre20050414-r2.ebuild 3331 -MD5 dc75e6f2c8d99d24280a8169adc9d988 multisync-0.83_pre20050414-r3.ebuild 3445 -RMD160 081ac118c533976c9f0a3202ff198d6b8c3c7006 multisync-0.83_pre20050414-r3.ebuild 3445 -SHA256 720752134efe5976c50fdc98761e94a2273552b783f4d0633fc627c4ed4905eb multisync-0.83_pre20050414-r3.ebuild 3445 +MD5 5d2b9955aa13d8e4a696aec3a3f2a5dc multisync-0.83_pre20050414-r3.ebuild 3541 +RMD160 0081c985228b1a13deb4e84db5d69df697ee61bf multisync-0.83_pre20050414-r3.ebuild 3541 +SHA256 f67c3bdaa3da6f8664cad6dd0c918026b01a479ab5a0c73a437f05c6489125b1 multisync-0.83_pre20050414-r3.ebuild 3541 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFD63boQlM6RnzZP+IRAm+gAJ4q/+1Aj+Jw+yZMyJb4Mn+1UtvPdgCgwBip -vkZBeCXZev0FDTNiSghQNFw= -=cKip +iD8DBQFEGbGKub4+zaPCR/oRAmWtAJ0dKghmuLMHIF7yvbza3LtUAI+RNwCfYUb6 +1+xYfb2pqo+zBVV47nPT1G0= +=Tc0X -----END PGP SIGNATURE----- diff --git a/app-pda/multisync/files/multisync-gcc4.patch b/app-pda/multisync/files/multisync-gcc4.patch new file mode 100644 index 000000000000..30fc12eb498c --- /dev/null +++ b/app-pda/multisync/files/multisync-gcc4.patch @@ -0,0 +1,88 @@ +--- multisync/plugins/ldap_plugin/src/xml.c 2003-12-02 09:36:28.000000000 +1000 ++++ multisync.wade/plugins/ldap_plugin/src/xml.c 2005-05-10 23:34:02.000000000 +1000 +@@ -55,7 +55,7 @@ + } + + while (cur != NULL) { +- xmlstr = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); ++ xmlstr = ( char * ) xmlNodeListGetString( doc, cur->xmlChildrenNode, 1); + + if ((!xmlStrcmp(cur->name, (const xmlChar *)"serverport"))) { + conn->serverport = atoi(xmlstr); +@@ -130,8 +130,8 @@ + char port[256], debuglevel[256], scope[256], encryption[256], write[256], anonymous[256]; + ldap_debug(conn, 2, "Saving state to file %s", conn->statefile); + +- doc = xmlNewDoc("1.0"); +- doc->children = xmlNewDocNode(doc, NULL, "config", NULL); ++ doc = xmlNewDoc( (const xmlChar *) "1.0"); ++ doc->children = xmlNewDocNode(doc, NULL, (const xmlChar *) "config", NULL); + + snprintf(port, 256, "%i", conn->serverport); + snprintf(debuglevel, 256, "%i", conn->debug_level); +@@ -140,18 +140,18 @@ + snprintf(write, 256, "%i", conn->write); + snprintf(anonymous, 256, "%i", conn->anonymous); + +- xmlNewChild(doc->children, NULL, "servername", conn->servername); +- xmlNewChild(doc->children, NULL, "serverport", port); +- xmlNewChild(doc->children, NULL, "binddn", conn->binddn); +- xmlNewChild(doc->children, NULL, "pwd", conn->pwd); +- xmlNewChild(doc->children, NULL, "searchbase", conn->searchbase); +- xmlNewChild(doc->children, NULL, "filter", conn->filter); +- xmlNewChild(doc->children, NULL, "scope", scope); +- xmlNewChild(doc->children, NULL, "debuglevel", debuglevel); +- xmlNewChild(doc->children, NULL, "authmech", conn->authmech); +- xmlNewChild(doc->children, NULL, "encryption", encryption); +- xmlNewChild(doc->children, NULL, "write", write); +- xmlNewChild(doc->children, NULL, "anonymous", anonymous); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "servername", (const xmlChar *) conn->servername); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "serverport", (const xmlChar *) port); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "binddn", (const xmlChar *) conn->binddn); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "pwd", (const xmlChar *) conn->pwd); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "searchbase", (const xmlChar *) conn->searchbase); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "filter", (const xmlChar *) conn->filter); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "scope", (const xmlChar *) scope); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "debuglevel", (const xmlChar *) debuglevel); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "authmech", (const xmlChar *) conn->authmech); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "encryption", (const xmlChar *) encryption); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "write", (const xmlChar *) write); ++ xmlNewChild(doc->children, NULL, (const xmlChar *) "anonymous", (const xmlChar *) anonymous); + + xmlSaveFile(conn->statefile, doc); + xmlFreeDoc(doc); +@@ -180,10 +180,10 @@ + + while (child) { + if ((!xmlStrcmp(child->name, (const xmlChar *)"modifyTimestamp"))) { +- entry->modifyTimestamp = xmlNodeListGetString(doc, child->xmlChildrenNode, 1); ++ entry->modifyTimestamp = (char *) xmlNodeListGetString( doc, child->xmlChildrenNode, 1); + } + if ((!xmlStrcmp(child->name, (const xmlChar *)"uid"))) { +- entry->uid = xmlNodeListGetString(doc, child->xmlChildrenNode, 1); ++ entry->uid = (char *) xmlNodeListGetString(doc, child->xmlChildrenNode, 1); + } + + child = child->next; +@@ -282,16 +282,16 @@ + + ldap_debug(conn, 2, "Saving head data to file %s", conn->dbfile); + +- doc = xmlNewDoc("1.0"); +- doc->children = xmlNewDocNode(doc, NULL, "ldap_entries", NULL); ++ doc = xmlNewDoc( (const xmlChar *) "1.0"); ++ doc->children = xmlNewDocNode(doc, NULL, (const xmlChar *) "ldap_entries", NULL); + + while (ldaplist) { + entry = ((struct data_entry *)(ldaplist->data)); + ldap_debug(conn, 3, "Saving entry: ModTs: %s, uid: %s", entry->modifyTimestamp, entry->uid); + +- child = xmlNewChild(doc->children, NULL, "ldapentry", NULL); +- xmlNewChild(child, NULL, "modifyTimestamp", entry->modifyTimestamp); +- xmlNewChild(child, NULL, "uid", entry->uid); ++ child = xmlNewChild(doc->children, NULL, (const xmlChar *) "ldapentry", NULL); ++ xmlNewChild(child, NULL, (const xmlChar *) "modifyTimestamp", (const xmlChar *) entry->modifyTimestamp); ++ xmlNewChild(child, NULL, (const xmlChar *) "uid", (const xmlChar *) entry->uid); + + ldaplist = ldaplist->next; + } diff --git a/app-pda/multisync/multisync-0.83_pre20050414-r3.ebuild b/app-pda/multisync/multisync-0.83_pre20050414-r3.ebuild index c5be4479fe42..3bcd2b96e7e1 100644 --- a/app-pda/multisync/multisync-0.83_pre20050414-r3.ebuild +++ b/app-pda/multisync/multisync-0.83_pre20050414-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050414-r3.ebuild,v 1.2 2006/02/09 17:07:38 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050414-r3.ebuild,v 1.3 2006/03/16 17:40:27 sekretarz Exp $ -inherit versionator kde-functions +inherit versionator kde-functions eutils CVS_VERSION="${PV/*_pre/}" S=${WORKDIR}/${PN} @@ -13,7 +13,7 @@ HOMEPAGE="http://multisync.sourceforge.net/" SRC_URI="mirror://gentoo/${PN}-${CVS_VERSION}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" IUSE="evo irmc nokia6600 ldap bluetooth pda kdepim arts kdeenablefinal" # evo - evolution plugin # irmc - bluetooth/irmc/irda plugin ( local ) @@ -44,6 +44,13 @@ DEPEND=">=gnome-base/libbonobo-2.2 >=dev-libs/cyrus-sasl-2.1.4 ) nokia6600? ( >=dev-libs/libwbxml-0.9.0 )" +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${PN}-gcc4.patch +} + make_plugin_list() { local evoversion