epiphany-3.24.2-1.parabola1: Adding privacy.patch from Hyperbola and updating version

1 files changed, 12 insertions, 18 deletions

diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD
index 1713b844c..fb6f93c5c 100644
--- a/libre/epiphany/PKGBUILD
+++ b/libre/epiphany/PKGBUILD
@@ -4,25 +4,29 @@
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=epiphany
-pkgver=3.22.6
+pkgver=3.24.2
 pkgrel=1.parabola1
 pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
 url="https://wiki.gnome.org/Apps/Web"
 arch=(i686 x86_64 armv7h)
 license=(GPL)
-depends=(webkit2gtk gcr gnome-desktop)
+depends=(webkit2gtk gcr gnome-desktop icu)
 makedepends=(intltool itstool docbook-xml startup-notification lsb-release
              gobject-introspection yelp-tools autoconf-archive appstream-glib git)
 groups=(gnome)
 replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
-_commit=dfeedecc5c92980e0c6cf57f297063503bf0b013  # tags/3.22.6^0
+_commit=d0e5c8fff89633b504cb9dc02638b1c25f227c38  # tags/3.24.2^0
 source=("git+https://git.gnome.org/browse/epiphany#commit=$_commit"
         "git+https://git.gnome.org/browse/libgd"
-        pluginsdir.diff)
+        "git+https://git.gnome.org/browse/gvdb"
+        pluginsdir.diff
+        privacy.patch)
 sha256sums=('SKIP'
             'SKIP'
-            '42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22')
+            'SKIP'
+            '3bbd4b36e697a3a9165e0b71d5af566fe96a8f1237d854b9dee9a7e0b9fef8e3'
+            '4cfef33af39c2292f5a5378154adb94be5937dc065b881b168b5df99557474f1')
 
 pkgver() {
   cd $pkgname
@@ -32,30 +36,20 @@ pkgver() {
 prepare() {
   cd $pkgname
   patch -Np1 -i ../pluginsdir.diff
+  patch -Np1 -i ../privacy.patch
 
   git submodule init
   git config --local submodule.libgd.url "$srcdir/libgd"
+  git config --local submodule.gvdb.url "$srcdir/gvdb"
   git submodule update
 
   NOCONFIGURE=1 ./autogen.sh
-
-  # Replace DuckDuckGo to DuckDuckGo HTML
-  sed -i 's|duckduckgo[.]com|duckduckgo.com/html|g' $(grep -rlI 'duckduckgo[.]com')
-
-  # Replace Google support to DuckDuckGo HTML
-  sed -i 's|http://www[.]google[.]com/search?q=%s[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=%s&ie=UTF-8&oe=UTF-8')
-  sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched')
-  sed -i 's|http://www[.]google[.]com/search?q=%s[&]amp;ie=UTF-8[&]amp;oe=UTF-8|https://duckduckgo.com/html/?q=%s|g' $(grep -rlI 'http://www[.]google[.]com/search')
-  sed -i 's|http://www[.]google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
-  sed -i 's|http://google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
-  sed -i 's|mail[.]google[.]com|mail.com|g' $(grep -rlI 'mail[.]google[.]com')
-  sed -i 's|google[.]com|duckduckgo.com/html|g' $(grep -rlI 'google[.]com')
 }
 
 build() {
   cd $pkgname
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/$pkgname
+      --localstatedir=/var --libexecdir=/usr/lib/$pkgname --enable-compile-warnings=yes
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool