Fixed missing prototypes (bug #340361).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 139 insertions, 5 deletions

diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index 423b94795a9b..ce39bb23af5c 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/xmms2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.3 2010/07/01 08:22:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.4 2010/10/10 18:35:22 slyfox Exp $
+
+  10 Oct 2010; Sergei Trofimovich <slyfox@gentoo.org> xmms2-0.7-r2.ebuild,
+  +files/xmms2-0.7DrNo-missing-protos.patch:
+  Fixed missing prototypes (bug #340361). Thanks to Misha
+  <thezogg@gmail.com> for the report.
 
 *xmms2-0.7-r2 (01 Jul 2010)
 
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 4f05953ce060..a6f1328663bd 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,5 +1,6 @@
+AUX xmms2-0.7DrNo-missing-protos.patch 4252 RMD160 0d3d15c8b326690bab11850450f02462c76ec2a8 SHA1 bee9cfb77011e1537c1526005343d288f4bf9946 SHA256 76c5953772fa9a2108384539235cbd5127948f8f7a0a5d354faf99b7f916dcd3
 AUX xmms2-0.7DrNo-windres-build-fix.patch 1929 RMD160 61f8840d4e4349b5459f6760b94f0a439b6cfa87 SHA1 41ccd4db5c48d70a860d59ebb323796f243774bf SHA256 f71546af163b017678282a9ded8ec8e70ea486b95f96c68a62ad5a3edf0db39f
 DIST xmms2-0.7DrNo.tar.bz2 1519973 RMD160 3a526df9fa1ed5103b6a252c34c0394bf0e4f156 SHA1 4999568654a0d2aba84bda4b22145058bbd3fcb2 SHA256 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
-EBUILD xmms2-0.7-r2.ebuild 6158 RMD160 9ed0627b1fbcea0d46d6c963c735d2377d8a2656 SHA1 09fd0e3db91e6f38d0f54aa394f428e3212ac348 SHA256 6406fc5dfb366cba7736b05c609666a31b6940f0f814b35cacf9509a9769ee65
-MISC ChangeLog 1191 RMD160 b7a8d50b36db37876a8902f21a35c48d51c1c98d SHA1 f2eae39d340c9130b5e4d9f00b9cdb5864fd3c5e SHA256 0e52fc71d36e5cefffe94e8786045bfac60e8bcf15fe81a48f9a1a41a88da8c1
+EBUILD xmms2-0.7-r2.ebuild 6208 RMD160 897c8dc51acb2d0829efd4ac1a3663ac04ba1938 SHA1 87bc65a192810d94b82700b52e795b4be5d0893b SHA256 9464a2135180ffbfaaf44566cf84decc01ef3849f874f5e4ab670367c3603e74
+MISC ChangeLog 1408 RMD160 d5eb00723d64cb705c0bfa21b8f4c354ac9262a5 SHA1 6f92a2063bbeb10539f86a9301b28b2aa3cc2b56 SHA256 cb4150d38e3d4419b00b80cfe4ca07572c8dfa6aad27dbe051eb6fddb5d2c20d
 MISC metadata.xml 2543 RMD160 880160906497e70efe5a12415bcb7a97a2677fcd SHA1 37318858b1a48b7030fc2e4186b756bcb0dd4094 SHA256 62ab3169c4051f6df1393fcfdb1d70e6ba14acf23be1f18120b8f4cf6c3787fb
diff --git a/media-sound/xmms2/files/xmms2-0.7DrNo-missing-protos.patch b/media-sound/xmms2/files/xmms2-0.7DrNo-missing-protos.patch
new file mode 100644
index 000000000000..2c8de0c05b62
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.7DrNo-missing-protos.patch
@@ -0,0 +1,127 @@
+commit 2df15fc79acc7ef5ea9213c87f6700faf138518d
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Oct 10 21:08:05 2010 +0300
+
+    OTHER: one more me in AUTHORS
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/AUTHORS b/AUTHORS
+index f2ef9af..e33acb5 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -354,6 +354,7 @@ D: Various fixes
+ 
+ N: Sergei Trofimovich
+ E: slyich@gmail.com
++E: slyfox@gentoo.org
+ E: slyfox@inbox.ru
+ E: st@anti-virus.by
+ D: Various Cleanups
+
+commit fb4eede29ba11d2ecec039de6899f8cce55dde8d
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Oct 10 21:01:49 2010 +0300
+
+    OTHER: explicitely declare xmmsc_mainloop_gmain_init() and _xmmsc_medialib_encode_url()
+    
+    Added according includefiles
+    
+    Was spotted by ZogG on #xmms2
+    And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
+    
+    gcc's warning:
+    ../src/clients/medialib-updater/main.c: In function 'updater_connect':
+    ../src/clients/medialib-updater/main.c:135: warning: implicit declaration of function 'xmmsc_mainloop_gmain_init'
+    ../src/clients/medialib-updater/main.c: In function 'updater_remove_directory':
+    ../src/clients/medialib-updater/main.c:468: warning: implicit declaration of function '_xmmsc_medialib_encode_url'
+    ../src/clients/medialib-updater/main.c:468: warning: cast to pointer from integer of different size
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/src/clients/medialib-updater/main.c b/src/clients/medialib-updater/main.c
+index 3b36bc9..2dd7b08 100644
+--- a/src/clients/medialib-updater/main.c
++++ b/src/clients/medialib-updater/main.c
+@@ -18,6 +18,9 @@
+ 
+ #include <gio/gio.h>
+ #include <xmmsclient/xmmsclient.h>
++#include <xmmsclient/xmmsclient-glib.h>
++
++#include "xmmsclientpriv/xmmsclient.h" // _xmmsc_medialib_encode_url
+ 
+ #include <xmms_configuration.h>
+ 
+diff --git a/src/clients/medialib-updater/wscript b/src/clients/medialib-updater/wscript
+index 841ae85..cd38b5e 100644
+--- a/src/clients/medialib-updater/wscript
++++ b/src/clients/medialib-updater/wscript
+@@ -4,7 +4,7 @@ def build(bld):
+     obj = bld.new_task_gen('cc', 'program')
+     obj.target = 'xmms2-mlib-updater'
+     obj.source = "main.c"
+-    obj.includes = '. ../../.. ../../include'
++    obj.includes = '. ../../.. ../../include ../../includepriv'
+     obj.uselib = 'glib2 GIO-2.0 GTHREAD-2.0'
+     obj.uselib_local = 'xmmsclient-glib xmmsclient'
+ 
+
+commit a3dff97f048bae91cdfd8b2bc761cd9ebe184eb9
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Oct 10 20:52:30 2010 +0300
+
+    OTHER: explicitely declare g_sprintf()
+    
+    g_sprintf is not defined by glib.h (glib-2.24.2),
+    but it's defined by <glib/gsprintf.h>
+    
+    Was spotted by ZogG on #xmms2
+    And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
+    
+    gcc's warning:
+    ../src/xmms/magic.c: In function 'xmms_magic_match':
+    ../src/xmms/magic.c:470: warning: implicit declaration of function 'g_sprintf'
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/src/xmms/magic.c b/src/xmms/magic.c
+index 31b0b00..a0f9658 100644
+--- a/src/xmms/magic.c
++++ b/src/xmms/magic.c
+@@ -15,8 +15,8 @@
+  */
+ 
+ 
+-
+ #include <glib.h>
++#include <glib/gprintf.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
+
+commit 43648e7b701a9598d9a9769caec152fd23b4e2f5
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Oct 10 20:47:23 2010 +0300
+
+    OTHER: explicitely declare semtimedop()
+    
+    semtimedop(2) is a GNU extension which needs _GNU_SOURCE
+    to be defined. Was spotted by ZogG on #xmms2
+    And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
+    
+    gcc's warning:
+    
+     * ../src/clients/lib/xmmsclient/visualization/unixshm.c:102: warning: implicit declaration of function 'semtimedop'
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/src/clients/lib/xmmsclient/visualization/unixshm.c b/src/clients/lib/xmmsclient/visualization/unixshm.c
+index 50883a9..3d28ccc 100644
+--- a/src/clients/lib/xmmsclient/visualization/unixshm.c
++++ b/src/clients/lib/xmmsclient/visualization/unixshm.c
+@@ -1,3 +1,4 @@
++#define _GNU_SOURCE // semtimedop is a GNU extension
+ #include "common.h"
+ 
+ #include <sys/shm.h>
diff --git a/media-sound/xmms2/xmms2-0.7-r2.ebuild b/media-sound/xmms2/xmms2-0.7-r2.ebuild
index 01af53c4c21e..c4bd3347f276 100644
--- a/media-sound/xmms2/xmms2-0.7-r2.ebuild
+++ b/media-sound/xmms2/xmms2-0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r2.ebuild,v 1.1 2010/07/01 08:22:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r2.ebuild,v 1.2 2010/10/10 18:35:22 slyfox Exp $
 
 EAPI=3
 
@@ -72,7 +72,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=("${FILESDIR}/xmms2-0.7DrNo-windres-build-fix.patch")
+PATCHES=("${FILESDIR}/xmms2-0.7DrNo-windres-build-fix.patch"
+	"${FILESDIR}/xmms2-0.7DrNo-missing-protos.patch")
 
 # use_enable() is taken as proto
 # $1 - useflag