Magellan Linux

Annotation of /trunk/korundum/patches/korundum-4.9.4-ruby19.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2009 - (hide annotations) (download)
Tue Jan 1 23:30:07 2013 UTC (11 years, 4 months ago) by niro
Original Path: korundum/patches/korundum-4.9.4-ruby19.patch
File size: 881 byte(s)
-added patch to fix build with ruby-1.9
1 niro 2009 --- korundum-4.9.0/src/krubypluginfactory.cpp~ 2012-07-27 10:44:19.544464612 +0000
2     +++ korundum-4.9.0/src/krubypluginfactory.cpp 2012-07-27 10:53:15.247374749 +0000
3     @@ -39,7 +39,6 @@
4     extern "C" {
5     extern VALUE rb_load_path;
6     extern VALUE qt_internal_module;
7     -void Init_prelude(void);
8     }
9    
10     //
11     @@ -165,7 +164,8 @@
12     #if RUBY_VERSION >= 0x10900
13     VALUE gem = rb_define_module("Gem");
14     rb_const_set(gem, rb_intern("Enable"), Qtrue);
15     - Init_prelude();
16     + char *opts[] = { "ruby", "-e;" };
17     + ruby_options(2, opts);
18     #endif
19    
20     ruby_incpush(QFile::encodeName(program.path()));
21     @@ -342,7 +342,8 @@
22     #if RUBY_VERSION >= 0x10900
23     VALUE gem = rb_define_module("Gem");
24     rb_const_set(gem, rb_intern("Enable"), Qtrue);
25     - Init_prelude();
26     + char *opts[] = { "ruby", "-e;" };
27     + ruby_options(2, opts);
28     #endif
29    
30     ruby_incpush(QFile::encodeName(program.path()));