summaryrefslogtreecommitdiffstats
path: root/redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-06-24 19:50:32 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-06-24 19:50:32 +0200
commitb4359e8bf97799f83dc1ca62744db7cfcc81bc87 (patch)
tree3346872613490cc467c19e1645d0026c1221bce7 /redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch
parent4cc71d79c5718d59078d06c497a56d7c05b41576 (diff)
downloadtde-packaging-b4359e8bf97799f83dc1ca62744db7cfcc81bc87.tar.gz
tde-packaging-b4359e8bf97799f83dc1ca62744db7cfcc81bc87.zip
RPM Packaging: rename directories
Diffstat (limited to 'redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch')
-rw-r--r--redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch b/redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch
new file mode 100644
index 000000000..2798aa904
--- /dev/null
+++ b/redhat/tdebindings/kdebindings-3.5.13.1-fix_ftbfs_ruby18.patch
@@ -0,0 +1,56 @@
+commit 14594d81891b0bdf9aa03f72b88d6939eee59f02
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date: 1347389903 -0500
+
+ Fix FTBFS on ruby 1.8.x
+
+diff --git a/korundum/bin/krubyinit.cpp b/korundum/bin/krubyinit.cpp
+index f53f830..12b0f6e 100644
+--- a/korundum/bin/krubyinit.cpp
++++ b/korundum/bin/krubyinit.cpp
+@@ -25,13 +25,18 @@
+ * *
+ ***************************************************************************/
+
+-// this name can be used to allow apps
++// this name can be used to allow apps
+ // to detect what they were started with
+ static const char* script_name = "krubyinit_app";
+
+ int main(int argc, char **argv) {
+ ruby_init();
+ ruby_script((char*)script_name);
+- void* node = ruby_options(argc, argv);
++#ifdef HAVE_RUBY_1_9
++ void* node = ruby_options(argc, argv);
+ ruby_run_node(node);
++#else // HAVE_RUBY_1_9
++ ruby_options(argc, argv);
++ ruby_run();
++#endif // HAVE_RUBY_1_9
+ }
+diff --git a/qtruby/bin/qtrubyinit.cpp b/qtruby/bin/qtrubyinit.cpp
+index 65c00c4..c9569d9 100644
+--- a/qtruby/bin/qtrubyinit.cpp
++++ b/qtruby/bin/qtrubyinit.cpp
+@@ -25,13 +25,18 @@ qrubyinit - makes use of tdeinit_wrapper possible for ruby programs
+ * *
+ ***************************************************************************/
+
+-// this name can be used to allow apps
++// this name can be used to allow apps
+ // to detect what they were started with
+ static const char* script_name = "qrubyinit_app";
+
+ int main(int argc, char **argv) {
+ ruby_init();
+ ruby_script((char*)script_name);
+- void* node = ruby_options(argc, argv);
++#ifdef HAVE_RUBY_1_9
++ void* node = ruby_options(argc, argv);
+ ruby_run_node(node);
++#else // HAVE_RUBY_1_9
++ ruby_options(argc, argv);
++ ruby_run();
++#endif // HAVE_RUBY_1_9
+ }