Tags 384756 + pending
Thanks
Hi!
I have pulled the patch from upstream cvs, as suggested by Markus Koller
and applied it to the package.
I intend to upload the package with the patch applied as an NMU.
I'm attaching the full interdiff output. As you can see, it's only the
patch, the line in the "series" file, and the changelog entry.
I've tested this and I was able to reproduce the bug and then check that it
was correctly fixed.
--
Love,
Marga.
diff -u ruby-gnome2-0.15.0/debian/patches/series
ruby-gnome2-0.15.0/debian/patches/series
--- ruby-gnome2-0.15.0/debian/patches/series
+++ ruby-gnome2-0.15.0/debian/patches/series
@@ -4,0 +5 @@
+command-line-args.patch
diff -u ruby-gnome2-0.15.0/debian/changelog ruby-gnome2-0.15.0/debian/changelog
--- ruby-gnome2-0.15.0/debian/changelog
+++ ruby-gnome2-0.15.0/debian/changelog
@@ -1,3 +1,11 @@
+ruby-gnome2 (0.15.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload to fix backwards compatibility problem.
+ * Added debian/patches/command-line-args.patch, taken from upstream's CVS,
+ as suggested by Markus Koller. (Closes: #384756).
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Sat, 9 Sep 2006 18:04:44 -0300
+
ruby-gnome2 (0.15.0-1) unstable; urgency=low
[Dafydd Harries]
only in patch2:
unchanged:
--- ruby-gnome2-0.15.0.orig/debian/patches/command-line-args.patch
+++ ruby-gnome2-0.15.0/debian/patches/command-line-args.patch
@@ -0,0 +1,37 @@
+--- ruby-gnome/gtk/src/rbgtkmain.c 2006/07/01 09:50:11 1.35
++++ ruby-gnome/gtk/src/rbgtkmain.c 2006/07/17 11:28:34 1.36
+@@ -130,7 +130,6 @@
+
+ {
+ gboolean is_initialized;
+- GError* error = NULL;
+ /* Gdk modifies sighandlers, sigh */
+ #ifdef NT
+ RETSIGTYPE (*sigfunc[3])();
+@@ -152,22 +151,12 @@
+ sigfunc[6] = signal(SIGTERM, SIG_IGN);
+ #endif
+
+-#if GTK_CHECK_VERSION(2,6,0)
+- is_initialized = gtk_init_with_args(&gargc, &gargv, NULL, NULL, NULL,
&error);
+-#else
+ is_initialized = gtk_init_check(&gargc, &gargv);
+-#endif
+ if (! is_initialized) {
+- if (error){
+- rb_raise(rb_eRuntimeError, "%s", error->message);
+- g_error_free (error);
+- } else {
+- const char *display_name_arg = gdk_get_display_arg_name();
+- display_name_arg = display_name_arg ? display_name_arg :
g_getenv("DISPLAY");
+- rb_raise(rb_eRuntimeError, "Cannot open display: %s",
+- display_name_arg ? display_name_arg : " ");
+- }
+-
++ const char *display_name_arg = gdk_get_display_arg_name();
++ display_name_arg = display_name_arg ? display_name_arg :
g_getenv("DISPLAY");
++ rb_raise(rb_eRuntimeError, "Cannot open display: %s",
++ display_name_arg ? display_name_arg : " ");
+ }
+
+ setlocale(LC_NUMERIC, "C");
