← Back to branch summary

~jbicha/firefox/update-dependencies

« back to all changes in this revision

Viewing changes to debian/patches/support-coinstallable-trunk-build.patch

  • Committer: Rico Tzschichholz
  • Date: 2017-08-02 19:12:29 UTC
  • Revision ID: ricotz@ubuntu.com-20170802191229-jm3463zljkdxzjyy
* New upstream release from the beta channel (FIREFOX_56_0b1_BUILD1)
* Bump build-dep on rustc >= 1.17.0 and cargo >= 1.18
* Build-dep on clang-3.9, llvm-3.9-dev on 64bit archs for stylo
  - update debian/control{,.in}
* Refresh patches
  - update debian/patches/revert-upstream-search-engine-changes.patch
* Drop upstreamed patches
  - debian/patches/build-ppc64.patch
  - debian/patches/fix-no-jit-backend.patch
* Don't try to check checksums of windows-only binary files which are
  not included in the tarball
  - debian/patches/rust-drop-dll-checksums.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/support-coinstallable-trunk-build.patch
4
4
Author: Chris Coulson <chris.coulson@canonical.com>
5
5
Forwarded: no
6
6
 
7
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/old-configure.in
 
7
Index: firefox-trunk-56.0~a1~hg20170728r371444/old-configure.in
8
8
===================================================================
9
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/old-configure.in
10
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/old-configure.in
11
 
@@ -2448,6 +2448,15 @@ if test -n "$WITH_APP_BASENAME" ; then
 
9
--- firefox-trunk-56.0~a1~hg20170728r371444.orig/old-configure.in
 
10
+++ firefox-trunk-56.0~a1~hg20170728r371444/old-configure.in
 
11
@@ -2195,6 +2195,15 @@
12
12
     MOZ_APP_BASENAME="$WITH_APP_BASENAME"
13
13
 fi
14
14
 
24
24
 # Special cases where we need to AC_DEFINE something. Also a holdover for apps
25
25
 # that haven't made a confvars.sh yet. Don't add new stuff here, use
26
26
 # MOZ_BUILD_APP.
27
 
Index: firefox-trunk-51.0~a1~hg20160830r311818/build/moz.configure/old.configure
 
27
Index: firefox-trunk-56.0~a1~hg20170728r371444/build/moz.configure/old.configure
28
28
===================================================================
29
 
--- firefox-trunk-51.0~a1~hg20160830r311818.orig/build/moz.configure/old.configure
30
 
+++ firefox-trunk-51.0~a1~hg20160830r311818/build/moz.configure/old.configure
31
 
@@ -255,6 +255,7 @@ def old_configure_options(*options):
 
29
--- firefox-trunk-56.0~a1~hg20170728r371444.orig/build/moz.configure/old.configure
 
30
+++ firefox-trunk-56.0~a1~hg20170728r371444/build/moz.configure/old.configure
 
31
@@ -248,6 +248,7 @@
32
32
     '--with-android-sdk',
33
33
     '--with-app-basename',
34
34
     '--with-app-name',
35
35
+    '--with-app-profile',
36
36
     '--with-arch',
37
37
     '--with-branding',
38
 
     '--with-crashreporter-enable-percent',
 
38
     '--with-cross-lib',