mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
Merge branch 'for_main_slyfox' of https://github.com/mm1ke/gentoo
* 'for_main_slyfox' of https://github.com/mm1ke/gentoo: media-sound/xmms2: remove unused patches
This commit is contained in:
@@ -1,28 +0,0 @@
|
||||
diff --git a/wafadmin/Tools/perl.py b/wafadmin/Tools/perl.py
|
||||
index 9e3b12a..9005e6a 100644
|
||||
--- a/wafadmin/Tools/perl.py
|
||||
+++ b/wafadmin/Tools/perl.py
|
||||
@@ -99,8 +99,8 @@ def check_perl_ext_devel(conf):
|
||||
conf.env["CPPPATH_PERLEXT"] = read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'")
|
||||
conf.env["CCFLAGS_PERLEXT"] = read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'")
|
||||
|
||||
- conf.env["XSUBPP"] = read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'")
|
||||
- conf.env["EXTUTILS_TYPEMAP"] = read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'")
|
||||
+ conf.env["XSUBPP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'")
|
||||
+ conf.env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::typemap\")'")
|
||||
|
||||
if not getattr(Options.options, 'perlarchdir', None):
|
||||
conf.env["ARCHDIR_PERL"] = Utils.cmd_output(perl + " -MConfig -e'print $Config{sitearch}'")
|
||||
diff --git a/src/clients/lib/perl/typemap b/src/clients/lib/perl/typemap
|
||||
index 6cb033f..54e6c4d 100644
|
||||
--- a/src/clients/lib/perl/typemap
|
||||
+++ b/src/clients/lib/perl/typemap
|
||||
@@ -3,6 +3,8 @@ xmmsc_connection_t* XMMSC_CONNECTION_T
|
||||
xmmsv_coll_t* XMMSV_COLL_T
|
||||
xmmsv_coll_type_t XMMSV_COLL_TYPE_T
|
||||
xmmsv_coll_namespace_t T_PV
|
||||
+const unsigned char* T_PV
|
||||
+xmmsv_t* T_PV
|
||||
xmmsc_result_t* XMMSC_RESULT_T
|
||||
xmmsc_result_propdict_t* XMMSC_RESULT_PROPDICT_T
|
||||
xmms_plugin_type_t XMMS_PLUGIN_TYPE_T
|
||||
@@ -1,127 +0,0 @@
|
||||
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>
|
||||
@@ -1,52 +0,0 @@
|
||||
commit 3bc7fbff50bfcb065fb89d020c1b3fb8de049b19
|
||||
Author: Sergei Trofimovich <st@anti-virus.by>
|
||||
Date: Mon Apr 19 13:16:56 2010 +0300
|
||||
|
||||
OTHER: fix build failure on windres aware binutils (linux host, native build)
|
||||
|
||||
Trying to use windres under linux (native build) is worthless:
|
||||
|
||||
[ 26/269] winrc: pixmaps/xmms2.rc -> _build_/default/pixmaps/xmms2.rc.o
|
||||
/usr/bin/windres: can't get BFD_RELOC_RVA relocation type: No error
|
||||
Waf: Leaving directory `/var/tmp/paludis/media-sound-xmms2-9999-r3/work/xmms2-devel/_build_'
|
||||
Build failed
|
||||
-> task failed (err #1):
|
||||
{task: winrc xmms2.rc -> xmms2.rc.o}
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <st@anti-virus.by>
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index 2a29016..1d73813 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -265,12 +265,6 @@ def configure(conf):
|
||||
conf.check_tool('gcc')
|
||||
conf.check_tool('g++')
|
||||
|
||||
- try:
|
||||
- conf.check_tool('winres')
|
||||
- conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps')
|
||||
- conf.env['xmms_icon'] = True
|
||||
- except Configure.ConfigurationError:
|
||||
- conf.env['xmms_icon'] = False
|
||||
|
||||
if Options.options.target_platform:
|
||||
Options.platform = Options.options.target_platform
|
||||
@@ -412,6 +406,17 @@ def configure(conf):
|
||||
else:
|
||||
conf.env['socket_impl'] = 'posix'
|
||||
|
||||
+ # platform does not support icons ...
|
||||
+ conf.env['xmms_icon'] = False
|
||||
+ # ... unless we target on windows
|
||||
+ if Options.platform == 'win32':
|
||||
+ try:
|
||||
+ conf.check_tool('winres')
|
||||
+ conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps')
|
||||
+ conf.env['xmms_icon'] = True
|
||||
+ except Configure.ConfigurationError:
|
||||
+ pass
|
||||
+
|
||||
# Glib is required by everyone, so check for it here and let them
|
||||
# assume its presence.
|
||||
conf.check_cfg(package='glib-2.0', atleast_version='2.8.0', uselib_store='glib2', args='--cflags --libs', mandatory=1)
|
||||
Reference in New Issue
Block a user