Date: Tuesday, January 23, 2018 @ 18:45:14 Author: heftig Revision: 315317
58.0-1 Added: firefox/trunk/no-crmf.diff Modified: firefox/trunk/PKGBUILD Deleted: firefox/trunk/no-plt.diff --------------+ PKGBUILD | 38 +++++++++++--------------------------- no-crmf.diff | 15 +++++++++++++++ no-plt.diff | 48 ------------------------------------------------ 3 files changed, 26 insertions(+), 75 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-23 17:22:34 UTC (rev 315316) +++ PKGBUILD 2018-01-23 18:45:14 UTC (rev 315317) @@ -4,7 +4,7 @@ # Contributor: Jakub Schmidtke <[email protected]> pkgname=firefox -pkgver=57.0.4 +pkgver=58.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) @@ -11,7 +11,7 @@ license=(MPL GPL LGPL) url="https://www.mozilla.org/firefox/"; depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg - nss hunspell sqlite ttf-font libpulse) + nss hunspell sqlite ttf-font libpulse libvpx icu) makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb autoconf2.13 rust mercurial clang llvm jack) optdepends=('networkmanager: Location detection via available WiFi networks' @@ -22,19 +22,12 @@ _repo=https://hg.mozilla.org/mozilla-unified source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" $pkgname.desktop firefox-symbolic.svg - 0001-Bug-1360278-Add-preference-to-trigger-context-menu-o.patch - 0002-Bug-1419426-Implement-browserSettings.contextMenuSho.patch - wifi-disentangle.patch wifi-fix-interface.patch - firefox-install-dir.patch no-plt.diff) + firefox-install-dir.patch no-crmf.diff) sha256sums=('SKIP' '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a' 'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9' - 'd45c97782a77e7c5ebacfa7b983019f6bb831794d3c707abbe3bb01cddb80f72' - '52c56c33f7ab98232d9c0644965f149da9b7266f607c84b80aca8a5534cee3bb' - 'f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed' - 'e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1' 'a94f80abe65608cd49054a30acc31e4d0885fe5b2a38cf08ded5e5b51b87c99d' - 'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa') + 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -55,19 +48,9 @@ cd mozilla-unified patch -Np1 -i ../firefox-install-dir.patch - # https://bugzilla.mozilla.org/show_bug.cgi?id=1360278 - patch -Np1 -i ../0001-Bug-1360278-Add-preference-to-trigger-context-menu-o.patch + # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 + patch -Np1 -i ../no-crmf.diff - # https://bugzilla.mozilla.org/show_bug.cgi?id=1419426 - patch -Np1 -i ../0002-Bug-1419426-Implement-browserSettings.contextMenuSho.patch - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968 - patch -Np1 -i ../wifi-disentangle.patch - patch -Np1 -i ../wifi-fix-interface.patch - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942 - patch -Np1 -i ../no-plt.diff - echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key @@ -97,6 +80,11 @@ # System libraries ac_add_options --with-system-zlib ac_add_options --with-system-bz2 +ac_add_options --with-system-icu +ac_add_options --with-system-jpeg +ac_add_options --with-system-libvpx +ac_add_options --with-system-nspr +ac_add_options --with-system-nss ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi @@ -193,8 +181,4 @@ # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -srf "$pkgdir/usr/bin/$pkgname" \ "$pkgdir/usr/lib/$pkgname/firefox-bin" - - # Use system certificates - ln -srf "$pkgdir/usr/lib/libnssckbi.so" \ - "$pkgdir/usr/lib/$pkgname/libnssckbi.so" } Added: no-crmf.diff =================================================================== --- no-crmf.diff (rev 0) +++ no-crmf.diff 2018-01-23 18:45:14 UTC (rev 315317) @@ -0,0 +1,15 @@ +diff --git i/old-configure.in w/old-configure.in +index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 +--- i/old-configure.in ++++ w/old-configure.in +@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + +-if test -n "$MOZ_SYSTEM_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" +-else ++if test -z "$MOZ_SYSTEM_NSS"; then + NSS_CFLAGS="-I${DIST}/include/nss" + case "${OS_ARCH}" in + # Only few platforms have been tested with GYP Deleted: no-plt.diff =================================================================== --- no-plt.diff 2018-01-23 17:22:34 UTC (rev 315316) +++ no-plt.diff 2018-01-23 18:45:14 UTC (rev 315317) @@ -1,48 +0,0 @@ -diff --git i/security/nss/lib/freebl/mpi/mpi_x86.s w/security/nss/lib/freebl/mpi/mpi_x86.s -index 8f7e2130c3264754..b3ca1ce5b41b3771 100644 ---- i/security/nss/lib/freebl/mpi/mpi_x86.s -+++ w/security/nss/lib/freebl/mpi/mpi_x86.s -@@ -22,22 +22,41 @@ is_sse: .long -1 - # - .ifndef NO_PIC - .macro GET var,reg -- movl \var@GOTOFF(%ebx),\reg -+ call thunk.ax -+ addl $_GLOBAL_OFFSET_TABLE_, %eax -+ movl \var@GOTOFF(%eax),\reg - .endm - .macro PUT reg,var -- movl \reg,\var@GOTOFF(%ebx) -+ call thunk.dx -+ addl $_GLOBAL_OFFSET_TABLE_, %edx -+ movl \reg,\var@GOTOFF(%edx) - .endm - .else - .macro GET var,reg - movl \var,\reg - .endm - .macro PUT reg,var - movl \reg,\var - .endm - .endif - - .text - -+.ifndef NO_PIC -+.globl thunk.ax -+.hidden thunk.ax -+.type thunk.ax, @function -+thunk.ax: -+ movl (%esp),%eax -+ ret -+ -+.globl thunk.dx -+.hidden thunk.dx -+.type thunk.dx, @function -+thunk.dx: -+ movl (%esp),%edx -+ ret -+.endif - - # ebp - 36: caller's esi - # ebp - 32: caller's edi
