icedove-1:31.7.0.deb1-1{,.nonprism1}: updating version

1 files changed, 10 insertions, 12 deletions

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 0f2f95f04..d86927420 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=31.6.0
+_debver=31.7.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=${_debname}
 epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -28,16 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         mozconfig
         ${pkgname}.desktop
         ${pkgname}-install-dir.patch
-        vendor.js
-        rhbz-966424.patch)
+        vendor.js)
 options=(!emptydirs)
-sha256sums=('9011da6632434d6ee991cc69f4e040a194d998ce3a04e5c3a05f21fc361124dc'
-            'ac73365adcccf126b97432cfd60828da667b2eb82512ae252cf577939d666fd9'
+sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794'
+            '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561'
             '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a'
-            'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b'
+            '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
             '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
-            'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec'
-            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
+            'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec')
 
 prepare() {
   export DEBIAN_BUILD="comm-esr31"
@@ -59,6 +57,9 @@ prepare() {
       install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png"
   done
 
+  # We are doing it from sed commands
+  rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true
+
   quilt push -av
 
   # Fix paths on makefile
@@ -89,9 +90,6 @@ prepare() {
 
   cp "${srcdir}/mozconfig" .mozconfig
 
-  # https://bugs.archlinux.org/task/41689
-  patch -Np1 -d mozilla -i ../../rhbz-966424.patch
-
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure