From ebf2e84c2d631fd52f7a109ef03ffbab7b8e3a31eeca0f72509b2b71d2e299f2 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 2 Oct 2009 20:56:54 +0000 Subject: [PATCH 1/3] bnc#503351, bnc#543460 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=118 --- MozillaFirefox.changes | 8 +++ MozillaFirefox.spec | 4 ++ firefox-browser-css.patch | 148 ++++++++++++++++++++++++++++++++++++++ mozilla-abi.patch | 40 +++++++++++ 4 files changed, 200 insertions(+) create mode 100644 firefox-browser-css.patch create mode 100644 mozilla-abi.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 4dd74ce..c715f87 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 2 20:26:49 CEST 2009 - wr@rosenauer.org + +- improve UI colors to be usable with dark themes at all + (firefox-browser-css.patch) (bnc#503351) +- extend list of supported architectures as ABI identifier + (mozilla-abi.patch) (bnc#543460) + ------------------------------------------------------------------- Mon Sep 14 00:07:55 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index bfae635..57a73ee 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -53,6 +53,8 @@ Patch5: firefox-bug506901.patch Patch6: firefox-cross-desktop.patch Patch7: firefox-kde.patch Patch8: firefox-no-gnomevfs.patch +Patch9: firefox-browser-css.patch +Patch10: mozilla-abi.patch Patch14: credits.patch Patch17: firefox-appname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -152,6 +154,8 @@ cd $RPM_BUILD_DIR/mozilla %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %patch14 %patch17 # install kde.js diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch new file mode 100644 index 0000000..44a0ff0 --- /dev/null +++ b/firefox-browser-css.patch @@ -0,0 +1,148 @@ +From: Jakub Steiner +Subject: make style compatible with dark themes +References: +https://bugzilla.novell.com/show_bug.cgi?id=503351 + + +diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css +--- a/browser/base/content/browser.css ++++ b/browser/base/content/browser.css +@@ -4,42 +4,87 @@ + searchbar { + -moz-binding: url("chrome://browser/content/search/search.xml#searchbar"); + } + + tabbrowser { + -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser"); + } + ++ /* Remove focus lines from tabs */ ++ ++ .tabbrowser-tab > .tab-text { ++ border: 1px dotted transparent !important; ++ } ++ ++ + toolbar[printpreview="true"] { + -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar"); + } + + toolbarpaletteitem[place="palette"] > toolbaritem > hbox[type="places"] { + display: none; + } + + /* ::::: location bar ::::: */ + #urlbar { + -moz-binding: url(chrome://browser/content/urlbarBindings.xml#urlbar); ++ -moz-appearance: textfield !important; + } + ++ #urlbar .autocomplete-textbox-container { ++ background-color: -moz-Field !important; ++ -moz-appearance: none !important; ++ } ++ ++ #urlbar > .autocomplete-history-dropmarker { ++ -moz-appearance: toolbarbutton-dropdown !important; ++ margin: 0px 3px 0px 5px !important; ++ } ++ + #wrapper-urlbar-container #urlbar { + -moz-user-input: disabled; + cursor: -moz-grab; + } + + #PopupAutoComplete { + -moz-binding: url("chrome://browser/content/urlbarBindings.xml#browser-autocomplete-result-popup"); + } + + #PopupAutoCompleteRichResult { + -moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup"); + } + ++ #PopupAutoCompleteRichResult .autocomplete-richlistitem ++ { ++ background: -moz-Field !important; ++ } ++ ++ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] ++ { ++ background: Highlight !important; ++ } ++ ++ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"], ++ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] * ++ { ++ color: HighlightText !important; ++ } ++ ++ .ac-title ++ { ++ color: -moz-Fieldtext !important; ++ } ++ ++ #PopupAutoComplete .autocomplete-treebody { ++ background-color: -moz-Field !important; ++ color: -moz-Fieldtext !important; ++ } ++ ++ + #page-report-button:not([blocked]) { + display: none; + } + + #urlbar-throbber:not([busy="true"]), + #urlbar-throbber[busy="true"] + #page-proxy-favicon { + display: none; + } +@@ -59,16 +104,31 @@ toolbarpaletteitem[place="palette"] > to + visibility: collapse; + } + + #identity-box > hbox { + max-width: 22em; + min-width: 1px; + } + ++/* Identity/Bookmark pop-up improvements */ ++ ++ #identity-popup-container { ++ -moz-appearance: dialog !important; ++ } ++ ++ #editBookmarkPanel { ++ -moz-appearance: dialog !important; ++ } ++ ++ #editBMPanel_foldersExpander, #editBMPanel_tagsSelectorExpander { ++ -moz-appearance: menulist-button !important; ++ } ++ ++ + /* ::::: Unified Back-/Forward Button ::::: */ + #back-forward-dropmarker > image , + #back-forward-dropmarker > label { + display: none; + } + .unified-nav-current { + font-weight: bold; + } +@@ -154,8 +214,18 @@ window[chromehidden~="toolbar"] toolbar: + display: inline-block; + } + %endif + + /* Bug 483950 - Hide domain name in status bar pending removal */ + #security-button > label { + display: none; + } ++ ++ ++/* Support for Fission add-on */ ++ ++#urlbar[fission="fusion"] > #statusbar-icon > .progress-bar { ++ background-color: Highlight !important; ++ -moz-appearance: progresschunk !important; ++ opacity: 0.4 !important; ++ margin: 1px !important; ++} diff --git a/mozilla-abi.patch b/mozilla-abi.patch new file mode 100644 index 0000000..d708440 --- /dev/null +++ b/mozilla-abi.patch @@ -0,0 +1,40 @@ +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -1322,24 +1322,36 @@ fi + + # Only set CPU_ARCH if we recognize the value of OS_TEST + + case "$OS_TEST" in + *86 | i86pc) + CPU_ARCH=x86 + ;; + ++powerpc64 | ppc64) ++ CPU_ARCH=ppc64 ++ ;; ++ + powerpc* | ppc | rs6000) + CPU_ARCH=ppc + ;; + + Alpha | alpha | ALPHA) + CPU_ARCH=Alpha + ;; + ++s390) ++ CPU_ARCH=s390 ++ ;; ++ ++s390x) ++ CPU_ARCH=s390x ++ ;; ++ + hppa* | parisc) + CPU_ARCH=hppa + ;; + + sun4u | sparc*) + CPU_ARCH=sparc + ;; + From efed4244b576bdf642e30e0fd3fd781db05677ad7f8a4c4ee7a57acef4743cd3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 6 Oct 2009 00:17:28 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=119 --- MozillaFirefox.changes | 8 --- MozillaFirefox.spec | 4 -- firefox-browser-css.patch | 148 -------------------------------------- mozilla-abi.patch | 40 ----------- 4 files changed, 200 deletions(-) delete mode 100644 firefox-browser-css.patch delete mode 100644 mozilla-abi.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index c715f87..4dd74ce 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 2 20:26:49 CEST 2009 - wr@rosenauer.org - -- improve UI colors to be usable with dark themes at all - (firefox-browser-css.patch) (bnc#503351) -- extend list of supported architectures as ABI identifier - (mozilla-abi.patch) (bnc#543460) - ------------------------------------------------------------------- Mon Sep 14 00:07:55 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 57a73ee..bfae635 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -53,8 +53,6 @@ Patch5: firefox-bug506901.patch Patch6: firefox-cross-desktop.patch Patch7: firefox-kde.patch Patch8: firefox-no-gnomevfs.patch -Patch9: firefox-browser-css.patch -Patch10: mozilla-abi.patch Patch14: credits.patch Patch17: firefox-appname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -154,8 +152,6 @@ cd $RPM_BUILD_DIR/mozilla %patch6 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 -%patch10 -p1 %patch14 %patch17 # install kde.js diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch deleted file mode 100644 index 44a0ff0..0000000 --- a/firefox-browser-css.patch +++ /dev/null @@ -1,148 +0,0 @@ -From: Jakub Steiner -Subject: make style compatible with dark themes -References: -https://bugzilla.novell.com/show_bug.cgi?id=503351 - - -diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css ---- a/browser/base/content/browser.css -+++ b/browser/base/content/browser.css -@@ -4,42 +4,87 @@ - searchbar { - -moz-binding: url("chrome://browser/content/search/search.xml#searchbar"); - } - - tabbrowser { - -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser"); - } - -+ /* Remove focus lines from tabs */ -+ -+ .tabbrowser-tab > .tab-text { -+ border: 1px dotted transparent !important; -+ } -+ -+ - toolbar[printpreview="true"] { - -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar"); - } - - toolbarpaletteitem[place="palette"] > toolbaritem > hbox[type="places"] { - display: none; - } - - /* ::::: location bar ::::: */ - #urlbar { - -moz-binding: url(chrome://browser/content/urlbarBindings.xml#urlbar); -+ -moz-appearance: textfield !important; - } - -+ #urlbar .autocomplete-textbox-container { -+ background-color: -moz-Field !important; -+ -moz-appearance: none !important; -+ } -+ -+ #urlbar > .autocomplete-history-dropmarker { -+ -moz-appearance: toolbarbutton-dropdown !important; -+ margin: 0px 3px 0px 5px !important; -+ } -+ - #wrapper-urlbar-container #urlbar { - -moz-user-input: disabled; - cursor: -moz-grab; - } - - #PopupAutoComplete { - -moz-binding: url("chrome://browser/content/urlbarBindings.xml#browser-autocomplete-result-popup"); - } - - #PopupAutoCompleteRichResult { - -moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup"); - } - -+ #PopupAutoCompleteRichResult .autocomplete-richlistitem -+ { -+ background: -moz-Field !important; -+ } -+ -+ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] -+ { -+ background: Highlight !important; -+ } -+ -+ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"], -+ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] * -+ { -+ color: HighlightText !important; -+ } -+ -+ .ac-title -+ { -+ color: -moz-Fieldtext !important; -+ } -+ -+ #PopupAutoComplete .autocomplete-treebody { -+ background-color: -moz-Field !important; -+ color: -moz-Fieldtext !important; -+ } -+ -+ - #page-report-button:not([blocked]) { - display: none; - } - - #urlbar-throbber:not([busy="true"]), - #urlbar-throbber[busy="true"] + #page-proxy-favicon { - display: none; - } -@@ -59,16 +104,31 @@ toolbarpaletteitem[place="palette"] > to - visibility: collapse; - } - - #identity-box > hbox { - max-width: 22em; - min-width: 1px; - } - -+/* Identity/Bookmark pop-up improvements */ -+ -+ #identity-popup-container { -+ -moz-appearance: dialog !important; -+ } -+ -+ #editBookmarkPanel { -+ -moz-appearance: dialog !important; -+ } -+ -+ #editBMPanel_foldersExpander, #editBMPanel_tagsSelectorExpander { -+ -moz-appearance: menulist-button !important; -+ } -+ -+ - /* ::::: Unified Back-/Forward Button ::::: */ - #back-forward-dropmarker > image , - #back-forward-dropmarker > label { - display: none; - } - .unified-nav-current { - font-weight: bold; - } -@@ -154,8 +214,18 @@ window[chromehidden~="toolbar"] toolbar: - display: inline-block; - } - %endif - - /* Bug 483950 - Hide domain name in status bar pending removal */ - #security-button > label { - display: none; - } -+ -+ -+/* Support for Fission add-on */ -+ -+#urlbar[fission="fusion"] > #statusbar-icon > .progress-bar { -+ background-color: Highlight !important; -+ -moz-appearance: progresschunk !important; -+ opacity: 0.4 !important; -+ margin: 1px !important; -+} diff --git a/mozilla-abi.patch b/mozilla-abi.patch deleted file mode 100644 index d708440..0000000 --- a/mozilla-abi.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -1322,24 +1322,36 @@ fi - - # Only set CPU_ARCH if we recognize the value of OS_TEST - - case "$OS_TEST" in - *86 | i86pc) - CPU_ARCH=x86 - ;; - -+powerpc64 | ppc64) -+ CPU_ARCH=ppc64 -+ ;; -+ - powerpc* | ppc | rs6000) - CPU_ARCH=ppc - ;; - - Alpha | alpha | ALPHA) - CPU_ARCH=Alpha - ;; - -+s390) -+ CPU_ARCH=s390 -+ ;; -+ -+s390x) -+ CPU_ARCH=s390x -+ ;; -+ - hppa* | parisc) - CPU_ARCH=hppa - ;; - - sun4u | sparc*) - CPU_ARCH=sparc - ;; - From 2eca26e2258394fa41ad96122e1cd8b0659a600f9c97d6e9cb30d7acb67bdb37 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Oct 2009 00:17:29 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/MozillaFirefox revision 68.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=642df78146bc951e87eddc45bdb1f446 --- MozillaFirefox.changes | 8 +++ MozillaFirefox.spec | 6 +- firefox-browser-css.patch | 148 ++++++++++++++++++++++++++++++++++++++ mozilla-abi.patch | 40 +++++++++++ 4 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 firefox-browser-css.patch create mode 100644 mozilla-abi.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 4dd74ce..c715f87 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 2 20:26:49 CEST 2009 - wr@rosenauer.org + +- improve UI colors to be usable with dark themes at all + (firefox-browser-css.patch) (bnc#503351) +- extend list of supported architectures as ABI identifier + (mozilla-abi.patch) (bnc#543460) + ------------------------------------------------------------------- Mon Sep 14 00:07:55 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index bfae635..ac31563 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -29,7 +29,7 @@ License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later Provides: web_browser Provides: firefox Version: 3.5.3 -Release: 1 +Release: 2 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -53,6 +53,8 @@ Patch5: firefox-bug506901.patch Patch6: firefox-cross-desktop.patch Patch7: firefox-kde.patch Patch8: firefox-no-gnomevfs.patch +Patch9: firefox-browser-css.patch +Patch10: mozilla-abi.patch Patch14: credits.patch Patch17: firefox-appname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -152,6 +154,8 @@ cd $RPM_BUILD_DIR/mozilla %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %patch14 %patch17 # install kde.js diff --git a/firefox-browser-css.patch b/firefox-browser-css.patch new file mode 100644 index 0000000..44a0ff0 --- /dev/null +++ b/firefox-browser-css.patch @@ -0,0 +1,148 @@ +From: Jakub Steiner +Subject: make style compatible with dark themes +References: +https://bugzilla.novell.com/show_bug.cgi?id=503351 + + +diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css +--- a/browser/base/content/browser.css ++++ b/browser/base/content/browser.css +@@ -4,42 +4,87 @@ + searchbar { + -moz-binding: url("chrome://browser/content/search/search.xml#searchbar"); + } + + tabbrowser { + -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser"); + } + ++ /* Remove focus lines from tabs */ ++ ++ .tabbrowser-tab > .tab-text { ++ border: 1px dotted transparent !important; ++ } ++ ++ + toolbar[printpreview="true"] { + -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar"); + } + + toolbarpaletteitem[place="palette"] > toolbaritem > hbox[type="places"] { + display: none; + } + + /* ::::: location bar ::::: */ + #urlbar { + -moz-binding: url(chrome://browser/content/urlbarBindings.xml#urlbar); ++ -moz-appearance: textfield !important; + } + ++ #urlbar .autocomplete-textbox-container { ++ background-color: -moz-Field !important; ++ -moz-appearance: none !important; ++ } ++ ++ #urlbar > .autocomplete-history-dropmarker { ++ -moz-appearance: toolbarbutton-dropdown !important; ++ margin: 0px 3px 0px 5px !important; ++ } ++ + #wrapper-urlbar-container #urlbar { + -moz-user-input: disabled; + cursor: -moz-grab; + } + + #PopupAutoComplete { + -moz-binding: url("chrome://browser/content/urlbarBindings.xml#browser-autocomplete-result-popup"); + } + + #PopupAutoCompleteRichResult { + -moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup"); + } + ++ #PopupAutoCompleteRichResult .autocomplete-richlistitem ++ { ++ background: -moz-Field !important; ++ } ++ ++ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] ++ { ++ background: Highlight !important; ++ } ++ ++ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"], ++ #PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] * ++ { ++ color: HighlightText !important; ++ } ++ ++ .ac-title ++ { ++ color: -moz-Fieldtext !important; ++ } ++ ++ #PopupAutoComplete .autocomplete-treebody { ++ background-color: -moz-Field !important; ++ color: -moz-Fieldtext !important; ++ } ++ ++ + #page-report-button:not([blocked]) { + display: none; + } + + #urlbar-throbber:not([busy="true"]), + #urlbar-throbber[busy="true"] + #page-proxy-favicon { + display: none; + } +@@ -59,16 +104,31 @@ toolbarpaletteitem[place="palette"] > to + visibility: collapse; + } + + #identity-box > hbox { + max-width: 22em; + min-width: 1px; + } + ++/* Identity/Bookmark pop-up improvements */ ++ ++ #identity-popup-container { ++ -moz-appearance: dialog !important; ++ } ++ ++ #editBookmarkPanel { ++ -moz-appearance: dialog !important; ++ } ++ ++ #editBMPanel_foldersExpander, #editBMPanel_tagsSelectorExpander { ++ -moz-appearance: menulist-button !important; ++ } ++ ++ + /* ::::: Unified Back-/Forward Button ::::: */ + #back-forward-dropmarker > image , + #back-forward-dropmarker > label { + display: none; + } + .unified-nav-current { + font-weight: bold; + } +@@ -154,8 +214,18 @@ window[chromehidden~="toolbar"] toolbar: + display: inline-block; + } + %endif + + /* Bug 483950 - Hide domain name in status bar pending removal */ + #security-button > label { + display: none; + } ++ ++ ++/* Support for Fission add-on */ ++ ++#urlbar[fission="fusion"] > #statusbar-icon > .progress-bar { ++ background-color: Highlight !important; ++ -moz-appearance: progresschunk !important; ++ opacity: 0.4 !important; ++ margin: 1px !important; ++} diff --git a/mozilla-abi.patch b/mozilla-abi.patch new file mode 100644 index 0000000..d708440 --- /dev/null +++ b/mozilla-abi.patch @@ -0,0 +1,40 @@ +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -1322,24 +1322,36 @@ fi + + # Only set CPU_ARCH if we recognize the value of OS_TEST + + case "$OS_TEST" in + *86 | i86pc) + CPU_ARCH=x86 + ;; + ++powerpc64 | ppc64) ++ CPU_ARCH=ppc64 ++ ;; ++ + powerpc* | ppc | rs6000) + CPU_ARCH=ppc + ;; + + Alpha | alpha | ALPHA) + CPU_ARCH=Alpha + ;; + ++s390) ++ CPU_ARCH=s390 ++ ;; ++ ++s390x) ++ CPU_ARCH=s390x ++ ;; ++ + hppa* | parisc) + CPU_ARCH=hppa + ;; + + sun4u | sparc*) + CPU_ARCH=sparc + ;; +