From a53d499df5e3a4c063192cbc8b9b5a18a4d29bad Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Tue, 4 Dec 2012 22:48:25 -0200
Subject: icecat-17.0.1-1: fixing icecat-install-dir.patch

---
 libre/icecat/PKGBUILD                 |  2 +-
 libre/icecat/icecat-install-dir.patch | 47 +++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 libre/icecat/icecat-install-dir.patch

(limited to 'libre')

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 14a04b8fd..cc5889c7a 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -82,7 +82,7 @@ md5sums=(
   f4cffe48e84283026da634424f4bbee6
   e81ad01dbc16ba28bf92ba4b7c309ca7
   d93fe402b87cd000a869e1fd6badc6c9
-  b320085e7effa2890a79f4f45760614b
+  64826fcf48816b13090042eefddbaa58
   0d053487907de4376d67d8f499c5502b
   #c8552d030494443218d88792f4dbbd0f
 )
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
old mode 100755
new mode 100644
index eb698f307..7a72b9c9d
--- a/libre/icecat/icecat-install-dir.patch
+++ b/libre/icecat/icecat-install-dir.patch
@@ -1,27 +1,30 @@
---- a/config/autoconf.mk.in
-+++ b/config/autoconf.mk.in
-@@ -74,8 +74,8 @@
- mandir		= @mandir@
- idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk
+--- a/config/baseconfig.mk
++++ b/config/baseconfig.mk
+@@ -1,9 +1,9 @@
+ 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
+-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 a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
---- a/js/src/config/autoconf.mk.in
-+++ b/js/src/config/autoconf.mk.in
-@@ -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 a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
+--- a/js/src/config/baseconfig.mk
++++ b/js/src/config/baseconfig.mk
+@@ -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