RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ rpmruby.c

From: Jeff Johnson <jbj@rpm5.org>
Date: Mon 16 Aug 2010 - 15:17:41 CEST
Message-Id: <20100816131741.D0BFFBA48F@rpm5.org>
  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:17:41
  Branch: HEAD                             Handle: 2010081613174100

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               rpmruby.c

  Log:
    - ruby: fix: retrofit RSTRING_PTR/RSTRING_LEN into ruby-1.8.5.

  Summary:
    Revision    Changes     Path
    1.3415      +1  -0      rpm/CHANGES
    2.15        +7  -0      rpm/rpmio/rpmruby.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3414 -r1.3415 CHANGES
  --- rpm/CHANGES	13 Aug 2010 21:38:38 -0000	1.3414
  +++ rpm/CHANGES	16 Aug 2010 13:17:41 -0000	1.3415
  @@ -1,4 +1,5 @@
   5.3.2 -> 5.4a1:
  +    - 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.14 -r2.15 rpmruby.c
  --- rpm/rpmio/rpmruby.c	21 May 2010 03:13:05 -0000	2.14
  +++ rpm/rpmio/rpmruby.c	16 Aug 2010 13:17:41 -0000	2.15
  @@ -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:17:41 2010
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.