From 31e1944594c81813920cd6ac1f6674b3ac527187168567b83b200ad979c53fb4 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 29 Jul 2016 08:19:31 +0000 Subject: [PATCH 1/7] Accepting request 415720 from home:badshah400:branches:mozilla:Factory - Update description and screenshots in appdata.xml file. OBS-URL: https://build.opensuse.org/request/show/415720 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=534 --- MozillaFirefox.changes | 5 +++++ firefox-appdata.xml | 46 +++++++++++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index a428a9d5..9b04bc2b 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 29 01:26:13 UTC 2016 - badshah400@gmail.com + +- Update description and screenshots in appdata.xml file. + ------------------------------------------------------------------- Sat Jul 23 20:13:08 UTC 2016 - antoine.belvire@laposte.net diff --git a/firefox-appdata.xml b/firefox-appdata.xml index 88e0cfa4..5ed66763 100644 --- a/firefox-appdata.xml +++ b/firefox-appdata.xml @@ -4,19 +4,45 @@ Upstream does not want to ship it https://bugzilla.mozilla.org/show_bug.cgi?id=1 so maintain a stub in here. --> - + firefox.desktop CC0-1.0 + Firefox Web Browser + MPL-2.0 + Mozilla Firefox Web Browser + http://www.mozilla.org/ -

- Mozilla Firefox is a standalone web browser, designed for standards - compliance and performance. Its functionality can be enhanced via a - plethora of addons. -

+

Mozilla Firefox is a standalone web browser, designed for privacy, security, standards +compliance and performance. Its functionality can be enhanced via a plethora of extensions.

+

Firefox makes your daily web browsing fun and easy with a number of features, including:

+
    +
  • Tabbed browsing
    • +
  • Private browsing including do-not-track enabled by default
    • +
  • Advanced phishing and malware protection
    • +
  • Spell checking
    • +
  • Incremental find within pages
    • +
  • Live bookmarking and Smart Bookmarks
    • +
  • Download manager
    • +
  • Location-aware browsing
    • +
  • Compliant with modern web standards
    • +
  • Modern web development tools
    • +
  • Available in a wide number of locales
    • +
  • A thriving ecosystem of themes and extensions at https://addons.mozilla.org
    • +
