From c6b718637cc50cc7c3ba7045c3fedbbbedc99480 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Fri, 12 Oct 2012 05:15:48 -0200
Subject: iceweasel-libre-16.0.1.1-1: adding a iceweasel-install-dir.patch
 modified to fix /usr/lib/iceweasel folder direction

---
 libre/iceweasel-libre/PKGBUILD                    |  3 ++
 libre/iceweasel-libre/iceweasel-install-dir.patch | 48 ++++++++++++-----------
 2 files changed, 28 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 libre/iceweasel-libre/iceweasel-install-dir.patch

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 07e394e3f..4e177229c 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -48,6 +48,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         mozconfig.pgo
         xulrunner-copy-stub.patch
         libre.patch
+        iceweasel-install-dir.patch
         vendor.js
         shared-libs.patch
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
@@ -57,6 +58,7 @@ md5sums=('33e50f7ddfa7274e5a3bd393c37fb3b3'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
          '8768dfc39e9f1057c2956bf4405ae58e'
+         'cc5c68c8851eeed694e7e933779a0f16'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93'
          '0a31239f1008038df5057982fe745dec')
@@ -85,6 +87,7 @@ build() {
   quilt push -a
 
   patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+  patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
   patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix
   patch -Np1 -i "$srcdir/libre.patch"
   patch -Np1 -i "$srcdir/shared-libs.patch"
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch
old mode 100755
new mode 100644
index f80a3eca9..e9ca4aa38
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel-libre/iceweasel-install-dir.patch
@@ -1,28 +1,30 @@
-diff -Nur iceweasel-9.0.1.orig/config/autoconf.mk.in iceweasel-9.0.1/config/autoconf.mk.in
---- iceweasel-9.0.1.orig/config/autoconf.mk.in	2011-12-31 17:07:52.000000000 -0500
-+++ iceweasel-9.0.1/config/autoconf.mk.in	2011-12-31 17:11:18.000000000 -0500
-@@ -68,8 +68,8 @@
- mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk
+--- iceweasel-16.0.1.orig/config/baseconfig.mk	2012-10-10 19:42:45.000000000 -0200
++++ iceweasel-16.0.1/config/baseconfig.mk	2012-10-12 05:07:39.393233306 -0200
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
  
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+-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)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
  
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in iceweasel-9.0.1/js/src/config/autoconf.mk.in
---- iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in	2011-12-20 18:28:21.000000000 -0500
-+++ iceweasel-9.0.1/js/src/config/autoconf.mk.in	2011-12-31 17:11:43.000000000 -0500
-@@ -60,8 +60,8 @@
- datadir		= @datadir@
- mandir		= @mandir@
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk
+--- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk	2012-10-10 19:43:05.000000000 -0200
++++ iceweasel-16.0.1/js/src/config/baseconfig.mk	2012-10-12 05:08:23.064066227 -0200
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
  
--installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
  
- TOP_DIST	= @TOP_DIST@
  ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
-- 
cgit v1.2.3