Drop pie

4 files changed, 4 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1653d4ff9c99..c0934ef696e7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-wayland-hg
 	pkgdesc = Standalone web browser from mozilla.org
-	pkgver = r433427.e4e2245fc142
+	pkgver = r435650.423bdf7a802b
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -50,13 +50,9 @@ pkgbase = firefox-wayland-hg
 	source = mozilla-unified::hg+https://hg.mozilla.org/mozilla-central/
 	source = firefox.desktop
 	source = firefox-symbolic.svg
-	source = 0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
-	source = firefox-install-dir.patch
 	sha256sums = SKIP
 	sha256sums = 677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a
 	sha256sums = 9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797
-	sha256sums = e8a695bd6a007525390c502739c0f00d5d753a1bde7053c21c712075f2c2994d
-	sha256sums = a94f80abe65608cd49054a30acc31e4d0885fe5b2a38cf08ded5e5b51b87c99d
 
 pkgname = firefox-wayland-hg
 
diff --git a/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch b/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
deleted file mode 100644
index 7c33f7a70d35..000000000000
--- a/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2877a352715ce7e30ef364722757c6ec380236b1 Mon Sep 17 00:00:00 2001
-Message-Id: <2877a352715ce7e30ef364722757c6ec380236b1.1518037075.git.jan.steffens@gmail.com>
-From: Harald van Dijk <harald@gigawatt.nl>
-Date: Thu, 18 Jan 2018 15:18:37 -0700
-Subject: [PATCH] Bug 1430274 - Define MOZ_ALSA for more source files. r=jld
-
----
- security/sandbox/linux/moz.build | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
-index 681d658bfeb7..1a49b548af2d 100644
---- a/security/sandbox/linux/moz.build
-+++ b/security/sandbox/linux/moz.build
-@@ -78,6 +78,9 @@ if CONFIG['MOZ_GMP_SANDBOX']:
-         'SandboxOpenedFiles.cpp',
-     ]
- 
-+if CONFIG['MOZ_ALSA']:
-+    DEFINES['MOZ_ALSA'] = True
-+
- # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
- # dependency like the one in libxul does, but this way the behavior is
- # consistent.  See also the comment in SandboxLogging.h.
--- 
-2.16.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 59f48e07b66e..dd0ca78af158 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=firefox-wayland-hg
 _pkgname=firefox
-pkgver=r433427.e4e2245fc142
+pkgver=r435650.423bdf7a802b
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
@@ -25,14 +25,10 @@ _repo=https://hg.mozilla.org/mozilla-unified
 conflicts=('firefox')
 provides=('firefox')
 source=('mozilla-unified::hg+https://hg.mozilla.org/mozilla-central/'
-        firefox.desktop firefox-symbolic.svg
-        0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
-        firefox-install-dir.patch)
+        firefox.desktop firefox-symbolic.svg)
 sha256sums=('SKIP'
             '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
-            '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
-            'e8a695bd6a007525390c502739c0f00d5d753a1bde7053c21c712075f2c2994d'
-            'a94f80abe65608cd49054a30acc31e4d0885fe5b2a38cf08ded5e5b51b87c99d')
+            '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797')
 
 # 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
@@ -56,10 +52,6 @@ prepare() {
   ln -sf /usr/bin/python2 path/python
 
   cd mozilla-unified
-  # patch -Np1 -i ../firefox-install-dir.patch
-
-  # https://bugs.archlinux.org/task/57285
-  # patch -Np1 -i ../0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
 
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
@@ -70,7 +62,6 @@ ac_add_options --enable-application=browser
 ac_add_options --prefix=/usr
 ac_add_options --enable-release
 ac_add_options --enable-gold
-ac_add_options --enable-pie
 ac_add_options --enable-optimize="-O2"
 ac_add_options --enable-rust-simd
 
@@ -165,14 +156,6 @@ END
     install -Dm644 browser/branding/official/default$i.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgname.png"
   done
-  #install -Dm644 browser/branding/official/content/icon64.png \
-  #  "$pkgdir/usr/share/icons/hicolor/64x64/apps/$_pkgname.png"
-  #install -Dm644 browser/branding/official/mozicon128.png \
-  #  "$pkgdir/usr/share/icons/hicolor/128x128/apps/$_pkgname.png"
-  #install -Dm644 browser/branding/official/content/about-logo.png \
-  #  "$pkgdir/usr/share/icons/hicolor/192x192/apps/$_pkgname.png"
-  #install -Dm644 browser/branding/official/content/about-logo@2x.png \
-  #  "$pkgdir/usr/share/icons/hicolor/384x384/apps/$_pkgname.png"
   install -Dm644 ../firefox-symbolic.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$_pkgname-symbolic.svg"
 
diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch
deleted file mode 100644
index d6aaafa99eb8..000000000000
--- a/firefox-install-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/config/baseconfig.mk w/config/baseconfig.mk
-index e204533ac9b66b88..27ae154ce265ca2b 100644
---- i/config/baseconfig.mk
-+++ w/config/baseconfig.mk
-@@ -4,7 +4,7 @@
- # whether a normal build is happening or whether the check is running.
- includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- ifeq (.,$(DEPTH))
- DIST = dist