rpms/kazehakase/devel kazehakase-0.5.3-svn3493_trunk-compile.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 kazehakase.spec, 1.54, 1.55 sources, 1.15, 1.16 kz-webkit-gtk.h, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	.cvsignore kazehakase.spec sources 
Added Files:
	kazehakase-0.5.3-svn3493_trunk-compile.patch 
Removed Files:
	kz-webkit-gtk.h 
Log Message:
* Sun Mar 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-1
- 0.5.4


kazehakase-0.5.3-svn3493_trunk-compile.patch:

--- NEW FILE kazehakase-0.5.3-svn3493_trunk-compile.patch ---
--- kazehakase-0.5.3-svn3493_trunk/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp.compile	2008-03-24 01:15:29.000000000 +0900
+++ kazehakase-0.5.3-svn3493_trunk/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp	2008-03-24 02:38:22.000000000 +0900
@@ -51,6 +51,8 @@
 
 #include "nsStringAPI.h"
 
+#include "config.h"
+
 typedef nsCString nsPromiseFlatCString;
 typedef nsCString nsCAutoString;
 
@@ -306,6 +308,7 @@
         rv = EnsureProfileFileExists(localFile, domainDir);
     }
   }
+#ifndef HAVE_GECKO_1_9
   else if (strcmp(prop, NS_APP_MAIL_50_DIR) == 0) {
     rv = domainDir->Clone(getter_AddRefs(localFile));
     if (NS_SUCCEEDED(rv))
@@ -326,6 +329,7 @@
     if (NS_SUCCEEDED(rv))
       rv = localFile->AppendNative(MSG_FOLDER_CACHE_DIR_50_NAME);
   }
+#endif
   else if (strcmp(prop, NS_APP_STORAGE_50_FILE) == 0) {
     rv = domainDir->Clone(getter_AddRefs(localFile));
     if (NS_SUCCEEDED(rv))
@@ -518,10 +522,12 @@
   (void) directoryService->Undefine(NS_APP_BOOKMARKS_50_FILE);
   (void) directoryService->Undefine(NS_APP_DOWNLOADS_50_FILE);
   (void) directoryService->Undefine(NS_APP_SEARCH_50_FILE);
+#ifndef HAVE_GECKO_1_9
   (void) directoryService->Undefine(NS_APP_MAIL_50_DIR);
   (void) directoryService->Undefine(NS_APP_IMAP_MAIL_50_DIR);
   (void) directoryService->Undefine(NS_APP_NEWS_50_DIR);
   (void) directoryService->Undefine(NS_APP_MESSENGER_FOLDER_CACHE_50_DIR);
+#endif
 
   return NS_OK;
 }
--- kazehakase-0.5.3-svn3493_trunk/module/embed/gecko/mozilla.cpp.compile	2008-03-24 01:15:29.000000000 +0900
+++ kazehakase-0.5.3-svn3493_trunk/module/embed/gecko/mozilla.cpp	2008-03-24 02:30:50.000000000 +0900
@@ -51,6 +51,8 @@
 #include <nsGenericFactory.h>
 #endif
 
