[arch-commits] Commit in kdebindings-korundum/trunk (PKGBUILD ruby19.patch)

[Andrea Scarpino]

    Date: Friday, July 27, 2012 @ 06:56:48
  Author: andrea
Revision: 164193

Proper patch

Modified:
  kdebindings-korundum/trunk/PKGBUILD
  kdebindings-korundum/trunk/ruby19.patch

--------------+
 PKGBUILD     |    3 +--
 ruby19.patch |   18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-27 09:35:05 UTC (rev 164192)
+++ PKGBUILD	2012-07-27 10:56:48 UTC (rev 164193)
@@ -13,11 +13,10 @@
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
              'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
 conflicts=('kdebindings-ruby')
-options=('!makeflags')
 source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz"
         'ruby19.patch')
 sha1sums=('7c97b549bb6958223fc0b28f657fec09bb95b7e5'
-          '73299f56a891d8a5475ac07dd485619859312f70')
+          'c074f027bac3b9bffe70a2c2304a6a7be12be034')
 
 build() {
   cd "${srcdir}/korundum-${pkgver}"

Modified: ruby19.patch
===================================================================
--- ruby19.patch	2012-07-27 09:35:05 UTC (rev 164192)
+++ ruby19.patch	2012-07-27 10:56:48 UTC (rev 164193)
@@ -1,30 +1,30 @@
-diff -up korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 korundum-4.8.0/src/krubypluginfactory.cpp
---- korundum-4.8.0/src/krubypluginfactory.cpp.ruby19	2011-07-27 13:37:29.000000000 -0500
-+++ korundum-4.8.0/src/krubypluginfactory.cpp	2012-02-17 08:30:38.785635819 -0600
-@@ -39,7 +39,7 @@
+--- korundum-4.9.0/src/krubypluginfactory.cpp~	2012-07-27 10:44:19.544464612 +0000
++++ korundum-4.9.0/src/krubypluginfactory.cpp	2012-07-27 10:53:15.247374749 +0000
+@@ -39,7 +39,6 @@
  extern "C" {
  extern VALUE rb_load_path;
  extern VALUE qt_internal_module;
 -void Init_prelude(void);
-+// void Init_prelude(void);
  }
  
  //
-@@ -165,7 +165,7 @@ QObject *KRubyPluginFactory::create(cons
+@@ -165,7 +164,8 @@
  #if RUBY_VERSION >= 0x10900
      VALUE gem = rb_define_module("Gem");
      rb_const_set(gem, rb_intern("Enable"), Qtrue);
 -    Init_prelude(); 
-+//    Init_prelude(); 
++    char *opts[] = { "ruby", "-e;" };
++    ruby_options(2, opts);
  #endif
  
      ruby_incpush(QFile::encodeName(program.path()));
-@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv)
+@@ -342,7 +342,8 @@
  #if RUBY_VERSION >= 0x10900
      VALUE gem = rb_define_module("Gem");
      rb_const_set(gem, rb_intern("Enable"), Qtrue);
 -    Init_prelude();                                             
-+//    Init_prelude();                                             
++    char *opts[] = { "ruby", "-e;" };
++    ruby_options(2, opts);
  #endif
  
      ruby_incpush(QFile::encodeName(program.path()));