[arch-commits] Commit in xulrunner/trunk (PKGBUILD moz-639554.patch)

[Ionut Biru]

    Date: Tuesday, August 23, 2011 @ 14:04:41
  Author: ibiru
Revision: 136172

include SDK, needed by external application at compilation

Added:
  xulrunner/trunk/moz-639554.patch
Modified:
  xulrunner/trunk/PKGBUILD

------------------+
 PKGBUILD         |   19 ++++++++++++++-----
 moz-639554.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-23 17:11:36 UTC (rev 136171)
+++ PKGBUILD	2011-08-23 18:04:41 UTC (rev 136172)
@@ -4,7 +4,7 @@
 pkgname=xulrunner
 pkgver=6.0
 _ffoxver=6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -13,15 +13,23 @@
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
         mozconfig
-        mozilla-pkgconfig.patch)
+        mozilla-pkgconfig.patch
+        moz-639554.patch)
 options=('!emptydirs' '!buildflags')
 replaces=('xulrunner-oss')
+md5sums=('1840185865a1a8975df4a3db59080ddc'
+         '2358a2ddd35bcdd62ff42442dfe548d9'
+         '639ea80e823543dd415b90c0ee804186'
+         '96d3c1790a56f8e6df88e327adccf3bf')
+
 build() {
   cd "${srcdir}/mozilla-release"
   cp "${srcdir}/mozconfig" .mozconfig
 
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
+  #upstream fixes
+  patch -Np1 -i "${srcdir}/moz-639554.patch"
 
   export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
 
@@ -40,7 +48,8 @@
   # add xulrunner library path to ld.so.conf
   install -d ${pkgdir}/etc/ld.so.conf.d
   echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
+
+  #wtf mozilla!
+  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-6.0/sdk/bin/xpt.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "${pkgdir}/usr/lib/xulrunner-devel-6.0/sdk/bin/xpt.py"
 }
-md5sums=('1840185865a1a8975df4a3db59080ddc'
-         '2358a2ddd35bcdd62ff42442dfe548d9'
-         '639ea80e823543dd415b90c0ee804186')

Added: moz-639554.patch
===================================================================
--- moz-639554.patch	                        (rev 0)
+++ moz-639554.patch	2011-08-23 18:04:41 UTC (rev 136172)
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Chris Coulson <chrisccoulson at ubuntu.com>
+# Date 1306390403 -7200
+# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
+# Parent  831f8e040f381ed58441d8bf413f9845f26ce08e
+Bug 639554 - Install sdk/bin with make install. r=bsmedberg
+
+diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
+--- a/toolkit/mozapps/installer/packager.mk
++++ b/toolkit/mozapps/installer/packager.mk
+@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard 
+ 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
+ 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
+ 	$(NSINSTALL) -D $(DESTDIR)$(idldir)
+ 	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
+ 	  (cd $(DESTDIR)$(idldir) && tar -xf -)
+ # SDK directory is the libs + a bunch of symlinks
+ 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
++	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
+ 	if test -f $(DIST)/include/xpcom-config.h; then \
+ 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ 	fi
+ 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
++	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
+ 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
+ 	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
+ 	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
+ endif # INSTALL_SDK
+ 
+ make-sdk:
+