From 1f142ed8c58ff71f74794cfa2fb91d552438d32c0fc0fe375041f28a033e56d3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 19 Jan 2007 11:41:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=2 --- MozillaThunderbird.changes | 5 ++ MozillaThunderbird.spec | 8 ++- undefined-ops.patch | 113 +++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 undefined-ops.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 9b2e977..b4ed3c1 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 18 17:59:26 CST 2007 - maw@suse.de + +- Add undefined-ops.patch, silencing some warnings. + ------------------------------------------------------------------- Thu Nov 9 01:41:19 CET 2006 - jhargadon@suse.de diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index c20eef3..9b3dcc5 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,7 +1,7 @@ # # spec file for package MozillaThunderbird (Version 1.5.0.8) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,7 +14,7 @@ Name: MozillaThunderbird BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel update-desktop-files zip License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Version: 1.5.0.8 -Release: 1 +Release: 4 Summary: The Stand-Alone Mozilla Mail Component URL: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -56,6 +56,7 @@ Patch26: cups-paper.patch Patch27: print-properties.patch Patch28: replytolist.patch Patch29: list-replyto-clobber.patch +Patch30: undefined-ops.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh %if %suse_version > 1000 @@ -168,6 +169,7 @@ cd $RPM_BUILD_DIR/mozilla %patch27 %patch28 %patch29 +%patch30 %build export MOZ_BUILD_DATE=%{releasedate} @@ -585,6 +587,8 @@ exit 0 %endif %changelog -n MozillaThunderbird +* Thu Jan 18 2007 - maw@suse.de +- Add undefined-ops.patch, silencing some warnings. * Thu Nov 09 2006 - jhargadon@suse.de - security update to version 1.5.0.8 * Tue Sep 12 2006 - stark@suse.de diff --git a/undefined-ops.patch b/undefined-ops.patch new file mode 100644 index 0000000..17c617b --- /dev/null +++ b/undefined-ops.patch @@ -0,0 +1,113 @@ +--- ./layout/base/nsCSSRendering.cpp 2005-12-27 13:52:01.000000000 +0100 ++++ ./layout/base/nsCSSRendering.cpp.new 2007-01-18 23:40:30.741771000 +0100 +@@ -979,14 +979,14 @@ + FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height-adjust,isInvert); + FillOrInvertRect(aContext,dashRect.x,(borderOutside.YMost()-(dashRect.height-adjust)),dashRect.width, dashRect.height-adjust,isInvert); + currRect.y += (dashRect.height-adjust); +- temp = temp-= (dashRect.height-adjust); ++ temp -= (dashRect.height-adjust); + } else { + adjust = (temp%dashRect.width)/2; // adjust a tad longer + // draw in the left and right + FillOrInvertRect(aContext, dashRect.x, borderOutside.y,dashRect.width, dashRect.height+adjust,isInvert); + FillOrInvertRect(aContext, dashRect.x,(borderOutside.YMost()-(dashRect.height+adjust)),dashRect.width, dashRect.height+adjust,isInvert); + currRect.y += (dashRect.height+adjust); +- temp = temp-= (dashRect.height+adjust); ++ temp -= (dashRect.height+adjust); + } + + if( temp > ywidth) +@@ -1045,14 +1045,14 @@ + FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width-adjust,dashRect.height,isInvert); + FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width-adjust)),dashRect.y,dashRect.width-adjust,dashRect.height,isInvert); + currRect.x += (dashRect.width-adjust); +- temp = temp-= (dashRect.width-adjust); ++ temp -= (dashRect.width-adjust); + } else { + adjust = (temp%dashRect.width)/2; + // draw in the left and right + FillOrInvertRect(aContext, borderOutside.x,dashRect.y,dashRect.width+adjust,dashRect.height,isInvert); + FillOrInvertRect(aContext, (borderOutside.XMost()-(dashRect.width+adjust)),dashRect.y,dashRect.width+adjust,dashRect.height,isInvert); + currRect.x += (dashRect.width+adjust); +- temp = temp-= (dashRect.width+adjust); ++ temp -= (dashRect.width+adjust); + } + + +--- ./layout/xul/base/src/nsBox.cpp 2006-01-07 21:27:40.000000000 +0100 ++++ ./layout/xul/base/src/nsBox.cpp.new 2007-01-18 23:43:58.695609000 +0100 +@@ -863,7 +863,7 @@ + while (box) { + nsRect* overflowArea = box->GetOverflowAreaProperty(); + nsRect bounds = overflowArea ? *overflowArea + box->GetPosition() : +- bounds = box->GetRect(); ++ box->GetRect(); + rect.UnionRect(rect, bounds); + + box->GetNextBox(&box); +--- ./mailnews/compose/src/nsMsgCompose.cpp 2007-01-19 00:53:23.575133000 +0100 ++++ ./mailnews/compose/src/nsMsgCompose.cpp.new 2007-01-19 00:55:33.114466000 +0100 +@@ -1476,7 +1476,7 @@ + } + else // check if we're dealing with a displayed message/rfc822 attachment + { +- PRInt32 typeIndex = typeIndex = msgUri.Find("&type=application/x-message-display"); ++ PRInt32 typeIndex = msgUri.Find("&type=application/x-message-display"); + if (typeIndex != kNotFound) + { + msgUri.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); +--- ./intl/unicharutil/src/nsEntityConverter.cpp 2005-04-02 20:44:00.000000000 +0200 ++++ ./intl/unicharutil/src/nsEntityConverter.cpp.new 2007-01-19 00:14:59.413600000 +0100 +@@ -236,7 +236,9 @@ + if (IS_HIGH_SURROGATE(inString[i]) && + i + 2 < len && + IS_LOW_SURROGATE(inString[i + 1])) { +- key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[++i]), 10); ++ // key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[++i]), 10); ++ key.AppendInt(SURROGATE_TO_UCS4(inString[i], inString[i + 1]), 10); ++ ++i; + } + else { + key.AppendInt(inString[i],10); +--- ./netwerk/cache/src/nsDiskCacheMap.h 2006-02-22 04:23:13.000000000 +0100 ++++ ./netwerk/cache/src/nsDiskCacheMap.h.new 2007-01-19 00:16:52.302599000 +0100 +@@ -168,7 +168,7 @@ + + // set blockCount + NS_ASSERTION( (blockCount>=1) && (blockCount<=4),"invalid block count"); +- blockCount = --blockCount; ++ --blockCount; + mDataLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask; + + mDataLocation |= eLocationInitializedMask; +@@ -236,7 +236,7 @@ + + // set blockCount + NS_ASSERTION( (blockCount>=1) && (blockCount<=4),"invalid block count"); +- blockCount = --blockCount; ++ --blockCount; + mMetaLocation |= (blockCount << eExtraBlocksOffset) & eExtraBlocksMask; + + mMetaLocation |= eLocationInitializedMask; +--- ./mailnews/local/src/nsMailboxService.cpp 2007-01-19 00:53:23.280426000 +0100 ++++ ./mailnews/local/src/nsMailboxService.cpp.new 2007-01-19 00:56:19.625909000 +0100 +@@ -228,7 +228,7 @@ + + // this happens with forward inline of message/rfc822 attachment + // opened in a stand-alone msg window. +- PRInt32 typeIndex = typeIndex = uriString.Find("&type=application/x-message-display"); ++ PRInt32 typeIndex = uriString.Find("&type=application/x-message-display"); + if (typeIndex != kNotFound) + { + uriString.Cut(typeIndex, sizeof("&type=application/x-message-display") - 1); +--- ./content/events/src/nsEventStateManager.cpp 2006-08-21 19:49:44.000000000 +0200 ++++ ./content/events/src/nsEventStateManager.cpp.new 2007-01-19 00:31:01.921129000 +0100 +@@ -4162,7 +4162,7 @@ + do_QueryInterface(GetDocumentOuterWindow(mDocument)); + if (newWindow) { + nsIFocusController *newFocusController = +- newFocusController = newWindow->GetRootFocusController(); ++ newWindow->GetRootFocusController(); + nsCOMPtr oldWindow = + do_QueryInterface(GetDocumentOuterWindow(gLastFocusedDocument)); + if (oldWindow) {