diff options
author | Mark Loeser <halcy0n@gentoo.org> | 2005-06-05 03:28:14 +0000 |
---|---|---|
committer | Mark Loeser <halcy0n@gentoo.org> | 2005-06-05 03:28:14 +0000 |
commit | 1f73caf4e906073d177eccc202fbd16f4b4a424a (patch) | |
tree | 52c8620ba5479067659a5fd199291bd75b325486 /media-plugins | |
parent | repoman: Trim trailing whitespace (diff) | |
download | historical-1f73caf4e906073d177eccc202fbd16f4b4a424a.tar.gz historical-1f73caf4e906073d177eccc202fbd16f4b4a424a.tar.bz2 historical-1f73caf4e906073d177eccc202fbd16f4b4a424a.zip |
gcc4 patch
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'media-plugins')
-rw-r--r-- | media-plugins/xmms-kde/ChangeLog | 6 | ||||
-rw-r--r-- | media-plugins/xmms-kde/Manifest | 15 | ||||
-rw-r--r-- | media-plugins/xmms-kde/files/xmms-kde-3.1-gcc4.patch | 54 | ||||
-rw-r--r-- | media-plugins/xmms-kde/xmms-kde-3.1.ebuild | 7 |
4 files changed, 73 insertions, 9 deletions
diff --git a/media-plugins/xmms-kde/ChangeLog b/media-plugins/xmms-kde/ChangeLog index 745427213bae..3d2388b06db8 100644 --- a/media-plugins/xmms-kde/ChangeLog +++ b/media-plugins/xmms-kde/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/xmms-kde # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-kde/ChangeLog,v 1.11 2005/04/06 15:35:01 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-kde/ChangeLog,v 1.12 2005/06/05 03:28:14 halcy0n Exp $ + + 05 Jun 2005; Mark Loeser <halcy0n@gentoo.org> + +files/xmms-kde-3.1-gcc4.patch, xmms-kde-3.1.ebuild: + Patch to fix compilation with gcc4, thanks to wuno AT lsvw DOT de 06 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> xmms-kde-3.1.ebuild: Marked stable on amd64. diff --git a/media-plugins/xmms-kde/Manifest b/media-plugins/xmms-kde/Manifest index b824532845b2..0e337b4cc304 100644 --- a/media-plugins/xmms-kde/Manifest +++ b/media-plugins/xmms-kde/Manifest @@ -1,17 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 1d148317ff4a2495b26a7cc1a6695cb6 xmms-kde-3.1_beta1.ebuild 1118 -MD5 52b778a74c7741c73e62d9f5e98a0bfc ChangeLog 1493 +MD5 ca5ca1a0d61f92ebf4422292e617b656 ChangeLog 1667 MD5 12f9a79eb9cb758efadb993fd2288a91 metadata.xml 696 -MD5 3866e841247a3326d50a03e577ff5f03 xmms-kde-3.1.ebuild 744 -MD5 8ba6b5722200f81d0d033db7deea9cff files/xmms-kde-3.1_beta1-libsuffix-fix.patch 393 +MD5 e2b6d374d1b4f1b9b9bb70b56b503cc4 xmms-kde-3.1.ebuild 818 +MD5 1d148317ff4a2495b26a7cc1a6695cb6 xmms-kde-3.1_beta1.ebuild 1118 MD5 3e6358fd4d7585c191566a636ecd43d3 files/digest-xmms-kde-3.1 65 MD5 c0d893c15bd9e1b8ac53e6bf6decffe7 files/digest-xmms-kde-3.1_beta1 70 +MD5 8ba6b5722200f81d0d033db7deea9cff files/xmms-kde-3.1_beta1-libsuffix-fix.patch 393 +MD5 233ff8ddf6b7402b40eb024297ab06b3 files/xmms-kde-3.1-gcc4.patch 1676 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCVAG+ntT9W3vfTuoRAoAsAJ4rxVJkWb6+/qPMZaLDc0oMQHsCUACggeYp -/+HNYvkxL5ZNALAZigRyVJo= -=iPCe +iD8DBQFConFeCRZPokWLroQRAknSAJ0S5a3rWYeOaNd+d5LDautPIrvkdQCfXh6x +rSAWwE1QtyqFUBEqVDC9uTg= +=n4DS -----END PGP SIGNATURE----- diff --git a/media-plugins/xmms-kde/files/xmms-kde-3.1-gcc4.patch b/media-plugins/xmms-kde/files/xmms-kde-3.1-gcc4.patch new file mode 100644 index 000000000000..adbad4a6982d --- /dev/null +++ b/media-plugins/xmms-kde/files/xmms-kde-3.1-gcc4.patch @@ -0,0 +1,54 @@ +diff -urN ../tmp-orig/xmms-kde-3.1/xmms-kde/select.c ./xmms-kde/select.c +--- ../tmp-orig/xmms-kde-3.1/xmms-kde/select.c 2003-07-17 20:42:26.000000000 +0200 ++++ ./xmms-kde/select.c 2005-03-31 20:25:33.000000000 +0200 +@@ -724,6 +724,8 @@ + return z; + } + ++static int fillInColumnList(Parse*, Select*); ++ + /* + ** Given a SELECT statement, generate a Table structure that describes + ** the result set of that SELECT. +@@ -732,7 +734,6 @@ + Table *pTab; + int i; + ExprList *pEList; +- static int fillInColumnList(Parse*, Select*); + + if( fillInColumnList(pParse, pSelect) ){ + return 0; +@@ -1281,6 +1282,8 @@ + return 0; + } + ++static void changeTablesInList(ExprList*, int, int); ++ + /* + ** Recursively scan through an expression tree. For every reference + ** to a column in table number iFrom, change that reference to the +@@ -1291,7 +1294,6 @@ + if( pExpr->op==TK_COLUMN && pExpr->iTable==iFrom ){ + pExpr->iTable = iTo; + }else{ +- static void changeTablesInList(ExprList*, int, int); + changeTables(pExpr->pLeft, iFrom, iTo); + changeTables(pExpr->pRight, iFrom, iTo); + changeTablesInList(pExpr->pList, iFrom, iTo); +@@ -1306,6 +1308,8 @@ + } + } + ++static void substExprList(ExprList*,int,ExprList*,int); ++ + /* + ** Scan through the expression pExpr. Replace every reference to + ** a column in table number iTable with a copy of the corresponding +@@ -1344,7 +1348,6 @@ + changeTables(pExpr, iSub, iTable); + } + }else{ +- static void substExprList(ExprList*,int,ExprList*,int); + substExpr(pExpr->pLeft, iTable, pEList, iSub); + substExpr(pExpr->pRight, iTable, pEList, iSub); + substExprList(pExpr->pList, iTable, pEList, iSub); diff --git a/media-plugins/xmms-kde/xmms-kde-3.1.ebuild b/media-plugins/xmms-kde/xmms-kde-3.1.ebuild index fd0c54e9c772..6775ac4de5e2 100644 --- a/media-plugins/xmms-kde/xmms-kde-3.1.ebuild +++ b/media-plugins/xmms-kde/xmms-kde-3.1.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/media-plugins/xmms-kde/xmms-kde-3.1.ebuild,v 1.5 2005/04/06 15:35:01 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-kde/xmms-kde-3.1.ebuild,v 1.6 2005/06/05 03:28:14 halcy0n Exp $ inherit kde eutils @@ -19,6 +19,11 @@ DEPEND="xmms? ( >=media-sound/xmms-1.2.7-r23 ) need-kde 3.1 +src_unpack() { + kde_src_unpack + epatch "${FILESDIR}"/${P}-gcc4.patch +} + src_compile() { myconf="--disable-gtk-test" kde_src_compile |