rpms/kazehakase/devel kazehakase-0.5.4-compile.patch, NONE, 1.1 kazehakase.spec, 1.55, 1.56 kazehakase-0.5.3-svn3493_trunk-compile.patch, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	kazehakase.spec 
Added Files:
	kazehakase-0.5.4-compile.patch 
Removed Files:
	kazehakase-0.5.3-svn3493_trunk-compile.patch 
Log Message:
Still not good...

kazehakase-0.5.4-compile.patch:

--- NEW FILE kazehakase-0.5.4-compile.patch ---
--- kazehakase-0.5.4/macros/gecko.m4.compile	2008-03-29 17:20:40.000000000 +0900
+++ kazehakase-0.5.4/macros/gecko.m4	2008-04-05 00:34:36.000000000 +0900
@@ -47,7 +47,7 @@
 
 AC_MSG_CHECKING([[for gecko version]])
 
-gecko_version=`cat $MOZILLA_INCLUDE_ROOT/mozilla-config.h | grep MOZILLA_VERSION_U | awk '{ print $[3]; }' | tr ".ab+" " "`
+gecko_version=`cat $MOZILLA_INCLUDE_ROOT/mozilla-config.h | grep MOZILLA_VERSION_U | awk '{ print $[3]; }' | tr ".abpr+" " "`
 if test -z "$gecko_version"; then
 	gecko_version="1 9"
 fi
--- kazehakase-0.5.4/module/embed/gecko/gtkmozembed/Makefile.am.compile	2008-03-29 17:20:40.000000000 +0900
+++ kazehakase-0.5.4/module/embed/gecko/gtkmozembed/Makefile.am	2008-04-05 00:13:47.000000000 +0900
@@ -61,11 +61,15 @@
 
 LDFLAGS = -R$(MOZILLA_HOME)
 
+if HAVE_GECKO_1_9
+PROFILEDIRSERVICE_SOURCES=nsProfileDirServiceProvider2.cpp
+else
 if HAVE_GECKO_1_8
 PROFILEDIRSERVICE_SOURCES=nsProfileDirServiceProvider2.cpp
 else
 PROFILEDIRSERVICE_SOURCES=nsProfileDirServiceProvider.cpp
 endif
+endif
 
 if ENABLE_GTKMOZEMBED
 noinst_LTLIBRARIES = libgtkmozembed.la
--- kazehakase-0.5.4/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp.compile	2008-03-29 17:20:40.000000000 +0900
+++ kazehakase-0.5.4/module/embed/gecko/gtkmozembed/nsProfileDirServiceProvider2.cpp	2008-04-05 00:13:47.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.4/module/embed/gecko/mozilla.cpp.compile	2008-03-29 17:20:40.000000000 +0900
+++ kazehakase-0.5.4/module/embed/gecko/mozilla.cpp	2008-04-05 00:13:47.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: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- kazehakase.spec	29 Mar 2008 15:33:20 -0000	1.55
+++ kazehakase.spec	4 Apr 2008 17:02:57 -0000	1.56
@@ -8,18 +8,25 @@
 %define		support_ruby	1
 %define		rubyabi		1.8
 %define		support_webkit	1
-%undefine	usesvn
 
+%undefine	usesvn
+%define		need_autogen	0
 
 %if 0%{?fedora} == 9
 %define		Geckover	1.9
 #%%define		usesvn		1
+%define		need_autogen	1
 %endif
 %if 0%{?fedora} == 8
 %define		Geckover	1.8.1.13
 %endif
 %if 0%{?fedora} == 7
 %define		Geckover	1.8.1.13
+%define		need_autogen	1
+%endif
+
+%if 0%{?use_svn} > 0
+%define		need_autogen	1
 %endif
 
 %define		obsolete_plugin_ver	0.4.5-1
@@ -28,7 +35,7 @@
 %define		svnver		3501_trunk
 
 
-%define		fedorarel	1
+%define		fedorarel	2
 %define		_release	%{fedorarel}%{?usesvn:.svn%svnver}
 
 
@@ -46,7 +53,7 @@
 Patch0:		kazehakase-svn3235-3237-diff.patch.gz
 %endif
 %if 0%{?fedora} >= 9
-Patch10:	kazehakase-0.5.3-svn3493_trunk-compile.patch
+Patch10:	kazehakase-0.5.4-compile.patch
 %endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -185,7 +192,7 @@
 cd ../..
 %endif
 
-%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
+%if %{need_autogen}
 sh autogen.sh
 %endif
 
@@ -209,7 +216,7 @@
 
 %build
 # Bugs for WebKit-gtk
-%if %{support_webkit} && ( 0%{?fedora} < 8 )
+%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`"
@@ -222,7 +229,9 @@
 %endif
 	--enable-migemo \
 %if 0%{?fedora} == 9
+%if 1
 	--disable-gtkmozembed
+%endif
 %else
 	--with-gecko-engine=firefox
 %endif


--- kazehakase-0.5.3-svn3493_trunk-compile.patch DELETED ---