rpms/ruby-gnome2/devel ruby-gnome2-all-0.16.0-xulrunner.patch, NONE, 1.1 ruby-gnome2.spec, 1.17, 1.18
Alex Lancaster (alexlan)
fedora-extras-commits at redhat.com
Fri Dec 28 07:14:24 UTC 2007
Author: alexlan
Update of /cvs/pkgs/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12437
Modified Files:
ruby-gnome2.spec
Added Files:
ruby-gnome2-all-0.16.0-xulrunner.patch
Log Message:
- Add xulrunner patch from bugzilla #402591
- Rebuild against gecko-lib 1.9 (xulrunner)
ruby-gnome2-all-0.16.0-xulrunner.patch:
--- NEW FILE ruby-gnome2-all-0.16.0-xulrunner.patch ---
diff -up ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb.xl ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb
--- ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb.xl 2006-12-29 14:17:28.000000000 +0100
+++ ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb 2007-11-28 11:17:18.000000000 +0100
@@ -55,7 +55,7 @@ end
add_depend_package("glib2", "glib/src", TOPDIR)
add_depend_package("gtk2", "gtk/src", TOPDIR)
-have_library("gtkembedmoz") or exit 1
+have_library("xul") or exit 1
have_func('gtk_moz_embed_new') or exit 1
have_func('gtk_moz_embed_set_profile_path') or exit 1
diff -up ruby-gnome2-all-0.16.0/gtkmozembed/src/lib/gtkmozembed.rb.xl ruby-gnome2-all-0.16.0/gtkmozembed/src/lib/gtkmozembed.rb
--- ruby-gnome2-all-0.16.0/gtkmozembed/src/lib/gtkmozembed.rb.xl 2006-12-29 14:17:28.000000000 +0100
+++ ruby-gnome2-all-0.16.0/gtkmozembed/src/lib/gtkmozembed.rb 2007-11-28 11:18:05.000000000 +0100
@@ -1,5 +1,5 @@
require 'gtk2'
-require 'gtkmozembed.so'
+require 'xul.so'
module Gtk
class MozEmbed
diff -up ruby-gnome2-all-0.16.0/gtkmozembed/src/rbgtkmozembed.c.xl ruby-gnome2-all-0.16.0/gtkmozembed/src/rbgtkmozembed.c
--- ruby-gnome2-all-0.16.0/gtkmozembed/src/rbgtkmozembed.c.xl 2006-12-29 14:17:28.000000000 +0100
+++ ruby-gnome2-all-0.16.0/gtkmozembed/src/rbgtkmozembed.c 2007-11-28 11:17:18.000000000 +0100
@@ -113,7 +113,8 @@ moz_set_profile_path(self, profile_path,
*
* path: the mozilla component path (String).
*
- * You should call this method before the constructor.
+ * You should call this method before the constructor. It's
+ * used in gecko-libs 1.8.
*
* The path should be something like /usr/lib/mozilla or
* /usr/lib/mozilla-firefox depending on your installation and
@@ -133,6 +134,33 @@ moz_set_comp_path(self, path)
return Qnil;
}
+/*
+ * Class method: set_path(path)
+ *
+ * path: the mozilla component path (String).
+ *
+ * You should call this method before the constructor. This
+ * function is used in gecko-libs 1.9 instead of the old one,
+ * set_comp_path(String).
+ *
+ * The path should be something like /usr/lib/mozilla or
+ * /usr/lib/mozilla-firefox depending on your installation and
+ * distribution.
+ *
+ * We call this inside Init_gtkmozembed() and set the value at
+ * compile time before initializing XPCOM.
+ *
+ * Returns: nil.
+ *
+ */
+static VALUE
+moz_set_path(self, path)
+ VALUE self, path;
+{
+ gtk_moz_embed_set_path(RVAL2CSTR(path));
+ return Qnil;
+}
+
/*
* Method: load_url(url)
*
@@ -680,6 +708,8 @@ Init_gtkmozembed()
moz_set_profile_path, 2);
rb_define_module_function(moz, "set_comp_path",
moz_set_comp_path, 1);
+ rb_define_module_function(moz, "set_path",
+ moz_set_path, 1);
rb_define_method(moz, "initialize", moz_initialize, 0);
rb_define_method(moz, "load_url", moz_load_url, 1);
Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ruby-gnome2.spec 4 Dec 2007 20:34:04 -0000 1.17
+++ ruby-gnome2.spec 28 Dec 2007 07:13:45 -0000 1.18
@@ -3,7 +3,7 @@
Name: ruby-gnome2
Version: 0.16.0
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: Ruby binding of libgnome/libgnomeui-2.x
Group: System Environment/Libraries
@@ -16,6 +16,7 @@
Patch11: ruby-gnome2-all-0.16.0-newpoppler.patch
Patch12: ruby-gnome2-all-0.16.0-glib-2.14.patch
Patch13: ruby-gnome2-all-0.16.0-gtk-security.patch
+Patch14: ruby-gnome2-all-0.16.0-xulrunner.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -240,8 +241,8 @@
BuildRequires: ruby ruby-devel gtk2-devel pango-devel
%if "%fedora" > "8"
-BuildRequires: gecko-devel = 1.8.1.10
-Requires: gecko-libs = 1.8.1.10
+BuildRequires: gecko-devel = 1.9
+Requires: gecko-libs = 1.9
%endif
%if "%fedora" == "8"
@@ -435,6 +436,7 @@
%patch11 -p1 -b .newpoppler
%patch12 -p1 -b .glib2_14
%patch13 -p1 -b .security
+%patch14 -p1 -b .xulrunner
#Because of an error in upstream packaging there is a second ruby-gnome2 dir inside so we delete it
@@ -629,6 +631,9 @@
%changelog
+* Tue Dec 28 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.16.0-21
+- Add xulrunner patch from bugzilla #402591
+- Rebuild against gecko-lib 1.9 (xulrunner)
* Tue Dec 4 2007 Allisson Azevedo <allisson at gmail.com> 0.16.0-20
- Fix CVE-2007-6183, format string vulnerability (bugzilla #402871)
More information about the scm-commits
mailing list