[xchat-ruby] Fix for Ruby 1.9.2 (#828008) from Pallai Roland

konradm konradm at fedoraproject.org
Tue Jun 5 02:31:04 UTC 2012


commit b250ccd4b5f978f580538622221c3ddae041ebd3
Author: Conrad Meyer <cemeyer at uw.edu>
Date:   Mon Jun 4 19:30:46 2012 -0700

    Fix for Ruby 1.9.2 (#828008) from Pallai Roland

 xchat-ruby-1-2-ruby192-fix.diff |   11 +++++++++++
 xchat-ruby.spec                 |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/xchat-ruby-1-2-ruby192-fix.diff b/xchat-ruby-1-2-ruby192-fix.diff
new file mode 100644
index 0000000..2e4c29d
--- /dev/null
+++ b/xchat-ruby-1-2-ruby192-fix.diff
@@ -0,0 +1,11 @@
+--- xchat-ruby-1.2-src/src/xchat-ruby.c.orig	2012-06-04 02:34:03.000000000 +0200
++++ xchat-ruby-1.2-src/src/xchat-ruby.c.orig	2012-06-04 02:35:18.944609899 +0200
+@@ -36,6 +36,8 @@ 
+ 
+ #define XCHAT_RUBY_VERSION "1.2"
+ 
++#define	STR2CSTR	StringValuePtr
++
+ static xchat_plugin *static_plugin_handle = NULL;
+ static xchat_plugin *ph = NULL;
+ static int           static_ruby_initialized = 0;
diff --git a/xchat-ruby.spec b/xchat-ruby.spec
index 342e7c6..0dcd19c 100644
--- a/xchat-ruby.spec
+++ b/xchat-ruby.spec
@@ -1,6 +1,6 @@
 Name: xchat-ruby
 Version: 1.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: An X-Chat plugin providing scripting functionality with Ruby
 
 Group: Applications/Internet
@@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: xchat-ruby-global-rubyenv.patch
 Patch1: xchat-ruby-dont-ignore-cflags.patch
 Patch2: xchat-ruby-1.2-fix-null-ptr-deref.diff
+Patch3: xchat-ruby-1-2-ruby192-fix.diff
 
 BuildRequires: ruby(abi) = 1.9.1
 BuildRequires: ruby-devel ruby
@@ -31,6 +32,7 @@ language in which to write X-Chat plugins.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
@@ -59,6 +61,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jun 4 2012 Conrad Meyer <konrad at tylerc.org> - 1.2-13
+- Fix for Ruby 1.9.2 (#828008) from Pallai Roland
+
 * Wed Feb 08 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1.2-12
 - Rebuilt for Ruby 1.9.3.
 


More information about the scm-commits mailing list