[kazehakase/f16] Actually change the default to webkit (bug 799019)
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Apr 4 05:29:38 UTC 2012
commit c6f58af41d2a6030d200209972195d3f9bbf6328
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Wed Apr 4 14:29:33 2012 +0900
Actually change the default to webkit (bug 799019)
- Fix build with ruby19
- Fix type wrt thumbname related funtion
...ase-0.5.8-svn3873_trunk-default-to-webkit.patch | 21 +++
kazehakase-0.5.8-svn3873_trunk-egg.patch | 22 +++
kazehakase-0.5.8-svn3873_trunk-ruby19.patch | 147 ++++++++++++++++++++
kazehakase.spec | 35 +++++-
4 files changed, 222 insertions(+), 3 deletions(-)
---
diff --git a/kazehakase-0.5.8-svn3873_trunk-default-to-webkit.patch b/kazehakase-0.5.8-svn3873_trunk-default-to-webkit.patch
new file mode 100644
index 0000000..06f52b5
--- /dev/null
+++ b/kazehakase-0.5.8-svn3873_trunk-default-to-webkit.patch
@@ -0,0 +1,21 @@
+--- kazehakase-0.5.8-svn3873_trunk/src/kz-window.c.default 2010-05-04 00:38:44.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/src/kz-window.c 2012-04-04 12:45:05.443193500 +0900
+@@ -830,15 +830,15 @@
+ if (engine)
+ {
+ if (engine[0])
+- web = KZ_WEB(kz_web_new(engine, "gecko"));
++ web = KZ_WEB(kz_web_new(engine, "webkit_gtk"));
+ g_free(engine);
+ }
+
+ if (!web)
+- web = KZ_WEB(kz_web_new("gecko", "gecko"));
+- if (!web)
+ web = KZ_WEB(kz_web_new("webkit_gtk", "webkit_gtk"));
+ if (!web)
++ web = KZ_WEB(kz_web_new("gecko", "gecko"));
++ if (!web)
+ web = KZ_WEB(kz_web_new("ie", "ie"));
+
+ return web;
diff --git a/kazehakase-0.5.8-svn3873_trunk-egg.patch b/kazehakase-0.5.8-svn3873_trunk-egg.patch
new file mode 100644
index 0000000..e682615
--- /dev/null
+++ b/kazehakase-0.5.8-svn3873_trunk-egg.patch
@@ -0,0 +1,22 @@
+--- kazehakase-0.5.8-svn3873_trunk/module/search/kz-hyper-estraier-search.c.egg 2009-02-27 13:28:44.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/module/search/kz-hyper-estraier-search.c 2012-04-04 14:12:59.588721573 +0900
+@@ -401,7 +401,7 @@
+ strlen(G_DIR_SEPARATOR_S));
+
+ thumb_filename =
+- egg_pixbuf_get_thumb_filename(uri,
++ egg_pixbuf_get_thumbnail_filename(uri,
+ EGG_PIXBUF_THUMBNAIL_LARGE);
+ thumb_uri = g_strdup_printf("history-search:?image=%s",
+ thumb_filename);
+--- kazehakase-0.5.8-svn3873_trunk/module/search/rast-search.c.egg 2009-01-28 04:25:06.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/module/search/rast-search.c 2012-04-04 14:12:53.801803391 +0900
+@@ -186,7 +186,7 @@
+ gchar *summary = get_value(line);
+
+ desc = remove_tag(summary, g_strlen(summary));
+- thumb_filename = egg_pixbuf_get_thumb_filename(uri,
++ thumb_filename = egg_pixbuf_get_thumbnail_filename(uri,
+ EGG_PIXBUF_THUMB_LARGE);
+ thumb_uri = g_strdup_printf("history-search:?image=%s",
+ thumb_filename);
diff --git a/kazehakase-0.5.8-svn3873_trunk-ruby19.patch b/kazehakase-0.5.8-svn3873_trunk-ruby19.patch
new file mode 100644
index 0000000..ebdbbbf
--- /dev/null
+++ b/kazehakase-0.5.8-svn3873_trunk-ruby19.patch
@@ -0,0 +1,147 @@
+--- kazehakase-0.5.8-svn3873_trunk/configure.ac.ruby19 2010-05-04 00:38:45.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/configure.ac 2012-04-04 14:00:45.795119865 +0900
+@@ -421,14 +421,21 @@
+ rbconfig="$RUBY -rrbconfig -e "
+
+ changequote(<<, >>)
+- for var_name in archdir sitearchdir CFLAGS LIBRUBYARG LIBS libdir; do
++ for var_name in archdir sitearchdir vendorarchdir CFLAGS LIBRUBYARG LIBS libdir; do
+ rbconfig_tmp=`$rbconfig "print Config::CONFIG['$var_name']"`
+ eval "rbconfig_$var_name=\"$rbconfig_tmp\""
+ done
+ changequote([, ])
+
++ changequote(<<, >>)
++ RUBY_CONFIGH_DIR=`$rbconfig "print Config::CONFIG['includedir']"`
++ RUBY_CONFIGH_DIR=${RUBY_CONFIGH_DIR}/`$rbconfig "print Config::CONFIG['arch']"`
++ changequote([, ])
++
+ RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir "
+ RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_sitearchdir "
++ RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_vendorarchdir "
++ RUBY_CFLAGS="$RUBY_CFLAGS -I$RUBY_CONFIGH_DIR"
+ RUBY_CFLAGS="$RUBY_CFLAGS $rbconfig_CFLAGS "
+ RUBY_LIBS="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
+ RUBY_LDFLAGS="-L$rbconfig_libdir"
+@@ -602,8 +609,8 @@
+ GENHTML_OPTIONS="--title 'Kazehakase Code Coverage'"
+
+ KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS $GIO_CFLAGS $DBUS_GLIB_CFLAGS"
+-KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_DISABLE_DEPRECATED"
++KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_NOTDISABLE_DEPRECATED -DGTK_NOTDISABLE_DEPRECATED"
++KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_NOTDISABLE_DEPRECATED"
+ KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DSYSDATADIR=\\\"\"\$(datadir)\"\\\""
+ KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DLOCALEDIR=\\\"\"\$(localedir)\"\\\""
+ KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DKZ_DATADIR=\\\"\"\$(datadir)/\$(PACKAGE)\"\\\""
+--- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-embed.c.ruby19 2009-09-27 22:18:07.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-embed.c 2012-04-04 14:00:45.605121458 +0900
+@@ -112,7 +112,7 @@
+ rb_kz_embed_find(VALUE self, VALUE keyword, VALUE backward)
+ {
+ gboolean find;
+- find = kz_embed_find(_SELF(self), STR2CSTR(keyword), RVAL2CBOOL(backward));
++ find = kz_embed_find(_SELF(self), StringValuePtr(keyword), RVAL2CBOOL(backward));
+ return CBOOL2RVAL(find);
+ }
+
+@@ -120,7 +120,7 @@
+ rb_kz_embed_incremental_search(VALUE self, VALUE keyword, VALUE backward)
+ {
+ gboolean search;
+- search = kz_embed_incremental_search(_SELF(self), STR2CSTR(keyword),
++ search = kz_embed_incremental_search(_SELF(self), StringValuePtr(keyword),
+ RVAL2CBOOL(backward));
+ return CBOOL2RVAL(search);
+ }
+@@ -330,7 +330,7 @@
+ static VALUE
+ rb_kz_embed_set_encoding(VALUE self, VALUE encoding)
+ {
+- kz_embed_set_encoding(_SELF(self), STR2CSTR(encoding));
++ kz_embed_set_encoding(_SELF(self), StringValuePtr(encoding));
+ return self;
+ }
+
+@@ -384,7 +384,7 @@
+ rb_kz_embed_save_with_content(VALUE self, VALUE rawfilename)
+ {
+ gboolean save;
+- save = kz_embed_save_with_content(_SELF(self), STR2CSTR(rawfilename));
++ save = kz_embed_save_with_content(_SELF(self), StringValuePtr(rawfilename));
+ return RVAL2CBOOL(save);
+ }
+
+--- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-sidebar.c.ruby19 2009-01-28 04:25:13.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-sidebar.c 2012-04-04 14:00:45.605121458 +0900
+@@ -69,16 +69,16 @@
+
+ entries = rb_funcall(mKzSidebarFactory, rb_intern("entries"), 0);
+
+- len = RARRAY(entries)->len;
++ len = RARRAY_LEN(entries);
+ for (i = 0; i < len; i++) {
+ VALUE entry_info;
+ KzSidebarEntry *entry;
+
+- entry_info = RARRAY(entries)->ptr[i];
++ entry_info = (RARRAY_PTR(entries))[i];
+ entry = g_new0(KzSidebarEntry, 1);
+- entry->priority_hint = NUM2INT(RARRAY(entry_info)->ptr[0]);
+- entry->label = RVAL2CSTR(RARRAY(entry_info)->ptr[1]);
+- entry->icon = RVAL2CSTR2(RARRAY(entry_info)->ptr[2]);
++ entry->priority_hint = NUM2INT((RARRAY_PTR(entry_info))[0]);
++ entry->label = RVAL2CSTR((RARRAY_PTR(entry_info))[1]);
++ entry->icon = RVAL2CSTR2((RARRAY_PTR(entry_info))[2]);
+ entry->create = rb_kz_sidebar_entry_create;
+ kz_sidebar_append_entry(entry);
+ }
+--- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-web.c.ruby19 2009-09-27 22:18:07.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-web.c 2012-04-04 14:05:41.973991342 +0900
+@@ -161,7 +161,7 @@
+ rb_kz_web_find(VALUE self, VALUE keyword, VALUE backward)
+ {
+ gboolean find;
+- find = kz_web_find(_SELF(self), STR2CSTR(keyword), RVAL2CBOOL(backward));
++ find = kz_web_find(_SELF(self), StringValuePtr(keyword), RVAL2CBOOL(backward));
+ return CBOOL2RVAL(find);
+ }
+
+@@ -169,7 +169,7 @@
+ rb_kz_web_incremental_search(VALUE self, VALUE keyword, VALUE backward)
+ {
+ gboolean search;
+- search = kz_web_incremental_search(_SELF(self), STR2CSTR(keyword),
++ search = kz_web_incremental_search(_SELF(self), StringValuePtr(keyword),
+ RVAL2CBOOL(backward));
+ return CBOOL2RVAL(search);
+ }
+@@ -409,7 +409,7 @@
+ static VALUE
+ rb_kz_web_set_encoding(VALUE self, VALUE encoding)
+ {
+- kz_web_set_encoding(_SELF(self), STR2CSTR(encoding));
++ kz_web_set_encoding(_SELF(self), StringValuePtr(encoding));
+ return self;
+ }
+
+@@ -463,7 +463,7 @@
+ rb_kz_web_save_with_content(VALUE self, VALUE rawfilename)
+ {
+ gboolean save;
+- save = kz_web_save_with_content(_SELF(self), STR2CSTR(rawfilename));
++ save = kz_web_save_with_content(_SELF(self), StringValuePtr(rawfilename));
+ return RVAL2CBOOL(save);
+ }
+
+--- kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-window.c.ruby19 2009-09-27 22:18:07.000000000 +0900
++++ kazehakase-0.5.8-svn3873_trunk/ext/ruby/kz-rb-window.c 2012-04-04 14:00:45.605121458 +0900
+@@ -44,7 +44,7 @@
+ static VALUE
+ rb_kz_window_set_default(VALUE self, VALUE window)
+ {
+- rb_cvar_set(self, id_default, window, Qfalse);
++ rb_cvar_set(self, id_default, window);
+ return Qnil;
+ }
+
diff --git a/kazehakase.spec b/kazehakase.spec
index 248f12c..d8cfd06 100644
--- a/kazehakase.spec
+++ b/kazehakase.spec
@@ -9,7 +9,11 @@
%define support_anthy 0
%define support_ruby 1
+%if 0%{?fedora} >= 17
+%define rubyabi 1.9.1
+%else
%define rubyabi 1.8
+%endif
%define support_webkit 1
%define usesvn 1
@@ -41,7 +45,7 @@
# When changing release number, please make it sure that
# the new EVR won't be higher than the one of higher branch!!
#
-%define fedorarel 10
+%define fedorarel 12
%define _release %{fedorarel}%{?usesvn:.svn%svnver}
%if 0%{?fedora} < 1
@@ -68,6 +72,9 @@ Source0: http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?uses
Patch14: kazehakase-0.5.6-rev3769-embed-vendor-version.patch
Patch17: kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
Patch19: kazehakase-rev3873-gtk222.patch
+Patch20: kazehakase-0.5.8-svn3873_trunk-default-to-webkit.patch
+Patch21: kazehakase-0.5.8-svn3873_trunk-ruby19.patch
+Patch22: kazehakase-0.5.8-svn3873_trunk-egg.patch
BuildRequires: dbus-devel
BuildRequires: expat-devel
@@ -82,10 +89,16 @@ BuildRequires: anthy-devel
BuildRequires: mecab-devel
%endif
%if %{support_ruby}
+%if 0%{?fedora} >= 17
+BuildRequires: rubygem(gettext)
+BuildRequires: rubygem-gtk2-devel
+BuildRequires: rubygems-devel
+%else
BuildRequires: ruby(gettext-package)
BuildRequires: ruby(gtk2-devel)
+%endif
BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby
+BuildRequires: ruby-devel
%endif
%if %{support_webkit}
BuildRequires: WebKit-gtk-devel %{?min_webkit_EVR:>= %{min_webkit_EVR}}
@@ -205,6 +218,11 @@ This package uses WebKit for HTML rendering engine.
%patch17 -p0 -b .libegg_mak
%patch19 -p1 -b .gtk
#%%patch18 -p0 -b .xul192
+%patch20 -p1 -b .default
+%if 0%{?fedora} >= 17
+%patch21 -p1 -b .ruby19
+%endif
+%patch22 -p1 -b .egg
%if %{support_anthy}
%{__sed} -i.anthy -e '/^anthy_available/d' configure
@@ -252,7 +270,7 @@ EOF
# Enable deprecated for now
find . -name Makefile.am -or -name configure.ac | \
- xargs sed -i.deprecated -e 's|DISABLE_DEPRECATED|NOTDISABLE_DEPRECATED|'
+ xargs sed -i.deprecated -e 's|DISABLE_DEPRECATED|NOTDISABLE_DEPRECATED|g'
# Kill xulrunner for F-15+
sed -i.killxul -e '\@^embed_LTLIBRARIES at d' module/embed/gecko/Makefile.am
@@ -366,6 +384,17 @@ desktop-file-install \
%endif
%changelog
+* Wed Apr 4 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5.8-12.svn3873_trunk
+- Actually change the default to webkit (bug 799019)
+- Fix build with ruby19
+- Fix type wrt thumbname related funtion
+
+* Thu Jan 5 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5.8-11.svn3873_trunk
+- F-17: rebuild against gcc47
+
+* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.5.8-10.svn3873_trunk.1
+- Rebuild for new libpng
+
* Wed Jul 13 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.5.8-10.svn3873_trunk
- Kill xulrunner support
More information about the scm-commits
mailing list