rpms/kazehakase/devel kazehakase-rev3870-xul192-workaround.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 kazehakase.spec, 1.100, 1.101 sources, 1.40, 1.41
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Nov 19 18:55:44 UTC 2009
Author: mtasaka
Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32696
Modified Files:
.cvsignore kazehakase.spec sources
Added Files:
kazehakase-rev3870-xul192-workaround.patch
Log Message:
* Fri Nov 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-5.svn3870_trunk
- Just to make kazehakase built with xulrunner 1.9.2.1
( Does not work actually... However webkit support still works )
kazehakase-rev3870-xul192-workaround.patch:
macros/gecko.m4 | 22 +++++++++++++++++++---
module/embed/gecko/kz-mozwrapper.cpp | 11 ++++++++---
2 files changed, 27 insertions(+), 6 deletions(-)
--- NEW FILE kazehakase-rev3870-xul192-workaround.patch ---
Index: macros/gecko.m4
===================================================================
--- macros/gecko.m4 (revision 3870)
+++ macros/gecko.m4 (working copy)
@@ -197,6 +197,8 @@
[Whether to use mozilla, firefox seamonkey xpcom (default: mozilla)]),
[GECKO="$withval"])
+LIBXUL_UNIFIED_VER=1.9.2
+LIBXUL_UNIFIED=0
AC_MSG_CHECKING([for gecko engine])
if test "x$GECKO" = "xno"; then
GECKO=
@@ -216,6 +218,9 @@
GECKO=xulrunner
elif $PKG_CONFIG --exists libxul-unstable; then
GECKO=libxul
+ elif $PKG_CONFIG --exists "libxul >= $LIBXUL_UNIFIED_VER" ; then
+ GECKO=libxul
+ LIBXUL_UNIFIED=1
else
gecko_engine_not_found_message="not found"
fi
@@ -239,7 +244,10 @@
mozilla-firefox) min_version=1.0 ;;
seamonkey) min_version=1.1 ;;
xulrunner) min_version=1.8 ;;
- libxul) min_version=1.9 ;;
+ libxul)
+ min_version=1.9
+ if test x"$LIBXUL_UNIFIED"="x1" ; then min_version=1.9.2 ; fi
+ ;;
esac
dnl **************************************************************
@@ -250,13 +258,21 @@
enable_gtkmozembed=no)
if test x"$enable_gtkmozembed" = "xyes"; then
if test x"$GECKO" = "xlibxul"; then
- GECKO_MODULE=$GECKO-unstable
+ if test x"$LIBXUL_UNIFIED"="x1" ; then
+ GECKO_MODULE=$GECKO
+ else
+ GECKO_MODULE=$GECKO-unstable
+ fi
else
GECKO_MODULE=$GECKO-xpcom
fi
else
if test x"$GECKO" = "xlibxul"; then
- GECKO_MODULE=$GECKO-embedding-unstable
+ if test x"$LIBXUL_UNIFIED"="x1" ; then
+ GECKO_MODULE=$GECKO-embedding
+ else
+ GECKO_MODULE=$GECKO-embedding-unstable
+ fi
else
GECKO_MODULE=$GECKO-gtkmozembed
fi
Index: module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- module/embed/gecko/kz-mozwrapper.cpp (revision 3870)
+++ module/embed/gecko/kz-mozwrapper.cpp (working copy)
@@ -97,6 +97,7 @@
#include <nsIDocCharset.h>
+#if 0
typedef nsString nsAFlatString;
typedef nsCString nsAFlatCString;
#ifndef G_OS_WIN32
@@ -106,6 +107,7 @@
# undef nsAString_h___
# undef nsString_h___
#endif
+#endif
#include "kz-mozprogresslistener.h"
#include "kz-mozutils.h"
@@ -203,8 +205,11 @@
nsCOMPtr<nsIDocShell> docShell;
rv = GetDocShell(getter_AddRefs(docShell));
- rv = docShell->GetSecurityUI(getter_AddRefs(mSecurityInfo));
- NS_ENSURE_SUCCESS(rv, rv);
+ if (docShell){
+ rv = docShell->GetSecurityUI(getter_AddRefs(mSecurityInfo));
+ NS_ENSURE_SUCCESS(rv, rv);
+ }
+ else return NS_ERROR_FAILURE;
return NS_OK;
}
@@ -2152,7 +2157,7 @@
gboolean
KzMozWrapper::SetZoomOnDocShell (float aZoom, nsIDocShell *DocShell)
{
-#ifndef G_OS_WIN32
+#if 0
nsCOMPtr<nsPresContext> PresContext;
nsresult rv = DocShell->GetPresContext (getter_AddRefs(PresContext));
if (NS_FAILED(rv) || !PresContext) return FALSE;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore 29 Sep 2009 04:14:21 -0000 1.40
+++ .cvsignore 19 Nov 2009 18:55:43 -0000 1.41
@@ -1 +1 @@
-kazehakase-0.5.8.tar.gz
+kazehakase-0.5.8-svn3870_trunk.tar.gz
Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- kazehakase.spec 7 Nov 2009 03:57:12 -0000 1.100
+++ kazehakase.spec 19 Nov 2009 18:55:43 -0000 1.101
@@ -12,16 +12,19 @@
%define rubyabi 1.8
%define support_webkit 1
-#%%define usesvn 0
+%define usesvn 1
%define need_autogen 0
%define min_webkit_EVR 1.1.1
+%if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
+%define Geckover 1.9
+%endif
%if 0%{?fedora} >= 11
%define Geckover 1.9.1.5
%endif
-%if 0%{?fedora} >= 9 && 0%{?fedora} <= 10
-%define Geckover 1.9
+%if 0%{?fedora} >= 13
+%define Geckover 1.9.2.1
%endif
%if 0%{?usesvn} > 0
@@ -31,14 +34,14 @@
%define obsolete_plugin_ver 0.4.5-1
%define repoid 43802
-%define svnver 3859_trunk
+%define svnver 3870_trunk
#
# When changing release number, please make it sure that
# the new EVR won't be higher than the one of higher branch!!
#
-%define fedorarel 3
+%define fedorarel 5
%define _release %{fedorarel}%{?usesvn:.svn%svnver}
%if 0%{?fedora} < 1
@@ -62,13 +65,13 @@ Group: Applications/Internet
License: GPLv2+
URL: http://kazehakase.sourceforge.jp/
Source0: http://dl.sourceforge.jp/kazehakase/%{repoid}/%{name}-%{version}%{?usesvn:-svn%svnver}.tar.gz
-Patch11: kazehakase-svn3756_trunk-workaround-rh447444.patch
+#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
Patch17: kazehakase-0.5.7-external-rev938-libegg-parallel_make.patch
-Patch18: kazehakase-0.5.8-crash-viewing-source-with-no-page.patch
+Patch18: kazehakase-rev3870-xul192-workaround.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -194,18 +197,14 @@ This package uses WebKit for HTML render
%prep
%setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
-%patch11 -p0 -b .rhbug
+#%%patch11 -p0 -b .rhbug
%patch14 -p1 -b .evr
%if 0%{?fedora} <= 11
# Reverse!!
%patch15 -p0 -b .gtk -R
%endif
%patch17 -p0 -b .libegg_mak
-%patch18 -p0 -b .nopage
-
-%if %{need_autogen}
-sh autogen.sh
-%endif
+%patch18 -p0 -b .xul192
%if %{support_anthy}
%{__sed} -i.anthy -e '/^anthy_available/d' configure
@@ -252,16 +251,18 @@ EOF
%{_builddir}/%{name}-%{version}%{?usesvn:-svn%svnver}/%{name}-filter-requires.sh
%build
+%if %{need_autogen}
+sh autogen.sh
+%endif
+
export CFLAGS="%{optflags} -DVERSION_VENDOR=\\\"%{version}-%{release}\\\""
rm -rf builddir ; mkdir builddir
pushd builddir
ln -sf ../configure
-# --disable-shave is to make build.log more verbose
%configure \
--srcdir=$(pwd)/.. \
- --disable-shave \
--enable-migemo \
%if %{support_ruby} < 1
--with-ruby=no \
@@ -269,7 +270,7 @@ ln -sf ../configure
--with-gecko-engine=libxul \
--disable-gtkmozembed
-%{__make} %{?_smp_mflags} -k
+%{__make} %{?_smp_mflags} -k V=1
popd
%install
@@ -356,6 +357,10 @@ desktop-file-install \
%endif
%changelog
+* Fri Nov 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.8-5.svn3870_trunk
+- Just to make kazehakase built with xulrunner 1.9.2.1
+ ( Does not work actually... However webkit support still works )
+
* Sat Nov 7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- release++
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources 29 Sep 2009 04:14:21 -0000 1.40
+++ sources 19 Nov 2009 18:55:44 -0000 1.41
@@ -1 +1 @@
-22d831982ebe010338907381caee8fdf kazehakase-0.5.8.tar.gz
+6b01a25e9f971d47da01119045c52d43 kazehakase-0.5.8-svn3870_trunk.tar.gz
More information about the fedora-extras-commits
mailing list