rpms/kazehakase/F-11 kazehakase-0.5.7-gtk0218.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 kazehakase.spec, 1.85, 1.86 sources, 1.29, 1.30

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/kazehakase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11951

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.7-gtk0218.patch 
Log Message:
* Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
- Update to 0.5.7


kazehakase-0.5.7-gtk0218.patch:
 kz-entry.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kazehakase-0.5.7-gtk0218.patch ---
Index: src/widget/kz-entry.c
===================================================================
--- src/widget/kz-entry.c	(revision 3779)
+++ src/widget/kz-entry.c	(revision 3780)
@@ -514,7 +514,7 @@
       
 		if (entry->visible)
 		{
-			g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+			g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
 			g_string_insert (tmp_string, cursor_index, preedit_string);
 		}
 		else
@@ -523,7 +523,7 @@
 			gint preedit_len_chars;
 			gunichar invisible_char;
           
-			ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+			ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
 			preedit_len_chars = g_utf8_strlen (preedit_string, -1);
 			ch_len += preedit_len_chars;
 
@@ -557,7 +557,7 @@
 	{
 		if (entry->visible)
 		{
-		pango_layout_set_text (layout, entry->text, entry->n_bytes);
+		pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
 		}
 		else
 		{


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	21 Apr 2009 17:55:39 -0000	1.29
+++ .cvsignore	29 Aug 2009 11:28:12 -0000	1.30
@@ -1 +1 @@
-kazehakase-0.5.6-svn3771_trunk.tar.gz
+kazehakase-0.5.7.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/kazehakase.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- kazehakase.spec	3 Aug 2009 23:04:39 -0000	1.85
+++ kazehakase.spec	29 Aug 2009 11:28:12 -0000	1.86
@@ -12,7 +12,7 @@
 %define		rubyabi		1.8
 %define		support_webkit	1
 
-%define		usesvn		1
+%undefine		usesvn		
 %define		need_autogen	0
 
 %define		min_webkit_EVR	1.1.1
@@ -30,11 +30,11 @@
 
 %define		obsolete_plugin_ver	0.4.5-1
 
-%define		repoid		33533
-%define		svnver		3771_trunk
+%define		repoid		43338
+%define		svnver		3783_trunk
 
 
-%define		fedorarel	11
+%define		fedorarel	1
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 %if 0%{?fedora} < 1
@@ -44,16 +44,19 @@
 
 
 Name:		kazehakase
-Version:	0.5.6
-Release:	%{_release}%{?dist}.4
+Version:	0.5.7
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
 License:	GPLv2+
 URL:		http://kazehakase.sourceforge.jp/
-Source0:	http://downloads.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
+Source0:	http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
 Patch11:	kazehakase-svn3756_trunk-workaround-rh447444.patch
 Patch14:	kazehakase-0.5.6-rev3769-embed-vendor-version.patch
+%if 0%{?fedora} <= 11
+Patch15:	kazehakase-0.5.7-gtk0218.patch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -97,8 +100,8 @@ BuildRequires:	gecko-devel %{?Geckover:>
 BuildRequires:	gecko-devel-unstable
 Requires:	gecko-libs %{?Geckover:>= %{Geckover}}
 
-%if %{need_autogen}
 BuildRequires:	intltool
+%if %{need_autogen}
 BuildRequires:	libtool
 BuildRequires:	automake
 %endif
@@ -175,12 +178,12 @@ This package uses WebKit for HTML render
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
 
-# Make build log more verbose
-%{__sed} -i.verb \
-	-e '/SHAVE_INIT/s|\[enable\]|\[disable\]|' configure.ac
-
 %patch11 -p0 -b .rhbug
 %patch14 -p1 -b .evr
+%if 0%{?fedora} <= 11
+# Reverse!!
+%patch15 -p0 -b .gtk -R
+%endif
 
 %if %{need_autogen}
 sh autogen.sh
@@ -233,7 +236,9 @@ EOF
 %build
 export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
 
+# --disable-shave is to make build.log more verbose
 %configure \
+	--disable-shave \
 	--enable-migemo \
 	--with-gecko-engine=libxul \
 	--disable-gtkmozembed
@@ -319,6 +324,9 @@ desktop-file-install \
 %endif
 
 %changelog
+* Sat Aug 29 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.7-1
+- Update to 0.5.7
+
 * Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 0.5.6-11.svn3771_trunk.4
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/F-11/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	21 Apr 2009 17:55:39 -0000	1.29
+++ sources	29 Aug 2009 11:28:12 -0000	1.30
@@ -1 +1 @@
-3360e94049f0ea43860c458b84746f01  kazehakase-0.5.6-svn3771_trunk.tar.gz
+1f01892d8a0775c71a856d303a1e32bd  kazehakase-0.5.7.tar.gz