+#include "nsComponentManagerUtils.h"
+
 NS_GENERIC_FACTORY_CONSTRUCTOR(KzFilePicker)
 NS_GENERIC_FACTORY_CONSTRUCTOR(KzContentHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(KzMozProgressListener)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	29 Feb 2008 15:50:02 -0000	1.15
+++ .cvsignore	29 Mar 2008 15:33:20 -0000	1.16
@@ -1 +1 @@
-kazehakase-0.5.3.tar.gz
+kazehakase-0.5.4.tar.gz


Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- kazehakase.spec	20 Mar 2008 02:18:21 -0000	1.54
+++ kazehakase.spec	29 Mar 2008 15:33:20 -0000	1.55
@@ -8,37 +8,33 @@
 %define		support_ruby	1
 %define		rubyabi		1.8
 %define		support_webkit	1
+%undefine	usesvn
 
 
 %if 0%{?fedora} == 9
 %define		Geckover	1.9
+#%%define		usesvn		1
 %endif
 %if 0%{?fedora} == 8
-%define		Geckover	1.8.1.12
+%define		Geckover	1.8.1.13
 %endif
 %if 0%{?fedora} == 7
-%define		Geckover	1.8.1.12
-%endif
-%define		obsolete_plugin_ver	0.4.5-1
-
-
-%define		repoid		29695
-%define		svnver		3410_trunk
-%if 0%{?fedora} == 9 || 0%{?fedora} == 8
-%undefine		usesvn		
-%else
-%undefine		usesvn		
+%define		Geckover	1.8.1.13
 %endif
 
+%define		obsolete_plugin_ver	0.4.5-1
 
-%define		fedorarel	4
+%define		repoid		30219
+%define		svnver		3501_trunk
 
 
+%define		fedorarel	1
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
+
 Name:		kazehakase
-Version:	0.5.3
-Release:	%{_release}%{?dist}.1
+Version:	0.5.4
+Release:	%{_release}%{?dist}
 Summary:	Kazehakase browser using Gecko rendering engine
 
 Group:		Applications/Internet
@@ -49,8 +45,9 @@
 Source1:	gscripttable.h.gz
 Patch0:		kazehakase-svn3235-3237-diff.patch.gz
 %endif
-# Upstream forgot to package this?
-Source2:	kz-webkit-gtk.h
+%if 0%{?fedora} >= 9
+Patch10:	kazehakase-0.5.3-svn3493_trunk-compile.patch
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	expat-devel
@@ -174,6 +171,9 @@
 
 %prep
 %setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
+%if 0%{?fedora} >= 9
+%patch10 -p1 -b .compile
+%endif
 
 %if 0%{?fedora} < 8
 %{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \
@@ -198,13 +198,18 @@
 %endif
 
 %if %{support_webkit}
-cp -p %{SOURCE2} module/embed/webkit-gtk/
 %{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure
 %endif
 
+for f in README.ja TODO.ja ; do
+	iconv -f EUCJP -t UTF8 $f > ${f}.tmp && \
+		( touch -r ${f} ${f}.tmp ; %{__mv} -f ${f}.tmp ${f} ) || \
+		%{__rm} -f ${f}.tmp
+done
+
 %build
-# ??? perhaps bugs for WebKit-gtk
-%if %{support_webkit}
+# Bugs for WebKit-gtk
+%if %{support_webkit} && ( 0%{?fedora} < 8 )
 CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`"
 CXXFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`"
 LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`"
@@ -247,12 +252,6 @@
 
 %{find_lang} %{name}
 
-for f in README.ja TODO.ja ; do
-	iconv -f EUCJP -t UTF8 $f > ${f}.tmp && \
-		( touch -r ${f} ${f}.tmp ; %{__mv} -f ${f}.tmp ${f} ) || \
-		%{__rm} -f ${f}.tmp
-done
-
 %if 1
 %if 0%{?fedora} == 9
 : This package builds, but does not work at all!!
@@ -285,7 +284,7 @@
 %dir %{_libdir}/%{name}/ext/
 %dir %{_datadir}/%{name}/ext/
 %endif
-%{_datadir}/%{name}/*.css
+%{_datadir}/%{name}/search-result.*
 %{_datadir}/%{name}/*.png
 %{_datadir}/%{name}/icons/
 %{_datadir}/pixmaps/%{name}*.png
@@ -322,6 +321,15 @@
 %endif
 
 %changelog
+* Sun Mar 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.4-1
+- 0.5.4
+
+* Fri Mar 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.3-6.svn3501_trunk
+- Try svn 3501 (still not work against xulrunner :( )
+
+* Tue Mar 25 2008 Christopher Aillon <caillon at redhat.com> - 0.5.3-5
+- Rebuild against newer gecko (F-7/8)
+
 * Wed Mar  5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.3-4
 - Create kazehakase-base, split gecko.so from -base package
   so that users can install only WebKit based package.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	29 Feb 2008 15:50:02 -0000	1.15
+++ sources	29 Mar 2008 15:33:20 -0000	1.16
@@ -1 +1 @@
-1635cc357f1a65c8fdcad56cdcd8bb9c  kazehakase-0.5.3.tar.gz
+75f8afb9ddf4493c3a1fb4eb38a044df  kazehakase-0.5.4.tar.gz


--- kz-webkit-gtk.h DELETED ---