From 46f07576a3d5da978802d446c19d47751af3bd96e346d864e8bd575523cc2ea8 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sun, 20 Jul 2014 18:10:31 +0000 Subject: [PATCH 1/3] Accepting request 241651 from home:mayerjosua:mozilla use libEGL as glprovider on ARM. I believe it is safe to assume that on ARM, if we got any OpenGL, it will be at least EGL and GLES. I tested this on Cubox-i with vivante gc2000, and the webgl demo cube worked fine. OBS-URL: https://build.opensuse.org/request/show/241651 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=388 --- MozillaFirefox.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 3370a69..582fa8c 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -353,6 +353,10 @@ ac_add_options --disable-neon %ifnarch %ix86 x86_64 ac_add_options --disable-webrtc %endif +# try to use OpenGL-ES on ARM +%ifarch %arm +ac_add_options --with-gl-provider=EGL +%endif EOF make -f client.mk build From 51d960176fc7b37f3f6003bcf600a4464526c392ef28b056603b691afe33760a Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 21 Jul 2014 09:32:46 +0000 Subject: [PATCH 2/3] - update to Firefox 31.0 (bnc#887746) - use EGL on ARM - rebased patches - requires NSS 3.16.2 - requires python-devel (not only python) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=389 --- MozillaFirefox.changes | 9 +++ MozillaFirefox.spec | 8 +- compare-locales.tar.xz | 4 +- create-tar.sh | 4 +- firefox-30.0-source.tar.xz | 3 - firefox-31.0-source.tar.xz | 3 + firefox-branded-icons.patch | 8 +- firefox-kde.patch | 127 +++++++++++++------------------ firefox-multilocale-chrome.patch | 14 ++-- l10n-30.0.tar.xz | 3 - l10n-31.0.tar.xz | 3 + mozilla-kde.patch | 94 ++++++++++++----------- mozilla-shared-nss-db.patch | 22 +++--- source-stamp.txt | 2 +- 14 files changed, 149 insertions(+), 155 deletions(-) delete mode 100644 firefox-30.0-source.tar.xz create mode 100644 firefox-31.0-source.tar.xz delete mode 100644 l10n-30.0.tar.xz create mode 100644 l10n-31.0.tar.xz diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 512e8e9..4125787 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jul 20 18:11:44 UTC 2014 - wr@rosenauer.org + +- update to Firefox 31.0 (bnc#887746) +- use EGL on ARM +- rebased patches +- requires NSS 3.16.2 +- requires python-devel (not only python) + ------------------------------------------------------------------- Mon Jun 9 08:28:17 UTC 2014 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 582fa8c..4788c3a 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -17,7 +17,7 @@ # -%define major 30 +%define major 31 %define mainver %major.0 %define update_channel release @@ -41,7 +41,7 @@ BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel BuildRequires: makeinfo -BuildRequires: python +BuildRequires: python-devel BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files @@ -55,7 +55,7 @@ BuildRequires: libproxy-devel BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.10.6 -BuildRequires: mozilla-nss-devel >= 3.16 +BuildRequires: mozilla-nss-devel >= 3.16.2 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -74,7 +74,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg %endif Version: %{mainver} Release: 0 -%define releasedate 2014060900 +%define releasedate 2014072000 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index a96919f..40acef1 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:acccf9b3b483f646264bbcb09ef709955a16e743dd3deb693a189aa775c50ee7 -size 28508 +oid sha256:0711a6e8cb68050de808a96c9e0b5b5c1d39992749e88239a714df1285b1fc17 +size 28420 diff --git a/create-tar.sh b/create-tar.sh index a89c769..624b53d 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_30_0_RELEASE" -VERSION="30.0" +RELEASE_TAG="FIREFOX_31_0_RELEASE" +VERSION="31.0" # mozilla if [ -d mozilla ]; then diff --git a/firefox-30.0-source.tar.xz b/firefox-30.0-source.tar.xz deleted file mode 100644 index d5efc74..0000000 --- a/firefox-30.0-source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90179c3e6b747141f1f8d787135e2dc5879dae1c7be24cf3a8ae36e66e156258 -size 121266984 diff --git a/firefox-31.0-source.tar.xz b/firefox-31.0-source.tar.xz new file mode 100644 index 0000000..db92cec --- /dev/null +++ b/firefox-31.0-source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e62ec32aa7a1fe90af08062df4f4a4750a430a7f384c4abfd6b22149bdd12af0 +size 125311096 diff --git a/firefox-branded-icons.patch b/firefox-branded-icons.patch index fb68c98..7cbbdbd 100644 --- a/firefox-branded-icons.patch +++ b/firefox-branded-icons.patch @@ -1,5 +1,5 @@ # HG changeset patch -# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0 +# Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -29,13 +29,13 @@ diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in -@@ -36,18 +36,21 @@ BRANDING_FILES := \ +@@ -35,18 +35,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) endif - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + ifdef MOZ_WIDGET_GTK BRANDING_FILES := \ default16.png \ + default22.png \ @@ -54,7 +54,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M 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 -@@ -611,18 +611,21 @@ +@@ -613,18 +613,21 @@ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/chrome/toolkit@JAREXT@ diff --git a/firefox-kde.patch b/firefox-kde.patch index 6621773..7427308 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1219 @@ +@@ -0,0 +1,1197 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -554,7 +554,7 @@ new file mode 100644 + iconsize="small" + aria-label="&tabsToolbar.label;" + context="toolbar-context-menu" -+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton" ++ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button" + collapsed="true"> + +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) @@ -605,13 +605,6 @@ new file mode 100644 + + + -+ -+ +#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT) + +#endif @@ -651,7 +644,7 @@ new file mode 100644 + + + + -+ -+ -+ ++ ++ + + + ++ ++ + +