-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

tags 441684 + patch
thanks

Hi,

upstream ruby removed file version.h . But we already have lots of fixes
based on string RUBY_VERSION_CODE, so it's easier to recreate this
version.h for ruby1.9 package. This patch fix this bug.

It also fix another bug introduced by ruby1.9 upstream changes.

Cheers,

filipe {
 @             icewall.org
 GPG        1024D/A6BA423E
 Jabber  [EMAIL PROTECTED]
}
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFHT0frmKFbPqa6Qj4RAvcdAJ9kgWCrI5LNBRdhcL7uqvsvXUTkmQCghvdn
Bh6h0zezkyV2MBtXvujnZCQ=
=xSuR
-----END PGP SIGNATURE-----
diff -Nru libdb4.3-ruby-0.5.8-old/debian/rules libdb4.3-ruby-0.5.8/debian/rules
--- libdb4.3-ruby-0.5.8-old/debian/rules	2007-11-29 23:03:32.000000000 +0000
+++ libdb4.3-ruby-0.5.8/debian/rules	2007-11-29 22:56:19.101222182 +0000
@@ -30,6 +30,7 @@
 
 	tar -C build-tree-1.8 -zxf debian/src.tgz
 	tar -C build-tree-1.9 -zxf debian/src.tgz
+	echo "#define RUBY_VERSION_CODE 190" > build-tree-1.9/src/version.h
 
 	ruby1.8 -C build-tree-1.8 extconf.rb --with-db-version=-4.3
 	ruby1.9 -C build-tree-1.9 extconf.rb --with-db-version=-4.3
diff -Nru libdb4.3-ruby-0.5.8-old/src/common.c libdb4.3-ruby-0.5.8/src/common.c
--- libdb4.3-ruby-0.5.8-old/src/common.c	2007-11-29 23:03:32.000000000 +0000
+++ libdb4.3-ruby-0.5.8/src/common.c	2007-11-29 23:02:28.077215536 +0000
@@ -1413,7 +1413,11 @@
 	    dbst->type = DB_UNKNOWN;
 	    break;
 	}
+#if RUBY_VERSION_CODE >= 190
+	cl = RCLASS_SUPER(cl);
+#else
 	cl = RCLASS(cl)->super;
+#endif
     }
     if (!cl) {
 	rb_raise(bdb_eFatal, "unknown database type");

Reply via email to