Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/xmms2-01-ruby.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 768 3dfec715e177
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
768
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     1
 
--- xmms2-0.4DrKosmos/src/clients/lib/ruby/wscript.orig	2008-01-03 22:29:01.708109000 +0530
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     2
 
+++ xmms2-0.4DrKosmos/src/clients/lib/ruby/wscript	2008-01-03 22:55:42.250546000 +0530
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     3
 
@@ -53,14 +53,23 @@
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     4
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     5
 
     ruby_h = os.popen(ruby + " -rrbconfig -e 'puts File.exist?(Config::CONFIG[\"archdir\"] + \"/ruby.h\")'").read().strip()
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     6
 
     if ruby_h != 'true':
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     7
 
-        conf.check_message('ruby', 'header file', False)
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     8
 
-        return False
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
     9
 
+        ruby_h = os.popen(ruby + " -rrbconfig -e 'puts File.exist?(Config::CONFIG[\"rubyhdrdir\"] + \"/ruby.h\")'").read().strip()
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    10
 
+        if ruby_h != 'true':
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    11
 
+            conf.check_message('ruby', 'header file', False)
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    12
 
+            return False
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    13
 
     conf.check_message('ruby', 'header file', True)
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    14
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    15
 
     dir = os.popen(ruby + " -rrbconfig -e 'puts \"%s\" % [].fill(Config::CONFIG[\"archdir\"], 0..1)'").read().strip()
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    16
 
     conf.env["CPPPATH_ruby"] = dir
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    17
 
     conf.env["LINKFLAGS_ruby"] = '-L%s' % dir
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    18
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    19
 
+    hdir = os.popen(ruby + " -rrbconfig -e 'puts Config::CONFIG[\"rubyhdrdir\"]'").read().strip()
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    20
 
+    conf.env["CCFLAGS_ruby"] = '-I%s ' % hdir
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    21
 
+    hdir += "/ruby"
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    22
 
+    conf.env["CCFLAGS_ruby"] += '-I%s ' % hdir
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    23
 
+    hdir = os.popen(ruby + " -rrbconfig -e 'puts File.join(Config::CONFIG[\"rubyhdrdir\"], Config::CONFIG[\"arch\"])'").read().strip()
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    24
 
+    conf.env["CCFLAGS_ruby"] += '-I%s ' % hdir
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    25
 
+
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    26
 
     ldflags = os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"LDSHARED\"]'").read().strip()
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    27
 
     # ok this is really stupid, but the command and flags are combined.
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    28
 
     # so we try to find the first argument...
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    29
 
@@ -75,7 +84,7 @@
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    30
 
     conf.env["LINKFLAGS_ruby"] += " "+ldflags
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    31
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    32
 
     cflags = os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"CCDLFLAGS\"]'").read().strip()
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    33
 
-    conf.env["CCFLAGS_ruby"] = cflags
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    34
 
+    conf.env["CCFLAGS_ruby"] += cflags
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    35
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    36
 
     if not Params.g_options.rubyarchdir:
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    37
 
         conf.env["ARCHDIR_ruby"] = os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"sitearchdir\"]'").read().strip()
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    38
 
--- xmms2-0.4DrKosmos/src/clients/lib/ruby/rb_xmmsclient.c.orig	2008-01-03 23:20:56.341209000 +0530
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    39
 
+++ xmms2-0.4DrKosmos/src/clients/lib/ruby/rb_xmmsclient.c	2008-01-03 23:21:24.580284000 +0530
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    40
 
@@ -73,8 +73,8 @@
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    41
 
 	StringValue (arg1); \
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    42
 
 \
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    43
 
 	res = xmmsc_##name (xmms->real, \
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    44
 
-	                    (unsigned char *) RSTRING (arg1)->ptr, \
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    45
 
-	                    RSTRING (arg1)->len); \
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    46
 
+	                    (unsigned char *) RSTRING_PTR(arg1), \
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    47
 
+	                    RSTRING_LEN(arg1)); \
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    48
 
 	METHOD_HANDLER_FOOTER
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    49
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    50
 
 static VALUE cPlaylist;
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    51
 
--- xmms2-0.4DrKosmos/src/clients/lib/ruby/rb_collection.c.orig	2008-01-03 23:21:47.342022000 +0530
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    52
 
+++ xmms2-0.4DrKosmos/src/clients/lib/ruby/rb_collection.c	2008-01-03 23:22:13.148443000 +0530
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    53
 
@@ -287,7 +287,7 @@
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    54
 
 	key = RARRAY (args)->ptr[0];
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    55
 
 	value = RARRAY (args)->ptr[1];
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    56
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    57
 
-	if (RSTRING (s)->len > 1)
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    58
 
+	if (RSTRING_LEN(s) > 1)
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    59
 
 		rb_str_buf_cat2 (s, ", ");
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    60
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    61
 
 	rb_str_buf_append (s, rb_inspect (key));
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    62
 
--- xmms2-0.4DrKosmos/src/clients/lib/ruby/rb_result.c.orig	2008-01-03 23:32:04.757832000 +0530
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    63
 
+++ xmms2-0.4DrKosmos/src/clients/lib/ruby/rb_result.c	2008-01-03 23:32:25.283902000 +0530
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    64
 
@@ -422,7 +422,7 @@
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    65
 
 	key = RARRAY (args)->ptr[1];
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    66
 
 	value = RARRAY (args)->ptr[2];
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    67
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    68
 
-	if (RSTRING (s)->len > 1)
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    69
 
+	if (RSTRING_LEN(s) > 1)
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    70
 
 		rb_str_buf_cat2 (s, ", ");
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    71
3dfec715e177 Bumped version to 0.4DrKosmos, add SUNWsqlite dep, add patch to
moinakg
parents:
diff changeset 
    72
 
 	rb_str_buf_cat2 (s, "[");
upstream/spec-files-extra