- https://www.mozilla.org/firefox/ - https://addons.cdn.mozilla.net/user-media/previews/full/159/159648.png + + https://support.cdn.mozilla.net/media/uploads/gallery/images/2015-05-20-16-04-21-88bff4.png + New tab page with speed dials + + + https://support.cdn.mozilla.net/media/uploads/gallery/images/2015-12-22-15-15-05-3c0a80.png + Search suggestions from home page + + + https://addons.cdn.mozilla.net/user-media/previews/full/159/159648.png + Firefox with Adwaita theme + - - + mdn@lists.mozilla.org + From cde22f592f3fc189ccadfcdda757d64f5b76402a5808e6804440f2d8baa97cb5 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 2 Aug 2016 22:00:28 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=535 --- MozillaFirefox.spec | 17 ++--- compare-locales.tar.xz | 4 +- create-tar.sh | 10 +-- firefox-47.0.1-source.tar.xz | 3 - firefox-48.0-source.tar.xz | 3 + firefox-branded-icons.patch | 42 ++++-------- firefox-kde.patch | 68 +++++++++++-------- firefox-no-default-ualocale.patch | 4 +- l10n-47.0.1.tar.xz | 3 - l10n-48.0.tar.xz | 3 + l10n_changesets.txt | 104 +++++++++++++++--------------- mozilla-gcc6.patch | 76 ---------------------- mozilla-kde.patch | 20 +++--- mozilla-shared-nss-db.patch | 38 +++++------ source-stamp.txt | 2 +- 15 files changed, 156 insertions(+), 241 deletions(-) delete mode 100644 firefox-47.0.1-source.tar.xz create mode 100644 firefox-48.0-source.tar.xz delete mode 100644 l10n-47.0.1.tar.xz create mode 100644 l10n-48.0.tar.xz delete mode 100644 mozilla-gcc6.patch diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index dc7d60da..1f900dc9 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -18,10 +18,10 @@ # changed with every update -%define major 47 -%define mainver %major.0.1 +%define major 48 +%define mainver %major.0 %define update_channel release -%define releasedate 20160628000000 +%define releasedate 20160730000000 # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -75,7 +75,7 @@ BuildRequires: libnotify-devel BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.12 -BuildRequires: mozilla-nss-devel >= 3.23 +BuildRequires: mozilla-nss-devel >= 3.24 BuildRequires: nss-shared-helper-devel BuildRequires: python-devel BuildRequires: startup-notification-devel @@ -146,7 +146,6 @@ Patch10: mozilla-no-stdcxx-check.patch Patch11: mozilla-reduce-files-per-UnifiedBindings.patch Patch12: mozilla-gtk3_20.patch Patch13: mozilla-check_return.patch -Patch14: mozilla-gcc6.patch Patch15: mozilla-exclude-nametablecpp.patch Patch16: mozilla-aarch64-48bit-va.patch Patch17: mozilla-binutils-visibility.patch @@ -262,7 +261,6 @@ cd $RPM_BUILD_DIR/mozilla %patch12 -p1 %endif %patch13 -p1 -%patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 @@ -322,10 +320,6 @@ mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj . \$topsrcdir/browser/config/mozconfig ac_add_options --prefix=%{_prefix} -ac_add_options --libdir=%{_libdir} -ac_add_options --sysconfdir=%{_sysconfdir} -ac_add_options --mandir=%{_mandir} -ac_add_options --includedir=%{_includedir} ac_add_options --enable-release %if 0%{?firefox_use_gtk3} ac_add_options --enable-default-toolkit=cairo-gtk3 @@ -580,7 +574,6 @@ exit 0 %dir %{progdir}/gtk2 %{progdir}/gtk2/libmozgtk.so %endif -%{progdir}/webapprt/ %{progdir}/gmp-clearkey/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox @@ -588,10 +581,10 @@ exit 0 %{progdir}/application.ini %{progdir}/dependentlibs.list %{progdir}/*.so +%{progdir}/icudt56l.dat %{progdir}/omni.ja %{progdir}/platform.ini %{progdir}/plugin-container -%{progdir}/webapprt-stub %if %crashreporter %{progdir}/crashreporter %{progdir}/crashreporter.ini diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index a0283b3a..7aa5ff07 100644 --- a/compare-locales.tar.xz +++ b/compare-locales.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a712b91a411dc057c3a215042d4cb19efe5d19c31fe28aaa67e6d396440189e1 -size 28488 +oid sha256:7596baae9d7331ff90e5fbd1b23b76cc086c7006eeef1a813e0c8feafda9a4ae +size 28416 diff --git a/create-tar.sh b/create-tar.sh index 5acd85eb..6bb105e6 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,14 +1,14 @@ #!/bin/bash # TODO -# http://ftp.mozilla.org/pub/firefox/candidates/46.0-candidates/build5/linux-x86_64/en-US/firefox-46.0.json -# "moz_source_stamp": "078baf501b55eaa47f3b189fda4dd28dae1fa257" -# http://ftp.mozilla.org/pub/firefox/candidates/46.0-candidates/build5/l10n_changesets.txt +# http://ftp.mozilla.org/pub/firefox/candidates/48.0-candidates/build2/linux-x86_64/en-US/firefox-48.0.json +# "moz_source_stamp": "c1de04f39fa956cfce83f6065b0e709369215ed5" +# http://ftp.mozilla.org/pub/firefox/candidates/48.0-candidates/build2/l10n_changesets.txt CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_47_0_1_RELEASE" -VERSION="47.0.1" +RELEASE_TAG="c1de04f39fa956cfce83f6065b0e709369215ed5" +VERSION="48.0" # mozilla if [ -d mozilla ]; then diff --git a/firefox-47.0.1-source.tar.xz b/firefox-47.0.1-source.tar.xz deleted file mode 100644 index 36bf4b33..00000000 --- a/firefox-47.0.1-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07043674a25291bb61c3bce6c7ba9c44f693a3aa6440172839221e98bee8a1ca -size 198040700 diff --git a/firefox-48.0-source.tar.xz b/firefox-48.0-source.tar.xz new file mode 100644 index 00000000..4292f24e --- /dev/null +++ b/firefox-48.0-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff2ec88ad32a18a8cf7c847eaf0d9478404b2f3afbbed3e276d0af1e7524178b +size 198212460 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index 8e00b27a..d4685322 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,42 +1,17 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent a5764b0a088418fdbf4b774a8ff2745cc99f6706 +# Parent 2bffb52e07b587a6c755d67c6fc971fed6509783 -diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in ---- a/browser/app/Makefile.in -+++ b/browser/app/Makefile.in -@@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d - endif - - ifdef MOZ_WIDGET_GTK - libs:: - $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default -+ifdef MOZ_OFFICIAL_BRANDING -+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default -+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default -+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default -+endif - endif - - # channel-prefs.js is handled separate from other prefs due to bug 756325 - libs:: $(srcdir)/profile/channel-prefs.js - $(NSINSTALL) -D $(DIST)/bin/defaults/pref - $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) - - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild --- a/browser/branding/branding-common.mozbuild +++ b/browser/branding/branding-common.mozbuild -@@ -34,12 +34,15 @@ def FirefoxBranding(): +@@ -34,18 +34,24 @@ def FirefoxBranding(): 'disk.icns', 'document.icns', 'dsstore', 'firefox.icns', ] - elif CONFIG['MOZ_WIDGET_GTK']: + elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: BRANDING_FILES += [ 'default16.png', + 'default22.png', @@ -46,10 +21,19 @@ diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/brandi 'default48.png', 'mozicon128.png', ] + FINAL_TARGET_FILES.icons += ['mozicon128.png'] + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default16.png', ++ 'default22.png', ++ 'default24.png', ++ 'default256.png', + 'default32.png', + 'default48.png', + ] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -664,18 +664,21 @@ +@@ -650,18 +650,21 @@ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/chrome/toolkit@JAREXT@ diff --git a/firefox-kde.patch b/firefox-kde.patch index 7fc90e73..94c2eb49 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 4311c6bdf61ac317bc60b25cd89ff67662a75049 +# Parent 07e419c2bbc63c486d25fd8ce117abd10e9ebdba diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1160 @@ +@@ -0,0 +1,1174 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -148,7 +148,12 @@ new file mode 100644 +