Use 'arch-meson'; forget about plugins directory

2 files changed, 3 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17060dbd612a..0d4f8f4d0557 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = epiphany-pantheon-bzr
 	pkgdesc = A GNOME web browser based on the WebKit rendering engine, with Elementary OS patches
 	pkgver = 3.27.90.1ubuntu1.r20
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gnome.org/projects/epiphany/
 	arch = i686
 	arch = x86_64
@@ -26,7 +26,6 @@ pkgbase = epiphany-pantheon-bzr
 	conflicts = epiphany
 	replaces = epiphany
 	source = bzr+lp:~elementary-os/elementaryos/os-patch-epiphany-browser-bionic
-	source = pluginsdir.diff
 	source = epiphany-sync
 	source = epiphany-sync.service
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 783ce3ddcd6c..1260e6670251 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=$_pkgname-pantheon-bzr
 ephyver=3.27.90-1ubuntu1
 ubunturel=bionic
 pkgver=3.27.90.1ubuntu1.r20
-pkgrel=1
+pkgrel=2
 pkgdesc="A GNOME web browser based on the WebKit rendering engine, with Elementary OS patches"
 url="http://www.gnome.org/projects/epiphany/"
 arch=('i686' 'x86_64')
@@ -19,7 +19,6 @@ replaces=(epiphany)
 provides=(epiphany epiphany-sync)
 conflicts=(epiphany)
 source=("bzr+lp:~elementary-os/elementaryos/os-patch-epiphany-browser-${ubunturel}"
-        "pluginsdir.diff"
         epiphany-sync{,.service})
 sha256sums=('SKIP'
             '3e648118d7d45fc1cce04d45c7443ed0cc54e3a65aefcb4fb12ce5e01014c53e'
@@ -32,17 +31,10 @@ pkgver() {
   echo "${ephyver/-/.}.r$(bzr revno)"
 }
 
-prepare() {
-  cd "os-patch-epiphany-browser-${ubunturel}"
-
-  msg2 "Plugins Directory"
-  #patch -Np1 < ../pluginsdir.diff
-}
-
 build() {
   cd "os-patch-epiphany-browser-${ubunturel}"
   [ -d build ] && rm -rf build
-  meson build --prefix=/usr --sysconfdir=/etc  --localstatedir=/var --libexecdir=/usr/lib/"${_pkgname}" --buildtype=release -Denable_https_everywhere=true
+  arch-meson build -Denable_https_everywhere=true
   ninja -C build
 }