From ff9c5077503b3a9b22be57b073d1d77bb959bb04 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 31 Dec 2011 17:22:18 -0500
Subject: fix firefox-install-dir.patch for iceweasel-libre

Apparently debian patched config/autoconf.mk.in to have
installdir use $(MOZ_APP_BASE_VERSION) instead of $(MOZ_APP_VERSION).
This is what Firefox did at least through version 7, and is something I
would normally agree with, but it breaks firefox-install-dir.patch.
---
 mozilla-testing/iceweasel-libre/PKGBUILD           | 10 ++++----
 .../iceweasel-libre/firefox-install-dir.patch      | 28 ----------------------
 .../iceweasel-libre/iceweasel-install-dir.patch    | 28 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 mozilla-testing/iceweasel-libre/firefox-install-dir.patch
 create mode 100644 mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch

diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index 3a3d7a561..c565313a8 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -56,7 +56,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         mozconfig
         xulrunner-copy-stub.patch
         libre.patch
-        firefox-install-dir.patch
+        iceweasel-install-dir.patch
         region.properties
         vendor.js)
 
@@ -91,9 +91,9 @@ build() {
   cd "$srcdir/$_pkgname-$pkgver"
   
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
-  patch -Np1 -i "$srcdir/firefox-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/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"
   cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
 
   # Fix PRE_RELEASE_SUFFIX
@@ -143,6 +143,6 @@ md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
          'c401067e1ffcb8df5a53076845d28a88'
          'a485a2b5dc544a8a2bd40c985d2e5813'
          '8942889dfa6936dc034e9c2f3503325a'
-         '1e4bcac59e93d21fffa6a1d1ad235247'
+         'e529742c0a425648087bc3ce537fe4c5'
          'f1c76e7e244257856a386ca2de69bdf0'
          '0d053487907de4376d67d8f499c5502b')
diff --git a/mozilla-testing/iceweasel-libre/firefox-install-dir.patch b/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
deleted file mode 100644
index b6f9700b3..000000000
--- a/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
---- mozilla-release.orig/config/autoconf.mk.in	2011-11-06 14:06:44.462920048 +0000
-+++ mozilla-release/config/autoconf.mk.in	2011-11-06 14:20:45.124169469 +0000
-@@ -68,8 +68,8 @@
- mandir		= @mandir@
- 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)
-+installdir	= $(libdir)/$(MOZ_APP_NAME)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
-
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
-diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
---- mozilla-release.orig/js/src/config/autoconf.mk.in	2011-11-06 14:06:45.586263727 +0000
-+++ mozilla-release/js/src/config/autoconf.mk.in	2011-11-06 14:21:01.770993669 +0000
-@@ -61,8 +61,8 @@
- datadir		= @datadir@
- mandir		= @mandir@
-
--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)))
diff --git a/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch b/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch
new file mode 100644
index 000000000..f80a3eca9
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/iceweasel-install-dir.patch
@@ -0,0 +1,28 @@
+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)
+ 
+-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
+ 
+ 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@
+ 
+-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)))
-- 
cgit v1.2.3-2-g168b