Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to devel-firefox4 grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 http/xulrunner/HISTORY                       |    3 +++
 http/xulrunner/PRE_BUILD                     |    2 ++
 http/xulrunner/xulrunner-install-paths.patch |   21 ---------------------
 http/xulrunner/xulrunner-nss.patch           |   12 ------------
 http/xulrunner/xulrunner-version.patch       |   12 ++++++++++++
 http/xulrunner/xulrunner.sh                  |    2 +-
 6 files changed, 18 insertions(+), 34 deletions(-)

New commits:
commit 377d154c4cc289e09952ee903620bd6c0a165218
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    xulrunner: install into /usr/lib/xulrunner-2.0/ and
    /usr/lib/xulrunner-devel-2.0/
    not 2.0.1

diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 3cf1230..b296577 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,5 +1,8 @@
 2011-04-29 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.0.1, FFVERSION=4.0.1, SECURITY_PATCH=22
+       * PRE_BUILD, xulrunner-version.patch: added patch from Arch
+       * xulrunner-install-paths.patch, xulrunner-nss.patch: removed
+       * xulrunner.sh: 1.9 -> 2.0
 
 2011-04-13 Ladislav Hagara <hgr AT vabo.cz>
        * mozconfig4: added --enable-shared-js
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index ae67f7d..f76ce96 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -6,6 +6,8 @@ cd  mozilla-2.0                 &&
 # Needed to make things using XUL find NSPR.
 echo "Requires: nspr" >> xulrunner/installer/libxul-embedding.pc.in &&
 
+patch -p1 < $SPELL_DIRECTORY/xulrunner-version.patch &&
+
 cp -v $SPELL_DIRECTORY/mozconfig4 .mozconfig &&
 
 if [[ $FIREFOX_OFFICIAL == y ]]; then
diff --git a/http/xulrunner/xulrunner-install-paths.patch 
b/http/xulrunner/xulrunner-install-paths.patch
deleted file mode 100644
index 8095eaa..0000000
--- a/http/xulrunner/xulrunner-install-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/autoconf.mk.in.orig 2007-08-03 22:02:32.000000000 +0200
-+++ config/autoconf.mk.in      2007-08-03 22:07:00.000000000 +0200
-@@ -58,14 +58,14 @@
- prefix                = @prefix@
- exec_prefix   = @exec_prefix@
- bindir                = @bindir@
--includedir    = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir    = @includedir@/$(MOZ_APP_NAME)-1.9
- libdir                = @libdir@
- datadir               = @datadir@
- mandir                = @mandir@
--idldir                = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir                = $(includedir)/idl
- 
--installdir    = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir                = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir    = $(libdir)/$(MOZ_APP_NAME)-1.9
-+sdkdir                = $(libdir)/$(MOZ_APP_NAME)-1.9
- 
- DIST          = $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
diff --git a/http/xulrunner/xulrunner-nss.patch 
b/http/xulrunner/xulrunner-nss.patch
deleted file mode 100644
index de736be..0000000
--- a/http/xulrunner/xulrunner-nss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- xulrunner/installer/Makefile.in.orig       2008-10-10 06:31:57.000000000 
-0500
-+++ xulrunner/installer/Makefile.in    2008-10-10 06:34:17.000000000 -0500
-@@ -106,9 +106,6 @@
- 
- $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS))
- 
--ifndef MOZ_NATIVE_NSS
--pkg_config_files += mozilla-nss.pc
--endif
- 
- %.pc: $(srcdir)/%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
-       cat $< | sed \
diff --git a/http/xulrunner/xulrunner-version.patch 
b/http/xulrunner/xulrunner-version.patch
new file mode 100644
index 0000000..8e81b23
--- /dev/null
+++ b/http/xulrunner/xulrunner-version.patch
@@ -0,0 +1,12 @@
+diff -Nur mozilla-2.0.orig/xulrunner/installer/Makefile.in 
mozilla-2.0/xulrunner/installer/Makefile.in
+--- mozilla-2.0.orig/xulrunner/installer/Makefile.in   2011-03-03 
14:12:04.000000000 -0800
++++ mozilla-2.0/xulrunner/installer/Makefile.in        2011-03-13 
01:58:19.663360705 -0800
+@@ -44,6 +44,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++MOZ_APP_VERSION="2.0"
++
+ NO_PKG_FILES = \
+       xulrunner-config \
+       regchrome* \
diff --git a/http/xulrunner/xulrunner.sh b/http/xulrunner/xulrunner.sh
index 5fc4579..180f773 100644
--- a/http/xulrunner/xulrunner.sh
+++ b/http/xulrunner/xulrunner.sh
@@ -7,6 +7,6 @@
 #
 
 if  [ -z "$MOZILLA_FIVE_HOME" ] ; then 
-       MOZILLA_FIVE_HOME=/usr/lib/xulrunner-1.9
+       MOZILLA_FIVE_HOME=/usr/lib/xulrunner-2.0
 fi 
 export  MOZILLA_FIVE_HOME