[ruby-korundum/f19: 6/8] Revert "remove patch, it's included in 4.10.5"

Rex Dieter rdieter at fedoraproject.org
Thu Sep 5 20:32:50 UTC 2013


commit d35b294e6b53633a2cf2e715b8221c58c87d1375
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 15:32:16 2013 -0500

    Revert "remove patch, it's included in 4.10.5"
    
    This reverts commit 689a1ada6b618f604c7885b492e444deedd46aee.

 korundum-4.8.0-ruby19.patch |   30 ++++++++++++++++++++++++++++++
 ruby-korundum.spec          |    7 +++++++
 2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/korundum-4.8.0-ruby19.patch b/korundum-4.8.0-ruby19.patch
new file mode 100644
index 0000000..ac4d32a
--- /dev/null
+++ b/korundum-4.8.0-ruby19.patch
@@ -0,0 +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 @@
+ 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
+ #if RUBY_VERSION >= 0x10900
+     VALUE gem = rb_define_module("Gem");
+     rb_const_set(gem, rb_intern("Enable"), Qtrue);
+-    Init_prelude(); 
++//    Init_prelude(); 
+ #endif
+ 
+     ruby_incpush(QFile::encodeName(program.path()));
+@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv)
+ #if RUBY_VERSION >= 0x10900
+     VALUE gem = rb_define_module("Gem");
+     rb_const_set(gem, rb_intern("Enable"), Qtrue);
+-    Init_prelude();                                             
++//    Init_prelude();                                             
+ #endif
+ 
+     ruby_incpush(QFile::encodeName(program.path()));
diff --git a/ruby-korundum.spec b/ruby-korundum.spec
index 06572f8..71b67fe 100644
--- a/ruby-korundum.spec
+++ b/ruby-korundum.spec
@@ -30,6 +30,8 @@ URL:     https://projects.kde.org/projects/kde/kdebindings/ruby/korundum
 Source0: http://download.kde.org/%{stable}/%{version}/src/korundum-%{version}.tar.xz
 
 ## upstreamable patches
+# https://bugs.kde.org/show_bug.cgi?id=287057
+Patch50: korundum-4.8.0-ruby19.patch
 
 BuildRequires: kdelibs4-devel >= %{version} 
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -64,6 +66,11 @@ Requires: smokekde-akonadi%{?_isa} >= %{version}
 %prep
 %setup -q -n korundum-%{version}
 
+%if 0%{?fedora} > 16
+%patch50 -p1 -b .ruby19
+%endif
+
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}


More information about the scm-commits mailing list