From a9334f1686c1ed45276e1c5104d8307202f23e29 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 11 May 2014 10:31:35 +0200 Subject: [PATCH] - updated to 29.0.1 --- mozilla-firefox-941837.patch | 20 --------- mozilla-firefox-branding.patch | 12 +++--- mozilla-firefox-gyp-slashism.patch | 57 ------------------------- mozilla-firefox-packaging.patch | 56 +++++++++++++++--------- mozilla-firefox-system-virtualenv.patch | 4 +- mozilla-firefox.spec | 50 ++++++++++++---------- 6 files changed, 72 insertions(+), 127 deletions(-) delete mode 100644 mozilla-firefox-941837.patch delete mode 100644 mozilla-firefox-gyp-slashism.patch diff --git a/mozilla-firefox-941837.patch b/mozilla-firefox-941837.patch deleted file mode 100644 index 8e85cf6..0000000 --- a/mozilla-firefox-941837.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/js/src/gc/Memory.cpp.orig 2013-11-13 01:13:53.000000000 +0100 -+++ a/js/src/gc/Memory.cpp 2013-11-28 05:03:31.160133711 +0100 -@@ -63,7 +63,7 @@ - p = VirtualAlloc(NULL, size * 2, MEM_RESERVE, PAGE_READWRITE); - if (!p) - return NULL; -- void *chunkStart = (void *)(uintptr_t(p) + (alignment - (uintptr_t(p) % alignment))); -+ void *chunkStart = (void *)AlignBytes(uintptr_t(p), alignment); - UnmapPages(rt, p, size * 2); - p = VirtualAlloc(chunkStart, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); - -@@ -335,7 +335,7 @@ - uintptr_t offset = uintptr_t(region) % alignment; - JS_ASSERT(offset < reqSize - size); - -- void *front = (void *)(uintptr_t(region) + (alignment - offset)); -+ void *front = (void *)AlignBytes(uintptr_t(region), alignment); - void *end = (void *)(uintptr_t(front) + size); - if (front != region) - JS_ALWAYS_TRUE(0 == munmap(region, alignment - offset)); diff --git a/mozilla-firefox-branding.patch b/mozilla-firefox-branding.patch index 79d13b1..0dc75c1 100644 --- a/mozilla-firefox-branding.patch +++ b/mozilla-firefox-branding.patch @@ -1,6 +1,6 @@ ---- mozilla/build/application.ini.orig 2012-03-13 02:36:39.000000000 +0100 -+++ mozilla/build/application.ini 2012-03-24 19:29:15.284836726 +0100 -@@ -43,8 +43,8 @@ +--- mozilla/build/application.ini.orig 2014-05-11 09:48:07.440049337 +0200 ++++ mozilla/build/application.ini 2014-05-11 09:48:51.203381758 +0200 +@@ -16,8 +16,8 @@ #endif #filter substitution [App] @@ -8,9 +8,9 @@ -Name=@MOZ_APP_BASENAME@ +Vendor= +Name=Firefox Community Edition - Version=@MOZ_APP_VERSION@ - #ifdef MOZ_APP_PROFILE - Profile=@MOZ_APP_PROFILE@ + #ifdef MOZ_APP_DISPLAYNAME + CodeName=@MOZ_APP_DISPLAYNAME@ + #endif --- mozilla.orig/browser/locales/generic/profile/bookmarks.html.in 2009-06-24 10:20:29.000000000 +0200 +++ mozilla/browser/locales/generic/profile/bookmarks.html.in 2009-06-28 15:29:30.000000000 +0200 @@ -24,4 +24,12 @@ diff --git a/mozilla-firefox-gyp-slashism.patch b/mozilla-firefox-gyp-slashism.patch deleted file mode 100644 index 5100011..0000000 --- a/mozilla-firefox-gyp-slashism.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig 2013-01-05 00:44:41.000000000 +0100 -+++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-13 20:13:40.033894757 +0100 -@@ -114,6 +114,12 @@ - if dir and not os.path.exists(dir): - os.makedirs(dir) - -+def append_relative(base, rel): -+ if rel == '': -+ return base -+ else: -+ return base + '/' + rel -+ - def GetFlavor(params): - """Returns |params.flavor| if it's set, the system's default flavor else.""" - flavors = { -@@ -142,9 +148,9 @@ - - def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None): - if not os.path.isabs(topsrcdir): -- topsrcdir = depth + "/" + topsrcdir -+ topsrcdir = append_relative(depth, topsrcdir) - if not os.path.isabs(srcdir): -- srcdir = depth + "/" + srcdir -+ srcdir = append_relative(depth, srcdir) - #TODO: should compare with the existing file and not overwrite it if the - # contents are the same! - ensure_directory_exists(filename) -@@ -261,7 +267,7 @@ - qualified_target) - build_file = os.path.abspath(build_file) - rel_path, output_file = self.CalculateMakefilePath(build_file, target) -- subdepth = self.depth + "/" + getdepth(rel_path) -+ subdepth = append_relative(self.depth, getdepth(rel_path)) - if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth): - # If WriteTargetMakefile returns True, then this is a useful target - dirs.append(rel_path) -@@ -399,7 +405,7 @@ - # The relative path from objdir to gyp_file_dir - srcdir = gyp.common.RelativePath(gyp_file_dir, objdir) - # The absolute path to the source dir -- abs_srcdir = topsrcdir + "/" + relative_srcdir -+ abs_srcdir = append_relative(topsrcdir, relative_srcdir) - # The path to get up to the root of the objdir from the output dir. - depth = getdepth(relative_srcdir) - # The output directory. -@@ -408,9 +414,9 @@ - makefile_path = os.path.join(output_dir, "Makefile") - - def topsrcdir_path(path): -- return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir)) -+ return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir))) - def objdir_path(path): -- return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir)) -+ return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir))) - - # Find the list of targets that derive from the gyp file(s) being built. - needed_targets = set() diff --git a/mozilla-firefox-packaging.patch b/mozilla-firefox-packaging.patch index 6426cf6..8011c30 100644 --- a/mozilla-firefox-packaging.patch +++ b/mozilla-firefox-packaging.patch @@ -20,14 +20,14 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea @BINPATH@/browser/@PREF_DIR@/firefox-l10n.js @BINPATH@/browser/searchplugins/* #ifdef XP_WIN32 -@@ -51,17 +55,23 @@ +@@ -51,20 +55,26 @@ #endif [xpcom] +#ifndef LIBXUL_SDK @BINPATH@/dependentlibs.list +#endif - #ifdef XP_WIN32 + #ifdef GKMEDIAS_SHARED_LIBRARY @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ #endif +#ifndef LIBXUL_SDK @@ -41,6 +41,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif +#endif + #ifdef MOZ_DMD + @BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@ + #endif #ifndef MOZ_NATIVE_NSPR #ifndef MOZ_FOLD_LIBS @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @@ -113,9 +116,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea @BINPATH@/components/dom_base.xpt @BINPATH@/components/dom_system.xpt +#endif - #ifdef MOZ_B2G_RIL - @BINPATH@/components/dom_telephony.xpt - @BINPATH@/components/dom_voicemail.xpt + #ifdef MOZ_B2G_BT + @BINPATH@/components/dom_bluetooth.xpt + #endif @@ -212,6 +212,7 @@ #ifdef MOZ_B2G_BT @BINPATH@/components/dom_bluetooth.xpt @@ -191,9 +194,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea @BINPATH@/browser/components/FeedConverter.js @BINPATH@/browser/components/FeedWriter.js @@ -354,6 +394,7 @@ - @BINPATH@/browser/components/DownloadsStartup.js - @BINPATH@/browser/components/DownloadsUI.js @BINPATH@/browser/components/BrowserPlaces.manifest + @BINPATH@/browser/components/devtools-clhandler.manifest + @BINPATH@/browser/components/devtools-clhandler.js +#ifndef LIBXUL_SDK @BINPATH@/components/Downloads.manifest @BINPATH@/components/DownloadLegacy.js @@ -253,9 +256,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea @BINPATH@/components/contentAreaDropListener.manifest @BINPATH@/components/contentAreaDropListener.js +#endif - #ifdef MOZ_B2G_RIL - @BINPATH@/components/RadioInterfaceLayer.manifest - @BINPATH@/components/RadioInterfaceLayer.js + @BINPATH@/browser/components/BrowserProfileMigrators.manifest + @BINPATH@/browser/components/ProfileMigrator.js + @BINPATH@/browser/components/ChromeProfileMigrator.js @@ -462,17 +514,24 @@ @BINPATH@/browser/components/SafariProfileMigrator.js #endif @@ -294,24 +297,25 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea @BINPATH@/components/servicesComponents.manifest @BINPATH@/components/cryptoComponents.manifest @BINPATH@/components/TelemetryPing.js -@@ -532,28 +593,37 @@ - @BINPATH@/components/PeerConnection.js - @BINPATH@/components/PeerConnection.manifest - #endif +@@ -581,7 +581,9 @@ + + @BINPATH@/components/HttpDataUsage.manifest + @BINPATH@/components/HttpDataUsage.js +#endif +#ifndef LIBXUL_SDK @BINPATH@/chrome/marionette@JAREXT@ @BINPATH@/chrome/marionette.manifest @BINPATH@/components/MarionetteComponents.manifest - @BINPATH@/components/marionettecomponent.js +@@ -594,6 +596,7 @@ + ; InputMethod API + @BINPATH@/components/MozKeyboard.js + @BINPATH@/components/InputMethod.manifest +#endif - #ifdef MOZ_WEBSPEECH -+#ifndef LIBXUL_SDK - @BINPATH@/components/dom_webspeechsynth.xpt - #endif -+#endif + ; Modules + @BINPATH@/browser/modules/* +@@ -597,16 +600,20 @@ ; Modules @BINPATH@/browser/modules/* @@ -403,3 +407,15 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea ; for Solaris SPARC #ifdef SOLARIS +@@ -907,9 +907,11 @@ + @BINPATH@/metro/modules + #endif + ++#ifndef LIBXUL_SDK + @BINPATH@/components/DataStore.manifest + @BINPATH@/components/DataStoreService.js + @BINPATH@/components/dom_datastore.xpt ++#endif + + + #ifdef MOZ_ASAN diff --git a/mozilla-firefox-system-virtualenv.patch b/mozilla-firefox-system-virtualenv.patch index a2d150f..3650d56 100644 --- a/mozilla-firefox-system-virtualenv.patch +++ b/mozilla-firefox-system-virtualenv.patch @@ -1,5 +1,5 @@ ---- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200 -+++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py 2013-05-14 22:51:32.136719267 +0200 +--- xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200 ++++ xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py 2013-05-14 22:51:32.136719267 +0200 @@ -37,8 +37,7 @@ @property def virtualenv_script_path(self): diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 3d30abf..88739c2 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -7,6 +7,7 @@ # # Conditional build: %bcond_with tests # enable tests (whatever they check) +%bcond_with gtk3 # GTK+ 3.x instead of 2.x %bcond_without kerberos # disable krb5 support %bcond_without xulrunner # system xulrunner @@ -15,30 +16,28 @@ %define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR) %endif -%define nspr_ver 4.9.6 -%define nss_ver 3.15 +%define nspr_ver 4.10.3 +%define nss_ver 3.16 Summary: Firefox Community Edition web browser Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox -Version: 25.0.1 +Version: 29.0.1 Release: 1 -License: MPL 1.1 or GPL v2+ or LGPL v2.1+ +License: MPL v2.0 Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 -# Source0-md5: b5b57d3ea937a339e0ed7ebea604b430 +# Source0-md5: ca37addc3a69ef30247e00375dd93cd0 Source3: %{name}.desktop Source4: %{name}.sh Source5: vendor.js Source6: vendor-ac.js Patch0: %{name}-branding.patch -Patch1: %{name}-941837.patch Patch7: %{name}-prefs.patch Patch9: %{name}-no-subshell.patch Patch11: %{name}-middle_click_paste.patch Patch12: %{name}-packaging.patch Patch13: %{name}-system-virtualenv.patch -Patch14: %{name}-gyp-slashism.patch Patch15: %{name}-Disable-Firefox-Health-Report.patch URL: http://www.mozilla.org/projects/firefox/ BuildRequires: GConf2-devel >= 1.2.1 @@ -50,7 +49,8 @@ BuildRequires: cairo-devel >= 1.10.2-5 BuildRequires: dbus-glib-devel >= 0.60 BuildRequires: gcc-c++ >= 6:4.4 BuildRequires: glib2-devel >= 1:2.20 -BuildRequires: gtk+2-devel >= 2:2.14 +%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.14} +%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0.0} %{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1} BuildRequires: hunspell-devel BuildRequires: libIDL-devel >= 0.8.0 @@ -58,18 +58,19 @@ BuildRequires: libdnet-devel BuildRequires: libevent-devel >= 1.4.7 # standalone libffi 3.0.9 or gcc's from 4.5(?)+ BuildRequires: libffi-devel >= 6:3.0.9 -BuildRequires: libiw-devel +BuildRequires: libicu-devel >= 50.1 # requires libjpeg-turbo implementing at least libjpeg 6b API BuildRequires: libjpeg-devel >= 6b BuildRequires: libjpeg-turbo-devel BuildRequires: libnotify-devel >= 0.4 BuildRequires: libpng(APNG)-devel >= 0.10 -BuildRequires: libpng-devel >= 1.5.13 +BuildRequires: libpng-devel >= 2:1.6.7 BuildRequires: libstdc++-devel >= 6:4.4 -BuildRequires: libvpx-devel >= 1.0.0 +BuildRequires: libvpx-devel >= 1.3.0 BuildRequires: nspr-devel >= 1:%{nspr_ver} BuildRequires: nss-devel >= 1:%{nss_ver} BuildRequires: pango-devel >= 1:1.14.0 +BuildRequires: pixman-devel >= 0.19.2 BuildRequires: perl-modules >= 5.004 BuildRequires: pkgconfig BuildRequires: pkgconfig(libffi) >= 3.0.9 @@ -77,7 +78,7 @@ BuildRequires: python-modules BuildRequires: python-virtualenv BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.601 -BuildRequires: sqlite3-devel >= 3.7.17 +BuildRequires: sqlite3-devel >= 3.8.2 BuildRequires: startup-notification-devel >= 0.8 BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXext-devel @@ -98,10 +99,12 @@ Requires: browser-plugins >= 2.0 Requires: cairo >= 1.10.2-5 Requires: dbus-glib >= 0.60 Requires: glib2 >= 1:2.20 -Requires: gtk+2 >= 2:2.14 +%{!?with_gtk3:Requires: gtk+2 >= 2:2.14} +%{?with_gtk3:Requires: gtk+3 >= 3.0.0} Requires: libjpeg-turbo -Requires: libpng >= 1.5.13 +Requires: libpng >= 2:1.6.7 Requires: libpng(APNG) >= 0.10 +Requires: libvpx >= 1.3.0 Requires: myspell-common Requires: nspr >= 1:%{nspr_ver} Requires: nss >= 1:%{nss_ver} @@ -140,19 +143,13 @@ mv -f mozilla-release mozilla cd mozilla %patch0 -p1 -%patch1 -p1 %patch7 -p1 %patch9 -p2 %patch11 -p2 %patch12 -p2 %patch13 -p2 -%patch14 -p2 %patch15 -p1 -# config/rules.mk is patched by us and js/src/config/rules.mk -# is supposed to be exact copy -cp -a config/rules.mk js/src/config/rules.mk - %build cd mozilla cp -f %{_datadir}/automake/config.* build/autoconf @@ -200,9 +197,12 @@ ac_add_options --disable-strip-libs ac_add_options --disable-install-strip %if %{with tests} ac_add_options --enable-tests +ac_add_options --enable-mochitest %else ac_add_options --disable-tests +ac_add_options --disable-mochitest %endif +ac_add_options --disable-cpp-exceptions ac_add_options --disable-crashreporter ac_add_options --disable-elf-dynstr-gc ac_add_options --disable-gconf @@ -211,17 +211,21 @@ ac_add_options --disable-gnomevfs ac_add_options --disable-installer ac_add_options --disable-javaxpcom ac_add_options --disable-long-long-warning +ac_add_options --disable-necko-wifi ac_add_options --disable-pedantic ac_add_options --disable-updater ac_add_options --disable-xterm-updates ac_add_options --enable-canvas -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-extensions="default,permissions,gio" +ac_add_options --enable-chrome-format=omni +ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2} +ac_add_options --enable-extensions="default,gio" ac_add_options --enable-gio +ac_add_options --enable-libnotify ac_add_options --enable-libxul ac_add_options --enable-mathml ac_add_options --enable-pango ac_add_options --enable-readline +ac_add_options --enable-safe-browsing ac_add_options --enable-shared-js ac_add_options --enable-startup-notification ac_add_options --enable-svg @@ -230,6 +234,7 @@ ac_add_options --enable-system-ffi ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-url-classifier +ac_add_options --enable-xinerama ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name} ac_add_options --with-distribution-id=org.pld-linux %if %{with xulrunner} @@ -245,6 +250,7 @@ ac_add_options --with-system-nss ac_add_options --with-system-ply ac_add_options --with-system-png ac_add_options --with-system-zlib +ac_add_options --with-system-icu ac_add_options --with-x EOF -- 2.44.0