From 024554e344ce3ff889061febce9a3787909b8070 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Mon, 15 May 2017 09:11:52 +0200
Subject: icedove: fixed install dir, fixed pkgrel for nonprism variant

---
 nonprism/icedove/PKGBUILD                  |  7 ++++++-
 nonprism/icedove/icedove-install-dir.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 nonprism/icedove/icedove-install-dir.patch

(limited to 'nonprism')

diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index 2cea991e8..d3e7dd74a 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=icedove
 
 epoch=1
 pkgver=52.1.0
-pkgrel=1
+pkgrel=2.nonprism1
 _brandingver=52.1
 _brandingrel=1
 
@@ -40,6 +40,7 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname
         "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig"
         mozconfig
         $pkgname.desktop
+        $pkgname-install-dir.patch
         changing-the-default-search-engine.patch
         vendor.js
         rust-fix-rusty-cheddar-crate-setup.patch
@@ -51,6 +52,7 @@ sha256sums=('c33ca35b6acd1a0dc0d0f4b1df16745a33144c5d3d3715fe05454a5e9eefd48b'
             'SKIP'
             '72c9edd6b901ec09b483f6c365d1f698ae91da85a21fa9fc167d475d13e35a4f'
             '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
+            '36e0a5ac0e994bfc939b4ac69a1a4aa365210e9dd5b49317d647c683817b2c5d'
             'ff3474b7d8f7ad245a324c14f01daf05834462b4f0144fbc50f055ebb573dac8'
             '058b58074368b57acf8a6df9a9ffac848b7d7b39f5abd84cb2039bcee42b73e2'
             'e03cdc40e4ea39560aa230ef7a9c494f3a343c0feb8f43b68a47769f88f6b315'
@@ -90,6 +92,9 @@ prepare() {
   done
   cp -av $brandingdir/preview.png mail/themes/linux/mail/preview.png
 
+  # install to /usr/lib/icedove
+  patch -Np1 -i "$srcdir/$pkgname-install-dir.patch"
+
   # fix rust build
   patch -Np1 -i "$srcdir/rust-fix-rusty-cheddar-crate-setup.patch"
   patch -Np1 -i "$srcdir/rust-target-i586-to-i686.patch"
diff --git a/nonprism/icedove/icedove-install-dir.patch b/nonprism/icedove/icedove-install-dir.patch
new file mode 100644
index 000000000..ac58bc982
--- /dev/null
+++ b/nonprism/icedove/icedove-install-dir.patch
@@ -0,0 +1,11 @@
+--- a/mozilla/config/baseconfig.mk
++++ b/mozilla/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
-- 
cgit v1.2.2