rpms/ruby-gnome2/devel ruby-gnome2-all-0.16.0-xulrunner.patch, 1.1, 1.2 ruby-gnome2.spec, 1.18, 1.19
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sat Dec 29 17:53:25 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26435
Modified Files:
ruby-gnome2-all-0.16.0-xulrunner.patch ruby-gnome2.spec
Log Message:
* Sun Dec 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.16.0-22
- Update xulrunner patch (#402591)
- Some misc fix for maybe glib2 >= 2.15.0
- Workarround for #226381 c11
ruby-gnome2-all-0.16.0-xulrunner.patch:
Index: ruby-gnome2-all-0.16.0-xulrunner.patch
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2-all-0.16.0-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-gnome2-all-0.16.0-xulrunner.patch 28 Dec 2007 07:13:45 -0000 1.1
+++ ruby-gnome2-all-0.16.0-xulrunner.patch 29 Dec 2007 17:53:18 -0000 1.2
@@ -1,7 +1,6 @@
-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
+--- ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb.xl 2006-12-29 22:17:28.000000000 +0900
++++ ruby-gnome2-all-0.16.0/gtkmozembed/extconf.rb 2007-11-28 19:17:18.000000000 +0900
+@@ -55,7 +55,7 @@
add_depend_package("glib2", "glib/src", TOPDIR)
add_depend_package("gtk2", "gtk/src", TOPDIR)
@@ -10,9 +9,8 @@
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
+--- ruby-gnome2-all-0.16.0/gtkmozembed/src/lib/gtkmozembed.rb.xl 2006-12-29 22:17:28.000000000 +0900
++++ ruby-gnome2-all-0.16.0/gtkmozembed/src/lib/gtkmozembed.rb 2007-11-28 19:18:05.000000000 +0900
@@ -1,5 +1,5 @@
require 'gtk2'
-require 'gtkmozembed.so'
@@ -20,10 +18,9 @@
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,
+--- ruby-gnome2-all-0.16.0/gtkmozembed/src/rbgtkmozembed.c.xl 2006-12-29 22:17:28.000000000 +0900
++++ ruby-gnome2-all-0.16.0/gtkmozembed/src/rbgtkmozembed.c 2007-12-30 01:55:29.000000000 +0900
+@@ -113,7 +113,8 @@
*
* path: the mozilla component path (String).
*
@@ -33,7 +30,7 @@
*
* 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)
+@@ -133,6 +134,33 @@
return Qnil;
}
@@ -67,7 +64,26 @@
/*
* Method: load_url(url)
*
-@@ -680,6 +708,8 @@ Init_gtkmozembed()
+@@ -315,6 +343,18 @@
+ return CSTR2RVAL(title);
+ }
+
++
++#ifndef GTK_TYPE_MOZ_EMBED_RELOAD_FLAGS
++GtkType gtk_moz_embed_reload_flags_get_type(void);
++#define GTK_TYPE_MOZ_EMBED_RELOAD_FLAGS \
++ (gtk_moz_embed_reload_flags_get_type())
++#endif
++#ifndef GTK_TYPE_MOZ_EMBED_CHROME_FLAGS
++GtkType gtk_moz_embed_chrome_flags_get_type(void);
++#define GTK_TYPE_MOZ_EMBED_CHROME_FLAGS \
++ (gtk_moz_embed_chrome_flags_get_type())
++#endif
++
+ /*
+ * Method: reload(flags)
+ *
+@@ -680,6 +720,8 @@
moz_set_profile_path, 2);
rb_define_module_function(moz, "set_comp_path",
moz_set_comp_path, 1);
Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ruby-gnome2.spec 28 Dec 2007 07:13:45 -0000 1.18
+++ ruby-gnome2.spec 29 Dec 2007 17:53:18 -0000 1.19
@@ -1,9 +1,14 @@
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
+# Workaround for ruby side bug (bug 226381 c11)
+%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e "puts Config::CONFIG['archdir']")}
+
+%define xulrunner_still_beta 1
+
Name: ruby-gnome2
Version: 0.16.0
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: Ruby binding of libgnome/libgnomeui-2.x
Group: System Environment/Libraries
@@ -183,7 +188,7 @@
Requires: %{_bindir}/env
Requires: ruby(abi) >= 1.8
Requires: ruby(glib2) = %{version}-%{release} ruby(atk) = %{version}-%{release}
-Requires: ruby(pango) = %{version}-%{release} ruby-cairo
+Requires: ruby(pango) = %{version}-%{release} ruby(cairo)
Requires: ruby(gdkpixbuf2) = %{version}-%{release}
Provides: ruby(gtk2) = %{version}-%{release}
@@ -436,8 +441,9 @@
%patch11 -p1 -b .newpoppler
%patch12 -p1 -b .glib2_14
%patch13 -p1 -b .security
+%if 0%{?fedora} >= 9
%patch14 -p1 -b .xulrunner
-
+%endif
#Because of an error in upstream packaging there is a second ruby-gnome2 dir inside so we delete it
#%{__rm} -rf %{name}
@@ -459,9 +465,28 @@
%{__chmod} 644 vte/sample/multiterm.rb
%{__chmod} 644 vte/sample/terminal.rb
+# Workaround for ruby side bug (bug 226381 c11)
+%{__cp} -p %{ruby_arch}/rbconfig.rb .
+%{__sed} -i.static -e 's|-static||g' rbconfig.rb
+
%build
+# Workaround for ruby side bug (bug 226381 c11)
+export RUBYLIB=$(pwd)
+
ruby extconf.rb
export CFLAGS="$RPM_OPT_FLAGS"
+
+# Workaround
+## For gtkmozembed
+%if 0%{?fedora} >= 9 && 0%{?xulrunner_still_beta} >=1
+sed -i.betaver -e '/GTKMOZEMBED_MINOR_VERSION/s|(.*)|(9)| ' \
+ gtkmozembed/src/rbgtkmozembedversion.h
+%endif
+## For glib (?? maybe on glib2 >= 2.15?)
+sed -i.comma -e 's|\(G_MARKUP_COLLECT_[A-Z]*\),,|\1,|' \
+ glib/src/glib-enum-types.c
+
+
make %{?_smp_mflags}
%install
@@ -631,7 +656,12 @@
%changelog
-* Tue Dec 28 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.16.0-21
+* Sun Dec 30 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.16.0-22
+- Update xulrunner patch (#402591)
+- Some misc fix for maybe glib2 >= 2.15.0
+- Workarround for #226381 c11
+
+* Fri 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)
More information about the fedora-extras-commits
mailing list