Hello community, here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2012-04-23 16:14:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xulrunner (Old) and /work/SRC/openSUSE:Factory/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xulrunner", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2012-03-16 13:28:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2012-04-23 16:14:14.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Apr 21 10:03:42 UTC 2012 - wr@rosenauer.org + +- update to 12.0 (bnc#758408) + * rebased patches +- added mozilla-libnotify.patch to allow fallback from libnotify + to xul based events if no notification-daemon is running +- gcc 4.7 fixes + * mozilla-gcc47.patch + * disabled crashreporter temporarily for Factory + +------------------------------------------------------------------- Old: ---- l10n-11.0.tar.bz2 mozilla-sle11-gcc.patch xulrunner-11.0-source.tar.bz2 New: ---- l10n-12.0.tar.bz2 mozilla-gcc47.patch mozilla-libnotify.patch mozilla-revert_621446.patch xulrunner-12.0-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.jiIUyd/_old 2012-04-23 16:14:20.000000000 +0200 +++ /var/tmp/diff_new_pack.jiIUyd/_new 2012-04-23 16:14:20.000000000 +0200 @@ -44,12 +44,12 @@ %endif BuildRequires: mozilla-nspr-devel >= 4.9.0 BuildRequires: mozilla-nss-devel >= 3.13.3 -Version: 11.0 +Version: 12.0 Release: 0 -%define releasedate 2012031200 -%define version_internal 11.0 -%define apiversion 11 -%define uaweight 1100000 +%define releasedate 2012042100 +%define version_internal 12.0 +%define apiversion 12 +%define uaweight 1200000 Summary: Mozilla Runtime Environment License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Productivity/Other @@ -79,8 +79,10 @@ Patch13: mozilla-sle11.patch Patch14: mozilla-linux3.patch Patch15: mozilla-arm-cpu-detection.patch +Patch16: mozilla-revert_621446.patch Patch17: mozilla-yarr-pcre.patch -Patch18: mozilla-sle11-gcc.patch +Patch18: mozilla-libnotify.patch +Patch19: mozilla-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -97,6 +99,10 @@ %define crashreporter 1 %define plugincontainer 1 %endif +# temporary (gcc 4.7) +%if %suse_version > 1210 +%define crashreporter 0 +%endif ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} @@ -162,7 +168,7 @@ Summary: Extra translations for XULRunner Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -199,8 +205,10 @@ %endif %patch14 -p1 %patch15 -p1 +%patch16 -p1 #%patch17 -p1 %patch18 -p1 +%patch19 -p1 %build # no need to add build time to binaries ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.jiIUyd/_old 2012-04-23 16:14:21.000000000 +0200 +++ /var/tmp/diff_new_pack.jiIUyd/_new 2012-04-23 16:14:21.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_11_0_RELEASE" -VERSION="11.0" +RELEASE_TAG="FIREFOX_12_0_RELEASE" +VERSION="12.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ l10n-11.0.tar.bz2 -> l10n-12.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/l10n-11.0.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/l10n-12.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-sle11-gcc.patch -> mozilla-gcc47.patch ++++++ --- /work/SRC/openSUSE:Factory/xulrunner/mozilla-sle11-gcc.patch 2012-03-16 13:28:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/mozilla-gcc47.patch 2012-04-23 16:14:12.000000000 +0200 @@ -1,24 +1,174 @@ # HG changeset patch -# Parent 39e596b823926b5add22bb263734c6c872ee2aad -diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/base/src/nsXULTooltipListener.h ---- a/layout/xul/base/src/nsXULTooltipListener.h -+++ b/layout/xul/base/src/nsXULTooltipListener.h -@@ -107,17 +107,17 @@ protected: - static void sTooltipCallback (nsITimer* aTimer, void* aListener); - - // screen coordinates of the last mousemove event, stored so that the - // tooltip can be opened at this location. - PRInt32 mMouseScreenX, mMouseScreenY; - - // various constants for tooltips - enum { -- kTooltipMouseMoveTolerance = 7, // 7 pixel tolerance for mousemove event -+ kTooltipMouseMoveTolerance = 7 // 7 pixel tolerance for mousemove event - }; - - // flag specifying if the tooltip has already been displayed by a MouseMove - // event. The flag is reset on MouseOut so that the tooltip will display - // the next time the mouse enters the node (bug #395668). - bool mTooltipShownOnce; +# Parent debab900e37fdd4f8981c06beef6f193a04bd2b7 +Patch to make Mozilla build with gcc 4.7, including +- Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) +- Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) + +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. - #ifdef MOZ_XUL + #include "base/file_util.h" + + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <string> + #include <vector> + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include <errno.h> + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ + #include <mach/mach_time.h> + #endif + #include <sys/time.h> + #ifdef ANDROID + #include <time64.h> + #else + #include <time.h> + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <limits> + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { + +diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp +--- a/layout/base/tests/TestPoisonArea.cpp ++++ b/layout/base/tests/TestPoisonArea.cpp +@@ -392,53 +392,53 @@ ReservePoisonArea() + { + if (sizeof(uintptr_t) == 8) { + // Use the hardware-inaccessible region. + // We have to avoid 64-bit constants and shifts by 32 bits, since this + // code is compiled in 32-bit mode, although it is never executed there. + uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | + uintptr_t(0xF0DEAFFFu)) & + ~uintptr_t(PAGESIZE-1)); +- printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); ++ printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); + return result; + } else { + // First see if we can allocate the preferred poison address from the OS. + uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1)); + void *result = ReserveRegion(candidate, false); + if (result == (void *)candidate) { + // success - inaccessible page allocated +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (preferred addr)\n", SIZxPTR, (uintptr_t)result); + return candidate; + } + + // That didn't work, so see if the preferred address is within a range + // of permanently inacessible memory. + if (ProbeRegion(candidate)) { + // success - selected page cannot be usable memory + if (result != MAP_FAILED) + ReleaseRegion(result); +- printf("INFO | poison area assumed at 0x%.*"PRIxPTR ++ printf("INFO | poison area assumed at 0x%.*" PRIxPTR + " (preferred addr)\n", SIZxPTR, candidate); + return candidate; + } + + // The preferred address is already in use. Did the OS give us a + // consolation prize? + if (result != MAP_FAILED) { +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (consolation prize)\n", SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + // It didn't, so try to allocate again, without any constraint on + // the address. + result = ReserveRegion(0, false); + if (result != MAP_FAILED) { +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (fallback)\n", SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + printf("ERROR | no usable poison area found\n"); + return 0; + } + } +@@ -450,17 +450,17 @@ static uintptr_t + ReservePositiveControl() + { + + void *result = ReserveRegion(0, false); + if (result == MAP_FAILED) { + printf("ERROR | allocating positive control | %s\n", LastErrMsg()); + return 0; + } +- printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", ++ printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", + SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + /* The "negative control" area confirms that our probe logic does detect a + * page that is readable, writable, or executable. + */ + static uintptr_t +@@ -481,17 +481,17 @@ ReserveNegativeControl() + // Now mark it executable as well as readable and writable. + // (mmap(PROT_EXEC) may fail when applied to anonymous memory.) + + if (MakeRegionExecutable(result)) { + printf("ERROR | making negative control executable | %s\n", LastErrMsg()); + return 0; + } + +- printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", ++ printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", + SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + static void + JumpTo(uintptr_t opaddr) + { + #ifdef __ia64 ++++++ mozilla-libnotify.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr@rosenauer.org> # Parent c684863b1eb3bcae92ef24bc2ac511985b1ad7e4 Bug 737646 - no biff notification if notification-daemon not running diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp --- a/toolkit/system/gnome/nsAlertsIconListener.cpp +++ b/toolkit/system/gnome/nsAlertsIconListener.cpp @@ -47,16 +47,17 @@ #include <gdk/gdk.h> // Compatibility macro for <libnotify-0.7 #ifndef NOTIFY_CHECK_VERSION #define NOTIFY_CHECK_VERSION(x,y,z) 0 #endif static bool gHasActions = false; +static bool gHasCaps = false; static void notify_action_cb(NotifyNotification *notification, gchar *action, gpointer user_data) { nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data); alert->SendCallback(); } @@ -338,27 +339,34 @@ nsAlertsIconListener::InitAlertAsync(con appShortName.AssignLiteral("Mozilla"); } if (!notify_init(appShortName.get())) return NS_ERROR_FAILURE; GList *server_caps = notify_get_server_caps(); if (server_caps) { + gHasCaps = true; for (GList* cap = server_caps; cap != NULL; cap = cap->next) { if (!strcmp((char*) cap->data, "actions")) { gHasActions = true; break; } } g_list_foreach(server_caps, (GFunc)g_free, NULL); g_list_free(server_caps); } } + if (!gHasCaps) { + // if notify_get_server_caps() failed above we need to assume + // there is no notification-server to display anything + return NS_ERROR_FAILURE; + } + if (!gHasActions && aAlertTextClickable) return NS_ERROR_FAILURE; // No good, fallback to XUL nsCOMPtr<nsIObserverService> obsServ = do_GetService("@mozilla.org/observer-service;1"); if (obsServ) obsServ->AddObserver(this, "quit-application", true); ++++++ mozilla-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.jiIUyd/_old 2012-04-23 16:14:21.000000000 +0200 +++ /var/tmp/diff_new_pack.jiIUyd/_new 2012-04-23 16:14:21.000000000 +0200 @@ -4,17 +4,17 @@ diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in -@@ -68,16 +68,19 @@ INSTALL_SDK = 1 - ifndef MOZ_PLATFORM_MAEMO +@@ -69,16 +69,19 @@ ifndef MOZ_PLATFORM_MAEMO GENERATE_CACHE = 1 endif + include $(topsrcdir)/toolkit/mozapps/installer/signing.mk include $(topsrcdir)/toolkit/mozapps/installer/packager.mk # Add pkg-config files to the install:: target +# the apilibdir always ends with 1.9 as every patch update will provide a link -+apilibdir = $(dir $(installdir))xulrunner-11 ++apilibdir = $(dir $(installdir))xulrunner-12 + pkg_config_files = \ libxul.pc \ @@ -24,7 +24,7 @@ $(NULL) ifdef MOZ_NATIVE_NSPR -@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc +@@ -106,16 +109,17 @@ pkg_config_files += mozilla-nss.pc endif %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) ++++++ mozilla-revert_621446.patch ++++++ # HG changeset patch # Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -52,29 +52,25 @@ #include "nsIBadCertListener2.h" #include "nsICacheEntryDescriptor.h" #include "nsSerializationHelper.h" #include "nsISerializable.h" #include "nsIAssociatedContentSecurity.h" #include "nsIApplicationCacheService.h" #include "nsIOfflineCacheUpdate.h" #include "nsIRedirectChannelRegistrar.h" -#include "prinit.h" namespace mozilla { namespace net { HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding) : mIPCClosed(false) , mStoredStatus(0) , mStoredProgress(0) , mStoredProgressMax(0) - , mSentRedirect1Begin(false) - , mSentRedirect1BeginFailed(false) - , mReceivedRedirect2Verify(false) { // Ensure gHttpHandler is initialized: we need the atom table up and running. nsIHttpProtocolHandler* handler; CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler); NS_ASSERTION(handler, "no http handler"); mTabParent = do_QueryObject(static_cast<TabParent*>(iframeEmbedding)); } @@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high); mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low); mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken); mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no); } return true; } -// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be -// merged to a single address. -#pragma warning(disable : 4068) -#pragma GCC optimize ("O0") - bool HttpChannelParent::RecvRedirect2Verify(const nsresult& result, const RequestHeaderTuples& changedHeaders) { if (NS_SUCCEEDED(result)) { nsCOMPtr<nsIHttpChannel> newHttpChannel = do_QueryInterface(mRedirectChannel); @@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, changedHeaders[i].mValue, changedHeaders[i].mMerge); } } } - if (!mRedirectCallback) { - // Bug 621446 investigation (optimization turned off above) - if (mReceivedRedirect2Verify) - NS_RUNTIMEABORT("Duplicate fire"); - if (mSentRedirect1BeginFailed) - NS_RUNTIMEABORT("Send to child failed"); - if (mSentRedirect1Begin && NS_FAILED(result)) - NS_RUNTIMEABORT("Redirect failed"); - if (mSentRedirect1Begin && NS_SUCCEEDED(result)) - NS_RUNTIMEABORT("Redirect succeeded"); - if (!mRedirectChannel) - NS_RUNTIMEABORT("Missing redirect channel"); - } - - mReceivedRedirect2Verify = true; - mRedirectCallback->OnRedirectVerifyCallback(result); mRedirectCallback = nsnull; return true; } -// Bug 621446 investigation -#pragma GCC reset_options - bool HttpChannelParent::RecvDocumentChannelCleanup() { // From now on only using mAssociatedContentSecurity. Free everything else. mChannel = 0; // Reclaim some memory sooner. mCacheDescriptor = 0; // Else we'll block other channels reading same URI return true; } @@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); bool result = SendRedirect1Begin(newChannelId, IPC::URI(newURI), redirectFlags, responseHead ? *responseHead : nsHttpResponseHead()); - if (!result) { - // Bug 621446 investigation - mSentRedirect1BeginFailed = true; + if (!result) return NS_BINDING_ABORTED; - } - - // Bug 621446 investigation - mSentRedirect1Begin = true; // Result is handled in RecvRedirect2Verify above mRedirectChannel = newChannel; mRedirectCallback = callback; return NS_OK; } diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -128,18 +128,14 @@ private: nsCOMPtr<nsIChannel> mRedirectChannel; nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback; // state for combining OnStatus/OnProgress with OnDataAvailable // into one IPDL call to child. nsresult mStoredStatus; PRUint64 mStoredProgress; PRUint64 mStoredProgressMax; - - bool mSentRedirect1Begin : 1; - bool mSentRedirect1BeginFailed : 1; - bool mReceivedRedirect2Verify : 1; }; } // namespace net } // namespace mozilla #endif // mozilla_net_HttpChannelParent_h ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.jiIUyd/_old 2012-04-23 16:14:21.000000000 +0200 +++ /var/tmp/diff_new_pack.jiIUyd/_new 2012-04-23 16:14:21.000000000 +0200 @@ -1,2 +1,2 @@ -REV=b967d9c07377 +REV=a294a5b4f12d REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ xulrunner-11.0-source.tar.bz2 -> xulrunner-12.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/xulrunner-11.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner-12.0-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org