rpms/kazehakase/devel kazehakase-rev3756-compile.patch, NONE, 1.1 kazehakase-svn3756_trunk-workaround-rh447444.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 kazehakase.spec, 1.69, 1.70 sources, 1.23, 1.24

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31391

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-rev3756-compile.patch 
	kazehakase-svn3756_trunk-workaround-rh447444.patch 
Log Message:
rev 3756

kazehakase-rev3756-compile.patch:

--- NEW FILE kazehakase-rev3756-compile.patch ---
Index: module/search/Makefile.am
===================================================================
--- module/search/Makefile.am	(revision 3756)
+++ module/search/Makefile.am	(working copy)
@@ -12,8 +12,8 @@
 	-I$(top_srcdir)/src/actions			\
 	-I$(top_srcdir)/src/bookmarks			\
 	-I$(top_srcdir)/src/mozilla			\
-	-I$(top_srcdir)/src/libegg/pixbufthumbnail	\
-	-I$(top_srcdir)/src/libegg/md5			\
+	-I$(top_srcdir)/libegg/pixbufthumbnail	\
+	-I$(top_srcdir)/libegg/md5			\
 	-I$(top_srcdir)/src/net				\
 	-I$(top_srcdir)/src/sidebar			\
 	-I$(top_srcdir)/src/utils			\
Index: module/search/kz-hyper-estraier-search.c
===================================================================
--- module/search/kz-hyper-estraier-search.c	(revision 3756)
+++ module/search/kz-hyper-estraier-search.c	(working copy)
@@ -401,8 +401,8 @@
 					       strlen(G_DIR_SEPARATOR_S));
 
 		thumb_filename =
-			egg_pixbuf_get_thumb_filename(uri,
-						      EGG_PIXBUF_THUMB_LARGE);
+			egg_pixbuf_get_thumbnail_filename(uri,
+						      EGG_PIXBUF_THUMBNAIL_LARGE);
 		thumb_uri = g_strdup_printf("history-search:?image=%s",
 					    thumb_filename);
 		g_free(thumb_filename);

kazehakase-svn3756_trunk-workaround-rh447444.patch:

--- NEW FILE kazehakase-svn3756_trunk-workaround-rh447444.patch ---
Index: module/embed/gecko/kz-gecko-embed-module.c
===================================================================
--- module/embed/gecko/kz-gecko-embed-module.c	(revision 3756)
+++ module/embed/gecko/kz-gecko-embed-module.c	(working copy)
@@ -42,6 +42,13 @@
 	gecko_single = kz_gecko_single_new(kz_app_get());
 
 	kz_gecko_embed_register_type(module);
+
+	// Workaround for rh bug 447444]
+	int val_i;
+	if (!mozilla_prefs_get_int("layout.spellcheckDefault", &val_i))
+	{
+		mozilla_prefs_set_int("layout.spellcheckDefault", 0);
+	}
 }
 
 G_MODULE_EXPORT void


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	30 Jan 2009 04:38:48 -0000	1.23
+++ .cvsignore	22 Feb 2009 15:23:20 -0000	1.24
@@ -1 +1 @@
-kazehakase-0.5.6-svn3598_trunk.tar.gz
+kazehakase-0.5.6-svn3756_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kazehakase.spec	30 Jan 2009 04:38:48 -0000	1.69
+++ kazehakase.spec	22 Feb 2009 15:23:24 -0000	1.70
@@ -16,7 +16,10 @@
 %define		min_webkit_EVR	1.0.0-0.16.svn39421
 %endif
 
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 11
+%define		Geckover	1.9.1
+%endif
+%if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
 %define		Geckover	1.9
 %endif
 
@@ -27,10 +30,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		33533
-%define		svnver		3598_trunk
+%define		svnver		3756_trunk
 
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -48,9 +51,8 @@
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
 Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
-%if 0%{?fedora} >= 9
-Patch11:	kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch
-%endif
+Patch0:		kazehakase-rev3756-compile.patch
+Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -90,14 +92,9 @@
 # drop this for now
 # Requires:	glib2 >= %{glib_ver}
 
-%if 0%{?fedora} < 9
-BuildRequires:	gecko-devel %{?Geckover:= %{Geckover}}
-Requires:	gecko-libs %{?Geckover:= %{Geckover}}
-%else
 BuildRequires:	gecko-devel %{?Geckover:>= %{Geckover}}
 BuildRequires:	gecko-devel-unstable
 Requires:	gecko-libs %{?Geckover:>= %{Geckover}}
-%endif
 
 %if %{need_autogen}
 BuildRequires:	intltool
@@ -177,9 +174,12 @@
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
 
-%if 0%{?fedora} >= 9
+# Make build log more verbose
+%{__sed} -i.verb \
+	-e '/MAKEFLAGS/d' macros/shave.m4
+
+%patch0 -p0 -b .compile
 %patch11 -p0 -b .rhbug
-%endif
 
 %if %{need_autogen}
 sh autogen.sh
@@ -197,24 +197,17 @@
 
 %build
 %configure \
-%if 0%{?fedora} >= 9
 	CC="%{__cc} `nspr-config --cflags`" \
 	CXX="%{__cxx} `nspr-config --cflags`" \
-%endif
 	--enable-migemo \
-%if 0%{?fedora} >= 9
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
-%else
-	--with-gecko-engine=firefox
-%endif
 
-%if 0%{?fedora} >= 9
-sed -i.bool -e \
+%{__sed} -i.bool -e \
 	's|#define \(MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_\) 1|#undef \1|' \
 	config.h
-%endif
 
+%{__make} -C libegg -k # not parallel make
 %{__make} %{?_smp_mflags} -k
 
 %install
@@ -295,6 +288,9 @@
 %endif
 
 %changelog
+* Mon Feb 23 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Try rev 3756
+
 * Fri Jan 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - Try rev 3598
 - Now WebKit >= rev 39421 is needed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	30 Jan 2009 04:38:48 -0000	1.23
+++ sources	22 Feb 2009 15:23:25 -0000	1.24
@@ -1 +1 @@
-7123bece50f35b61fe099b3d128ea0bf  kazehakase-0.5.6-svn3598_trunk.tar.gz
+c708dee6997b704abd734cdc1f86aa70  kazehakase-0.5.6-svn3756_trunk.tar.gz