rpms/xulrunner/F-9 mozilla-dpi.patch, NONE, 1.1 mozilla-keys.patch, NONE, 1.1 mozilla-wtfbuttons.patch, NONE, 1.1 xulrunner-mozconfig, 1.17, 1.18 xulrunner.spec, 1.112, 1.113
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Sun Apr 13 05:20:50 UTC 2008
- Previous message (by thread): rpms/kernel/devel kernel.spec,1.610,1.611
- Next message (by thread): rpms/firefox/F-9 .cvsignore, 1.79, 1.80 firefox-redhat-default-prefs.js, 1.14, 1.15 firefox.spec, 1.293, 1.294 sources, 1.91, 1.92
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caillon
Update of /cvs/extras/rpms/xulrunner/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29411
Modified Files:
xulrunner-mozconfig xulrunner.spec
Added Files:
mozilla-dpi.patch mozilla-keys.patch mozilla-wtfbuttons.patch
Log Message:
* Sat Apr 12 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.54
- Add upstream patches for dpi, toolbar buttons, and invalid keys
- Re-enable system cairo
mozilla-dpi.patch:
--- NEW FILE mozilla-dpi.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=394103
Index: gfx/src/thebes/nsThebesDeviceContext.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v
retrieving revision 1.68
diff -u -8 -p -r1.68 nsThebesDeviceContext.cpp
--- a/gfx/src/thebes/nsThebesDeviceContext.cpp 17 Feb 2008 21:23:37 -0000 1.68
+++ b/gfx/src/thebes/nsThebesDeviceContext.cpp 25 Feb 2008 10:35:19 -0000
@@ -232,18 +232,17 @@ nsThebesDeviceContext::SetDPI()
NS_ASSERTION(dpi != -1, "no dpi set");
if (dotsArePixels) {
// First figure out the closest multiple of 96, which is the number of
// dev pixels per CSS pixel. Then, divide that into AppUnitsPerCSSPixel()
// to get the number of app units per dev pixel. The PR_MAXes are to
// make sure we don't end up dividing by zero.
mAppUnitsPerDevNotScaledPixel = PR_MAX(1, AppUnitsPerCSSPixel() /
- PR_MAX(1, (dpi + 48) / 96));
-
+ PR_MAX(1, dpi / 96));
} else {
/* set mAppUnitsPerDevPixel so we're using exactly 72 dpi, even
* though that means we have a non-integer number of device "pixels"
* per CSS pixel
*/
mAppUnitsPerDevNotScaledPixel = (AppUnitsPerCSSPixel() * 96) / dpi;
}
mozilla-keys.patch:
--- NEW FILE mozilla-keys.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=427081
Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v
retrieving revision 1.163
diff -u -u -8 -p -r1.163 nsNSSComponent.cpp
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp 26 Mar 2008 03:06:56 -0000 1.163
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp 4 Apr 2008 22:22:26 -0000
@@ -2257,16 +2257,17 @@ nsNSSComponent::GetErrorClass(nsresult a
switch (aNSPRCode)
{
case SEC_ERROR_UNKNOWN_ISSUER:
case SEC_ERROR_CA_CERT_INVALID:
case SEC_ERROR_UNTRUSTED_ISSUER:
case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
case SEC_ERROR_UNTRUSTED_CERT:
+ case SEC_ERROR_INADEQUATE_KEY_USAGE:
case SSL_ERROR_BAD_CERT_DOMAIN:
case SEC_ERROR_EXPIRED_CERTIFICATE:
*aErrorClass = ERROR_CLASS_BAD_CERT;
break;
default:
*aErrorClass = ERROR_CLASS_SSL_PROTOCOL;
break;
}
Index: mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp,v
retrieving revision 1.156
diff -u -u -8 -p -r1.156 nsNSSIOLayer.cpp
--- mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 26 Mar 2008 03:06:56 -0000 1.156
+++ mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 4 Apr 2008 22:22:26 -0000
@@ -770,16 +770,19 @@ AppendErrorTextUntrusted(PRErrorCode err
}
}
if (!errorID) {
switch (errTrust) {
case SEC_ERROR_UNKNOWN_ISSUER:
errorID = "certErrorTrust_UnknownIssuer";
break;
+ case SEC_ERROR_INADEQUATE_KEY_USAGE:
+ // Should get an individual string in the future
+ // For now, use the same as CaInvalid
case SEC_ERROR_CA_CERT_INVALID:
errorID = "certErrorTrust_CaInvalid";
break;
case SEC_ERROR_UNTRUSTED_ISSUER:
errorID = "certErrorTrust_Issuer";
break;
case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
errorID = "certErrorTrust_ExpiredIssuer";
@@ -2816,16 +2819,17 @@ nsNSSBadCertHandler(void *arg, PRFileDes
{
switch (i_node->error)
{
case SEC_ERROR_UNKNOWN_ISSUER:
case SEC_ERROR_CA_CERT_INVALID:
case SEC_ERROR_UNTRUSTED_ISSUER:
case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE:
case SEC_ERROR_UNTRUSTED_CERT:
+ case SEC_ERROR_INADEQUATE_KEY_USAGE:
// We group all these errors as "cert not trusted"
collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED;
if (errorCodeTrust == SECSuccess) {
errorCodeTrust = i_node->error;
}
break;
case SSL_ERROR_BAD_CERT_DOMAIN:
collected_errors |= nsICertOverrideService::ERROR_MISMATCH;
mozilla-wtfbuttons.patch:
--- NEW FILE mozilla-wtfbuttons.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=425079
Index: mozilla/toolkit/content/widgets/toolbar.xml
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/widgets/toolbar.xml,v
retrieving revision 1.46
diff -u -8 -p -r1.46 toolbar.xml
--- mozilla/toolkit/content/widgets/toolbar.xml 22 Mar 2008 04:26:35 -0000 1.46
+++ mozilla/toolkit/content/widgets/toolbar.xml 27 Mar 2008 20:03:31 -0000
@@ -174,22 +174,24 @@
}
var firstChildID = this.firstPermanentChild ? this.firstPermanentChild.id : "";
var lastChildID = this.lastPermanentChild ? this.lastPermanentChild.id : "";
if (val && val != "__empty") {
var itemIds = val.split(",");
var before = true;
+ this._trackInserted = {};
for (var i = 0; i < itemIds.length; i++) {
if (itemIds[i] == firstChildID || itemIds[i] == lastChildID)
before = false;
else
this.insertItem(itemIds[i], null, null, before);
}
+ delete this._trackInserted;
}
return val;
]]>
</setter>
</property>
<method name="insertItem">
@@ -218,16 +220,22 @@
newItem.className = "chromeclass-toolbar-additional";
} else if (aId == "spacer") {
newItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
"toolbarspacer");
uniqueId = (new Date()).getTime()+this.childNodes.length;
newItem.id = "spacer" + uniqueId;
newItem.className = "chromeclass-toolbar-additional";
} else if (this.parentNode.localName == "toolbox") {
+ if (this._trackInserted) {
+ // Protect against creating an item with the given id more than once.
+ if (aId in this._trackInserted)
+ return false;
+ this._trackInserted[aId] = null;
+ }
// Attempt to locate an item with a matching id within palette.
var paletteItem = this.parentNode.palette.firstChild;
while (paletteItem) {
var paletteId = paletteItem.id;
if (paletteId == aId) {
newItem = paletteItem.cloneNode(true);
break;
}
Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner-mozconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xulrunner-mozconfig 20 Mar 2008 22:38:23 -0000 1.17
+++ xulrunner-mozconfig 13 Apr 2008 05:20:11 -0000 1.18
@@ -11,6 +11,7 @@
ac_add_options --enable-system-lcms
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-cairo
ac_add_options --with-pthreads
ac_add_options --disable-strip
ac_add_options --disable-tests
Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xulrunner.spec 8 Apr 2008 00:59:09 -0000 1.112
+++ xulrunner.spec 13 Apr 2008 05:20:11 -0000 1.113
@@ -9,7 +9,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9
-Release: 0.53%{?version_pre}%{?dist}
+Release: 0.54%{?version_pre}%{?dist}
URL: http://www.mozilla.org/projects/xulrunner/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -19,19 +19,17 @@
Source23: %{name}.1
# build patches
-Patch4: mozilla-build.patch
-Patch5: xulrunner-path.patch
-Patch6: xulrunner-version.patch
-
-# customization patches
-
-# local bugfixes
-
-# font system fixes
-
-# Other
-Patch107: mozilla-pkgconfig.patch
-
+Patch1: mozilla-build.patch
+Patch2: xulrunner-path.patch
+Patch3: xulrunner-version.patch
+
+# Fedora specific patches
+Patch10: mozilla-pkgconfig.patch
+
+# Upstream patches
+Patch20: mozilla-dpi.patch
+Patch21: mozilla-wtfbuttons.patch
+Patch22: mozilla-keys.patch
# ---------------------------------------------------
@@ -93,11 +91,15 @@
%prep
%setup -q -c
cd mozilla
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1 -b .ver
-
-%patch107 -p1 -b .pk
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1 -b .ver
+
+%patch10 -p1 -b .pk
+
+%patch20 -p1 -b .dpi
+%patch21 -p1 -b .wtfbuttons
+%patch22 -p1 -b .keys
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -339,6 +341,10 @@
#---------------------------------------------------------------------
%changelog
+* Sat Apr 12 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.54
+- Add upstream patches for dpi, toolbar buttons, and invalid keys
+- Re-enable system cairo
+
* Mon Apr 7 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.53
- Spec cleanups
- Previous message (by thread): rpms/kernel/devel kernel.spec,1.610,1.611
- Next message (by thread): rpms/firefox/F-9 .cvsignore, 1.79, 1.80 firefox-redhat-default-prefs.js, 1.14, 1.15 firefox.spec, 1.293, 1.294 sources, 1.91, 1.92
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list