# HG changeset patch # User Wolfgang Rosenauer # Date 1264142793 -3600 # Node ID 5297865de9474a88c20862211ef74a18d11042d2 # Parent 110e0337b73e25977c616b90d8d238696f01e47b Sync with released package: - add experimental mozilla-crash-annotation.patch - ship a limited build environment which can be used by xul apps (like prism) to build on diff -r 110e0337b73e -r 5297865de947 mozilla-crash-annotation.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-crash-annotation.patch Fri Jan 22 07:46:33 2010 +0100 @@ -0,0 +1,57 @@ +From: Wolfgang Rosenauer +Subject: add distribution information to crash reports when available +References: + +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -3299,26 +3299,47 @@ XRE_main(int argc, char* argv[], const n + rv |= xpcom.SetWindowCreator(nativeApp); + NS_ENSURE_SUCCESS(rv, 1); + + #ifdef MOZ_CRASHREPORTER + // tell the crash reporter to also send the release channel + nsCOMPtr prefs = do_GetService("@mozilla.org/preferences-service;1", &rv); + if (NS_SUCCEEDED(rv)) { + nsCOMPtr defaultPrefBranch; ++ nsCOMPtr distPrefBranch; ++ nsXPIDLCString sval; ++ + rv = prefs->GetDefaultBranch(nsnull, getter_AddRefs(defaultPrefBranch)); +- + if (NS_SUCCEEDED(rv)) { +- nsXPIDLCString sval; + rv = defaultPrefBranch->GetCharPref("app.update.channel", getter_Copies(sval)); + if (NS_SUCCEEDED(rv)) { + CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("ReleaseChannel"), + sval); + } + } ++ ++ rv = prefs->GetBranch("distribution", getter_AddRefs(distPrefBranch)); ++ if (NS_SUCCEEDED(rv)) { ++ rv = distPrefBranch->GetCharPref("id", getter_Copies(sval)); ++ if (NS_SUCCEEDED(rv)) { ++ CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Distributor"), ++ sval); ++ } else { ++ printf("GetCharPref('id') failed \n"); ++ } ++ rv = distPrefBranch->GetCharPref("version", getter_Copies(sval)); ++ if (NS_SUCCEEDED(rv)) { ++ CrashReporter::AnnotateCrashReport(NS_LITERAL_CSTRING("Distributor_version"), ++ sval); ++ } else { ++ printf("GetCharPref('version') failed \n"); ++ } ++ } else { ++printf("GetBranch('distribution') failed\n"); ++ } + } + #endif + { + if (startOffline) { + nsCOMPtr io (do_GetService("@mozilla.org/network/io-service;1")); + NS_ENSURE_TRUE(io, 1); + io->SetManageOfflineStatus(PR_FALSE); + io->SetOffline(PR_TRUE); diff -r 110e0337b73e -r 5297865de947 mozilla-xulrunner192/mozilla-crash-annotation.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-xulrunner192/mozilla-crash-annotation.patch Fri Jan 22 07:46:33 2010 +0100 @@ -0,0 +1,1 @@ +../mozilla-crash-annotation.patch \ No newline at end of file diff -r 110e0337b73e -r 5297865de947 mozilla-xulrunner192/mozilla-xulrunner192.changes --- a/mozilla-xulrunner192/mozilla-xulrunner192.changes Tue Jan 19 19:14:04 2010 +0100 +++ b/mozilla-xulrunner192/mozilla-xulrunner192.changes Fri Jan 22 07:46:33 2010 +0100 @@ -4,6 +4,7 @@ - update to 1.9.2rc2 - add update-alternatives %ghost file to filelist starting with 11.2 (%ghost files are conflicting in earlier versions) +- fixed mozilla-plugin.pc (remove obsolete stable reference) ------------------------------------------------------------------- Wed Jan 6 14:10:25 CET 2010 - wr@rosenauer.org diff -r 110e0337b73e -r 5297865de947 mozilla-xulrunner192/mozilla-xulrunner192.spec --- a/mozilla-xulrunner192/mozilla-xulrunner192.spec Tue Jan 19 19:14:04 2010 +0100 +++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec Fri Jan 22 07:46:33 2010 +0100 @@ -84,6 +84,7 @@ # --- Patch14: mozilla-breakpad-update.patch Patch15: mozilla-milestone.patch +Patch16: mozilla-crash-annotation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): update-alternatives coreutils Requires(preun): update-alternatives coreutils @@ -219,6 +220,7 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build %if %suse_version >= 1110 @@ -255,6 +257,7 @@ mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MILESTONE_RELEASE=1 mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj . \$topsrcdir/xulrunner/config/mozconfig ac_add_options --prefix=%{_prefix} ac_add_options --libdir=%{_libdir} @@ -318,6 +321,7 @@ make -f client.mk build %install +cd ../obj %makeinstall STRIP=/bin/true # remove some executable permissions find $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal} \ @@ -333,6 +337,17 @@ $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/ ln -sf ../../../xulrunner-%{version_internal}/libxul.so \ $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/ +# include basic buildenv for xulapps to use +mkdir -p $RPM_BUILD_ROOT%{_datadir}/xulrunner-%{version_internal} +pushd .. +# this list has been compiled by trial and error for prism +tar --exclude=*.cpp --exclude=*.mm \ + -cvjf $RPM_BUILD_ROOT%{_datadir}/xulrunner-%{version_internal}/mozilla-src.tar.bz2 \ + mozilla/configure.in mozilla/Makefile.in mozilla/client.py mozilla/allmakefiles.sh \ + mozilla/config mozilla/client.mk mozilla/aclocal.m4 mozilla/build mozilla/js/src/* \ + mozilla/testing mozilla/toolkit/mozapps/installer mozilla/probes mozilla/memory \ + mozilla/toolkit/xre mozilla/nsprpub/config mozilla/tools mozilla/xpcom/build +popd # XPI example #cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/ # preferences @@ -352,7 +367,7 @@ # install additional locales %if %localize rm -f %{_tmppath}/translations.* -for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do +for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) ;; @@ -516,6 +531,7 @@ # FIXME symlink dynamic libs below sdk/lib %attr(644,root,root) %{_libdir}/pkgconfig/* %{_includedir}/xulrunner-%{version_internal}/ +%{_datadir}/xulrunner-%{version_internal}/ %files gnome %defattr(-,root,root) diff -r 110e0337b73e -r 5297865de947 series --- a/series Tue Jan 19 19:14:04 2010 +0100 +++ b/series Fri Jan 22 07:46:33 2010 +0100 @@ -14,6 +14,7 @@ toolkit-ui-lockdown.patch mozilla-breakpad-update.patch mozilla-milestone.patch +mozilla-crash-annotation.patch # Firefox patches firefox-libxul-sdk.patch