RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 16-Aug-2010 15:16:15
Branch: rpm-5_2 Handle: 2010081613161003
Modified files: (Branch: rpm-5_2)
rpm CHANGES
rpm/rpmio rpmruby.c
Log:
- ruby: fix: retrofit RSTRING_PTR/RSTRING_LEN into ruby-1.8.5.
Summary:
Revision Changes Path
1.2970.2.62 +1 -0 rpm/CHANGES
2.9.2.2 +7 -0 rpm/rpmio/rpmruby.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2970.2.61 -r1.2970.2.62 CHANGES
--- rpm/CHANGES 13 Aug 2010 22:33:11 -0000 1.2970.2.61
+++ rpm/CHANGES 16 Aug 2010 13:16:10 -0000 1.2970.2.62
@@ -1,4 +1,5 @@
5.2.1 -> 5.2.2:
+ - jbj: ruby: fix: retrofit RSTRING_PTR/RSTRING_LEN into ruby-1.8.5.
- jbj: solve: loop over solve db's in a bag.
- jbj: solve: stub-in toy add/del methods.
- jbj: solve: permit multiple solvedb's in a rpmbag.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmruby.c
============================================================================
$ cvs diff -u -r2.9.2.1 -r2.9.2.2 rpmruby.c
--- rpm/rpmio/rpmruby.c 10 May 2009 15:32:01 -0000 2.9.2.1
+++ rpm/rpmio/rpmruby.c 16 Aug 2010 13:16:13 -0000 2.9.2.2
@@ -13,6 +13,13 @@
#if defined(WITH_RUBYEMBED)
#include <ruby.h>
+
+#if !defined(RSTRING_PTR)
+/* XXX retrofit for ruby-1.8.5 in CentOS5 */
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
#endif
#define _RPMRUBY_INTERNAL
@@ .
Received on Mon Aug 16 15:16:17 2010