rpms/kazehakase/devel kazehakase-0.5.4-svn3505_trunk-fix-segv.patch, NONE, 1.1 kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 kazehakase.spec, 1.59, 1.60 sources, 1.17, 1.18

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9990

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.4-svn3505_trunk-fix-segv.patch 
	kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch 
Log Message:
* Sat Jun 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-6.svn3505_trunk
- Try rev 3505
- Workaround for bug 447444 (xulrunner vs hunspell conflict)


kazehakase-0.5.4-svn3505_trunk-fix-segv.patch:

--- NEW FILE kazehakase-0.5.4-svn3505_trunk-fix-segv.patch ---
Index: module/embed/gecko/mozilla.cpp
===================================================================
--- module/embed/gecko/mozilla.cpp	(revision 3505)
+++ module/embed/gecko/mozilla.cpp	(working copy)
@@ -25,6 +25,7 @@
 
 #define MOZILLA_CLIENT
 
+#include <mozilla-config.h>
 #include <gtkmozembed.h>
 #include <nsXPCOM.h>
 #include <nsIGenericFactory.h>

kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch:

--- NEW FILE kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch ---
Index: module/embed/gecko/kz-gecko-embed-module.cpp
===================================================================
--- module/embed/gecko/kz-gecko-embed-module.cpp	(revision 3505)
+++ module/embed/gecko/kz-gecko-embed-module.cpp	(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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 Jun 2008 14:34:48 -0000	1.17
+++ .cvsignore	27 Jun 2008 16:51:02 -0000	1.18
@@ -1,2 +1 @@
-kazehakase-0.5.4.tar.gz
-kazehakase_0.5.4-2.1.diff.gz
+kazehakase-0.5.4-svn3505_trunk.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kazehakase.spec	25 Jun 2008 14:36:50 -0000	1.59
+++ kazehakase.spec	27 Jun 2008 16:51:02 -0000	1.60
@@ -14,7 +14,7 @@
 
 %if 0%{?fedora} >= 9
 %define		Geckover	1.9
-#%%define		usesvn		1
+%define		usesvn		1
 %define		need_autogen	1
 %endif
 %if 0%{?fedora} == 8
@@ -32,10 +32,10 @@
 %define		obsolete_plugin_ver	0.4.5-1
 
 %define		repoid		30219
-%define		svnver		3501_trunk
+%define		svnver		3505_trunk
 
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 
@@ -53,7 +53,8 @@
 Patch0:		kazehakase-svn3235-3237-diff.patch.gz
 %endif
 %if 0%{?fedora} >= 9
-Patch10:	http://ftp.debian.org/debian/pool/main/k/%{name}/%{name}_0.5.4-2.1.diff.gz
+Patch10:	kazehakase-0.5.4-svn3505_trunk-fix-segv.patch
+Patch11:	kazehakase-0.5.4-svn3505_trunk-workaround-rh447444.patch
 %endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -175,21 +176,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
-%if 0%{?fedora} >= 9
-
-# debian forks patches
-%{__gzip} -dc %PATCH10 | %{__sed} -n -e '\@debian/patches/.*dpatch$@,$p' \
-	> %{name}-from-debian.patch.patch
-%{__patch} -p1 -Z -s < %{name}-from-debian.patch.patch
-
-for patches in \
-	50_passwordmgr.dpatch \
-	90_xulrunner_1.9.dpatch
-	do
-	%{__patch} -p1 -Z -s -b --suffix .$patches < \
-		debian/patches/$patches
-done
-%endif
 
 %if 0%{?fedora} < 8
 %{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \
@@ -200,6 +186,10 @@
 %{__gzip} -d *gz
 cd ../..
 %endif
+%if 0%{?fedora} >= 9
+%patch10 -p0 -b .debian
+%patch11 -p0 -b .rhbug
+%endif
 
 %if %{need_autogen}
 sh autogen.sh
@@ -319,6 +309,10 @@
 %endif
 
 %changelog
+* Sat Jun 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-6.svn3505_trunk
+- Try rev 3505
+- Workaround for bug 447444 (xulrunner vs hunspell conflict)
+
 * Wed Jun 25 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-5
 - Apply xulrunner related patches from debian by Mike Hommey
   (debian bug 480796, rh bug 402641)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	25 Jun 2008 14:34:49 -0000	1.17
+++ sources	27 Jun 2008 16:51:02 -0000	1.18
@@ -1,2 +1 @@
-75f8afb9ddf4493c3a1fb4eb38a044df  kazehakase-0.5.4.tar.gz
-ff749e865a3332abba46bf650faed07a  kazehakase_0.5.4-2.1.diff.gz
+03823d40ac808fd2ea9295fc243e8409  kazehakase-0.5.4-svn3505_trunk.tar.gz