rpms/kazehakase/devel kazehakase-0.5.2-svn3391_trunk-no-MOZILLA-internal-API.patch, NONE, 1.1 kazehakase-0.5.2-svn3391_trunk-no-NS-New.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 kazehakase.spec, 1.46, 1.47 sources, 1.13, 1.14 kazehakase-svn3358-build.patch, 1.2, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sun Feb 24 08:58:54 UTC 2008
Author: mtasaka
Update of /cvs/extras/rpms/kazehakase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7875
Modified Files:
.cvsignore kazehakase.spec sources
Added Files:
kazehakase-0.5.2-svn3391_trunk-no-MOZILLA-internal-API.patch
kazehakase-0.5.2-svn3391_trunk-no-NS-New.patch
Removed Files:
kazehakase-svn3358-build.patch
Log Message:
* Sun Feb 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-7.svn3391_trunk
- More try to use xulrunner
* Fix linkage for gecko.so
* Don't use MOZILLA_INTERNAL_API anymore
* NS_NewStorageStream should be changed to use xpcom
http://developer.mozilla.org/en/docs/Migrating_from_Internal_Linkage_to_Frozen_Linkage
kazehakase-0.5.2-svn3391_trunk-no-MOZILLA-internal-API.patch:
--- NEW FILE kazehakase-0.5.2-svn3391_trunk-no-MOZILLA-internal-API.patch ---
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/GtkNSSDialogs.cpp.noint 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/GtkNSSDialogs.cpp 2008-02-24 15:47:59.000000000 +0900
@@ -38,7 +38,7 @@
#include <nsCOMPtr.h>
#include <nsMemory.h>
-#define MOZILLA_INTERNAL_API
+#undef MOZILLA_INTERNAL_API
#include <nsIServiceManager.h>
#undef MOZILLA_INTERNAL_API
#include <nsIInterfaceRequestor.h>
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozlauncher.cpp.noint 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozlauncher.cpp 2008-02-24 15:59:01.000000000 +0900
@@ -27,8 +27,11 @@
#include <glib.h>
#include <glib/gi18n.h>
-#define MOZILLA_INTERNAL_API
+#undef MOZILLA_INTERNAL_API
#include <nsIComponentManager.h>
+
+#include "nsComponentManagerUtils.h"
+
#undef MOZILLA_INTERNAL_API
#include <nsCOMPtr.h>
#define MOZILLA_STRICT_API
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozthumbnailer.cpp.noint 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozthumbnailer.cpp 2008-02-24 15:47:59.000000000 +0900
@@ -25,7 +25,7 @@
#include "kz-mozthumbnailer.h"
-#define MOZILLA_INTERNAL_API
+#undef MOZILLA_INTERNAL_API
#include <nsIComponentManager.h>
#ifdef MOZ_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_
# include <nsICanvasRenderingContextInternal.h>
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozutils.cpp.noint 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozutils.cpp 2008-02-24 15:47:59.000000000 +0900
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define MOZILLA_INTERNAL_API
+#undef MOZILLA_INTERNAL_API
#include <nsIServiceManager.h>
#undef MOZILLA_INTERNAL_API
#include <nsIWindowWatcher.h>
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozutils.h.noint 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozutils.h 2008-02-24 15:56:34.000000000 +0900
@@ -22,9 +22,13 @@
#define __KZ_MOZ_UTILS_H__
#include <gtk/gtk.h>
-#define MOZILLA_INTERNAL_API
+#undef MOZILLA_INTERNAL_API
#include <nsIComponentManager.h>
#include <nsIServiceManager.h>
+
+#include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
+
#undef MOZILLA_INTERNAL_API
#include <nsIDOMWindow.h>
#include <nsIURI.h>
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozwrapper.cpp.noint 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-02-24 15:47:59.000000000 +0900
@@ -37,7 +37,7 @@
#include <gtkmozembed_internal.h>
#include <stdlib.h>
-#define MOZILLA_INTERNAL_API
+#undef MOZILLA_INTERNAL_API
#include <nsIServiceManager.h>
#undef MOZILLA_INTERNAL_API
#include <nsIInterfaceRequestorUtils.h>
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/mozilla-prefs.cpp.noint 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/mozilla-prefs.cpp 2008-02-24 15:58:11.000000000 +0900
@@ -30,8 +30,12 @@
#include <nsCOMPtr.h>
#include <nsIPrefService.h>
#include <nsISupportsPrimitives.h>
-#define MOZILLA_INTERNAL_API
+#undef MOZILLA_INTERNAL_API
#include <nsIServiceManager.h>
+
+#include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
+
#undef MOZILLA_INTERNAL_API
#if 1
#include <nsIFontEnumerator.h>
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/mozilla.cpp.noint 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/mozilla.cpp 2008-02-24 15:57:35.000000000 +0900
@@ -30,8 +30,11 @@
#include <nsXPCOM.h>
#include <nsIGenericFactory.h>
#include <nsIComponentRegistrar.h>
-#define MOZILLA_INTERNAL_API
+#undef MOZILLA_INTERNAL_API
#include <nsIServiceManager.h>
+
+#include "nsComponentManagerUtils.h"
+
#undef MOZILLA_INTERNAL_API
#include <sys/utsname.h>
kazehakase-0.5.2-svn3391_trunk-no-NS-New.patch:
--- NEW FILE kazehakase-0.5.2-svn3391_trunk-no-NS-New.patch ---
--- kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozhistorysearch.cpp.xul 2008-02-23 20:46:37.000000000 +0900
+++ kazehakase-0.5.2-svn3391_trunk/module/embed/gecko/kz-mozhistorysearch.cpp 2008-02-24 16:55:42.000000000 +0900
@@ -39,7 +39,11 @@
#include <nsIIOService.h>
#include <nsCRT.h>
#include <nsIStorageStream.h>
+#ifdef HAVE_GECKO_1_9
+#include <nsStorageStream.h>
+#else
#include <nsIOutputStream.h>
+#endif
#include <nsIComponentManager.h>
#include <nsNetCID.h>
#include <nsILocalFile.h>
@@ -221,7 +225,12 @@
nsCOMPtr<nsIStorageStream> sStream;
nsCOMPtr<nsIOutputStream> stream;
+#ifdef HAVE_GECKO_1_9
+ sStream = do_CreateInstance(NS_STORAGESTREAM_CONTRACTID);
+ rv = sStream->Init(16384, (PRUint32) -1, nsnull);
+#else
rv = NS_NewStorageStream(16384, (PRUint32)-1, getter_AddRefs(sStream));
+#endif
if (NS_FAILED(rv)) return rv;
rv = sStream->GetOutputStream(0, getter_AddRefs(stream));
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 14 Feb 2008 06:04:31 -0000 1.13
+++ .cvsignore 24 Feb 2008 08:58:12 -0000 1.14
@@ -1 +1 @@
-kazehakase-0.5.2-svn3358.tar.gz
+kazehakase-0.5.2-svn3391_trunk.tar.gz
Index: kazehakase.spec
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/kazehakase.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kazehakase.spec 14 Feb 2008 15:28:23 -0000 1.46
+++ kazehakase.spec 24 Feb 2008 08:58:12 -0000 1.47
@@ -8,28 +8,30 @@
%define Geckover 1.9
%endif
%if 0%{?fedora} == 8
-%define Geckover 1.8.1.10
+%define Geckover 1.8.1.12
%endif
%if 0%{?fedora} == 7
-%define Geckover 1.8.1.10
+%define Geckover 1.8.1.12
%endif
%define obsolete_plugin_ver 0.4.5-1
%define support_anthy 0
%define support_ruby 1
%define rubyabi 1.8
+# WebKitWebSettings not implemented on Fedora yet
+%define support_webkit 0
%define repoid 29143
-%define svnver 3358
-%if 0%{?fedora} == 9
+%define svnver 3391_trunk
+%if 0%{?fedora} == 9 || 0%{?fedora} == 8
%define usesvn 1
%else
%define usesvn 0
%endif
-%define fedorarel 1.2
+%define fedorarel 7
%define _release %{fedorarel}%{?usesvn:.svn%svnver}
@@ -47,7 +49,8 @@
Source1: gscripttable.h.gz
Patch0: kazehakase-svn3235-3237-diff.patch.gz
%endif
-Patch100: kazehakase-svn3358-build.patch
+Patch10: kazehakase-0.5.2-svn3391_trunk-no-NS-New.patch
+Patch13: kazehakase-0.5.2-svn3391_trunk-no-MOZILLA-internal-API.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: expat-devel
@@ -67,6 +70,9 @@
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby
%endif
+%if %{support_webkit}
+BuildRequires: WebKit-gtk-devel
+%endif
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -140,48 +146,73 @@
%setup -q -n %{name}-%{version}%{?usesvn:-svn%svnver}
%if 0%{?fedora} < 8
-#%%patch0 -p1 -R
-%{__gzip} -d < %PATCH0 | %{__patch} -p1 -R -s || :
+%{__gzip} -d < %PATCH0 | %{__patch} -p1 -Z -R -s || \
+ ( for f in `find . -name \*.rej | sort` ; do cat $f ; done )
cd src/utils
cp -p %SOURCE1 .
%{__gzip} -d *gz
cd ../..
%endif
-
-%if 0%{?fedora} >= 9
-%patch100 -p1 -b .debug
+%if 0%{?fedora} == 9
+%{__patch} -p1 -s -Z -b --suffix .xul < %PATCH10
+%{__patch} -p1 -s -Z -b --suffix .noint < %PATCH13
%endif
%if 0%{?fedora} < 8 || 0%{?usesvn} > 0
sh autogen.sh
%endif
-%if 0%{?fedora} > 8
-%{__sed} -i.xul \
- -e 's|xulrunner-xpcom|libxul-unstable|' \
- -e 's|$GECKO-xpcom|libxul-unstable|' \
- -e 's|$GECKO-gtkmozembed|libxul-unstable|' \
- configure
-%{__sed} -i.xul \
- -e '/nsBuildID/d' \
- module/embed/gecko/mozilla.cpp
+%if 0%{?fedora} == 9
+sed -i.gcc43 -e 's|-Werror||' configure
+
+%{__mkdir} PKGCONFIG
+sed \
+ -e 's|-lxpcomglue|-lxpcomglue -lxul -lxpcom|' \
+ %{_libdir}/pkgconfig/libxul-embedding-unstable.pc > \
+ PKGCONFIG/libxul-embedding-unstable.pc
%endif
%if %{support_anthy}
%{__sed} -i.anthy -e '/^anthy_available/d' configure
%endif
+%if %{support_webkit}
+%{__sed} -i.WebKit -e 's|webkit-1.0|WebKitGtk|' configure
+%{__sed} -i.WebKit -e 's|webkit/webkit.h|webkit.h|' \
+ module/embed/webkit-gtk/kz-webkit-gtk.h
+%endif
%build
+%if 0%{?fedora} == 9
+export LDFLAGS="`nspr-config --libs`"
+export PKG_CONFIG_PATH=$(pwd)/PKGCONFIG
+%endif
+
+# ??? perhaps bugs for WebKit-gtk
+%if %{support_webkit}
+CFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`"
+CXXFLAGS="$RPM_BUILD_FLAGS `pkg-config --cflags gtk+-2.0`"
+LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`"
+%endif
+
%configure \
+%if 0%{?fedora} == 9
+ CC="%{__cc} `nspr-config --cflags`" \
+ CXX="%{__cxx} `nspr-config --cflags`" \
+%endif
--enable-migemo \
%if 0%{?fedora} == 9
- --with-gecko-engine=xulrunner \
--disable-gtkmozembed
%else
--with-gecko-engine=firefox
%endif
+%if 0%{?fedora} == 9
+sed -i.bool -e \
+ 's|#define \(MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_\) 1|#undef \1|' \
+ config.h
+%endif
+
%{__make} %{?_smp_mflags} -k
%install
@@ -207,11 +238,15 @@
%{__rm} -f ${f}.tmp
done
-%if 0%{?fedora} >= 9
-echo "Build explicitly disabled."
-echo "It now builds, not does not work completely."
+%if 1
+%if 0%{?fedora} == 9
+: This package builds. This time no undefined non-weak symbols
+: are found. B
+: But this does not work at all yet!!
+: Disabling build intentionally
exit 1
%endif
+%endif
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -264,13 +299,32 @@
%endif
%changelog
+* Sun Feb 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-7.svn3391_trunk
+- More try to use xulrunner
+ * Fix linkage for gecko.so
+ * Don't use MOZILLA_INTERNAL_API anymore
+ * NS_NewStorageStream should be changed to use xpcom
+ http://developer.mozilla.org/en/docs/Migrating_from_Internal_Linkage_to_Frozen_Linkage
+
+* Sat Feb 23 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-2.svn3391_trunk
+- F-9: Try latest svn for xulrunner
+
* Fri Feb 15 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-1.2.svn3358
-- Try latest svn for xulrunner
+- F-9: Try latest svn for xulrunner
(Still build explicitly disabled. Now it builds, does not crash
but hangs eternally...)
+* Sat Feb 9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Rebuild for new gecko engine (F-7/F-8)
+
+* Wed Jan 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.2-1
+- 0.5.2
+
+* Tue Nov 27 2007 Christopher Aillon <caillon at redhat.com>
+- F-7/8: Rebuild against newer gecko
+
* Wed Nov 12 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.0-2
-- Switch to xulrunner for F-9+.
+- F-9: try to switch to xulrunner
* Tue Nov 6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.0-1.dist.1
- Rebuild against new gecko engine
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kazehakase/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 14 Feb 2008 06:04:31 -0000 1.13
+++ sources 24 Feb 2008 08:58:12 -0000 1.14
@@ -1 +1 @@
-a78d6f68a496c59b6ecdc0576caa4535 kazehakase-0.5.2-svn3358.tar.gz
+d093b44624c4af1d0bb8be5fbe383537 kazehakase-0.5.2-svn3391_trunk.tar.gz
--- kazehakase-svn3358-build.patch DELETED ---
More information about the fedora-extras-commits
mailing list