rpms/firefox/devel firefox-1.1-canvas-system-cairo.patch, NONE, 1.1 firefox-1.1-proxy-prefs.patch, NONE, 1.1 firefox-mozconfig, 1.4, 1.5 firefox.spec, 1.84, 1.85
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Aug 27 07:34:36 UTC 2005
Author: caillon
Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10706
Modified Files:
firefox-mozconfig firefox.spec
Added Files:
firefox-1.1-canvas-system-cairo.patch
firefox-1.1-proxy-prefs.patch
Log Message:
* Sat Aug 27 2005 Christopher Aillon <caillon at redhat.com> - 1.1-0.2.8.deerpark.alpha2
- Re-enable SVG, canvas, and system cairo.
- Fix issue with typing in proxy preference panel
firefox-1.1-canvas-system-cairo.patch:
Makefile.in | 2 ++
1 files changed, 2 insertions(+)
--- NEW FILE firefox-1.1-canvas-system-cairo.patch ---
Index: content/canvas/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/content/canvas/src/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- content/canvas/src/Makefile.in 11 May 2005 23:49:51 -0000 1.4
+++ content/canvas/src/Makefile.in 22 Aug 2005 19:57:51 -0000
@@ -94,4 +94,6 @@
include $(topsrcdir)/config/rules.mk
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
+
DEFINES += -D_IMPL_NS_LAYOUT
firefox-1.1-proxy-prefs.patch:
connection.js | 16 ++++++++++------
connection.xul | 3 +--
2 files changed, 11 insertions(+), 8 deletions(-)
--- NEW FILE firefox-1.1-proxy-prefs.patch ---
Index: browser/components/preferences/connection.js
===================================================================
RCS file: /cvsroot/mozilla/browser/components/preferences/connection.js,v
retrieving revision 1.4
diff -u -p -8 -r1.4 connection.js
--- browser/components/preferences/connection.js 14 Jun 2005 10:19:34 -0000 1.4
+++ browser/components/preferences/connection.js 26 Aug 2005 20:09:21 -0000
@@ -33,16 +33,21 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
var gConnectionsDialog = {
beforeAccept: function ()
{
var proxyTypePref = document.getElementById("network.proxy.type");
+ if (proxyTypePref.value == 2) {
+ this.doAutoconfigURLFixup();
+ return true;
+ }
+
if (proxyTypePref.value != 1)
return true;
var httpProxyURLPref = document.getElementById("network.proxy.http");
var httpProxyPortPref = document.getElementById("network.proxy.http_port");
var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
if (shareProxiesPref.value) {
var proxyPrefs = ["ssl", "ftp", "socks", "gopher"];
@@ -52,16 +57,17 @@ var gConnectionsDialog = {
var backupServerURLPref = document.getElementById("network.proxy.backup." + proxyPrefs[i]);
var backupPortPref = document.getElementById("network.proxy.backup." + proxyPrefs[i] + "_port");
backupServerURLPref.value = proxyServerURLPref.value;
backupPortPref.value = proxyPortPref.value;
proxyServerURLPref.value = httpProxyURLPref.value;
proxyPortPref.value = httpProxyPortPref.value;
}
}
+
return true;
},
proxyTypeChanged: function ()
{
var proxyTypePref = document.getElementById("network.proxy.type");
// Update http
@@ -141,27 +147,25 @@ var gConnectionsDialog = {
reloadPAC: function ()
{
var autoURL = document.getElementById("networkProxyAutoconfigURL");
var pps = Components.classes["@mozilla.org/network/protocol-proxy-service;1"]
.getService(Components.interfaces.nsPIProtocolProxyService);
pps.configureFromPAC(autoURL.value);
},
- writeAutoconfigURL: function ()
+ doAutoconfigURLFixup: function ()
{
var autoURL = document.getElementById("networkProxyAutoconfigURL");
+ var autoURLPref = document.getElementById("network.proxy.autoconfig_url");
var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
.getService(Components.interfaces.nsIURIFixup);
try {
- return URIFixup.createFixupURI(autoURL.value, 0).spec;
- }
- catch(ex) {
- }
- return undefined;
+ autoURLPref.value = autoURL.value = URIFixup.createFixupURI(autoURL.value, 0).spec;
+ } catch(ex) {}
},
readHTTPProxyServer: function ()
{
var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
if (shareProxiesPref.value)
this.updateProtocolPrefs();
return undefined;
Index: browser/components/preferences/connection.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/preferences/connection.xul,v
retrieving revision 1.6.4.1
diff -u -p -8 -r1.6.4.1 connection.xul
--- browser/components/preferences/connection.xul 21 Aug 2005 04:46:01 -0000 1.6.4.1
+++ browser/components/preferences/connection.xul 26 Aug 2005 20:09:21 -0000
@@ -191,18 +191,17 @@
<row>
<spacer/>
<label value="&noproxyExplain.label;" control="networkProxyNone"/>
</row>
</rows>
</grid>
<radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"/>
<hbox class="indent" flex="1" align="center">
- <textbox id="networkProxyAutoconfigURL" flex="1" preference="network.proxy.autoconfig_url"
- onsynctopreference="return gConnectionsDialog.writeAutoconfigURL();"/>
+ <textbox id="networkProxyAutoconfigURL" flex="1" preference="network.proxy.autoconfig_url"/>
<button id="autoReload" icon="refresh"
label="&reload.label;" accesskey="&reload.accesskey;"
oncommand="gConnectionsDialog.reloadPAC();"
preference="pref.advanced.proxies.disable_button.reload"/>
</hbox>
</radiogroup>
</groupbox>
</prefpane>
Index: firefox-mozconfig
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-mozconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefox-mozconfig 29 Jul 2005 20:41:09 -0000 1.4
+++ firefox-mozconfig 27 Aug 2005 07:34:33 -0000 1.5
@@ -14,9 +14,9 @@
ac_add_options --disable-xprint
ac_add_options --disable-strip
ac_add_options --enable-pango
-#ac_add_options --enable-system-cairo
-#ac_add_options --enable-svg
-#ac_add_options --enable-canvas
+ac_add_options --enable-system-cairo
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- firefox.spec 19 Aug 2005 02:45:32 -0000 1.84
+++ firefox.spec 27 Aug 2005 07:34:33 -0000 1.85
@@ -11,7 +11,7 @@
Summary: Mozilla Firefox Web browser.
Name: firefox
Version: 1.1
-Release: 0.2.7.deerpark.alpha2.1
+Release: 0.2.8.deerpark.alpha2
URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL
Group: Applications/Internet
@@ -42,6 +42,7 @@
Patch3: firefox-1.1-nss-system-nspr.patch
Patch4: firefox-1.1-dont-package-nspr-libs.patch
Patch5: firefox-1.1-visibility.patch
+Patch6: firefox-1.1-canvas-system-cairo.patch
# customization patches
Patch20: firefox-redhat-homepage.patch
@@ -65,6 +66,7 @@
# patches from upstream (Patch100+)
Patch100: firefox-1.1-modal-filechooser.patch
Patch101: firefox-1.1-focus-on-navback.patch
+Patch102: firefox-1.1-proxy-prefs.patch
# ---------------------------------------------------
@@ -114,6 +116,8 @@
%patch5 -p0
%endif
+%patch6 -p0
+
%patch20 -p0
%patch21 -p1
%patch22 -p1
@@ -129,6 +133,7 @@
%patch81 -p1
%patch100 -p0
%patch101 -p0
+%patch102 -p0
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -262,6 +267,10 @@
#---------------------------------------------------------------------
%changelog
+* Sat Aug 27 2005 Christopher Aillon <caillon at redhat.com> - 1.1-0.2.8.deerpark.alpha2
+- Re-enable SVG, canvas, and system cairo.
+- Fix issue with typing in proxy preference panel
+
* Thu Aug 18 2005 Jeremy Katz <katzj at redhat.com> - 1.1-0.2.7.deerpark.alpha2.1
- another fix to not use pango_xft
More information about the fedora-cvs-commits
mailing list