I don't understand gcc/PKGBUILD.mips64el

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/addresses/PKGBUILD
	community/chmsee/PKGBUILD
	community/coin/PKGBUILD
	community/critterding/PKGBUILD
	community/distcc/PKGBUILD
	community/djview4/PKGBUILD
	community/freedroid/PKGBUILD
	community/gnumail/PKGBUILD
	community/gyachi/PKGBUILD
	community/java-oracle/PKGBUILD
	community/liboop/PKGBUILD
	community/ltris/PKGBUILD
	community/nepim/PKGBUILD
	community/pantomime/PKGBUILD
	community/pyxattr/PKGBUILD
	community/soqt/PKGBUILD
	community/tilda/PKGBUILD
	community/unrealircd/PKGBUILD
	community/uqm/PKGBUILD
	core/dnsutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	core/vpnc/PKGBUILD
	extra/apache/PKGBUILD
	extra/bind/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/ccache/PKGBUILD
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/cups/PKGBUILD
	extra/doxygen/PKGBUILD
	extra/fam/PKGBUILD
	extra/fcitx/PKGBUILD
	extra/gdk-pixbuf2/PKGBUILD
	extra/geoip/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libfwbuilder/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt/PKGBUILD
	extra/samba/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib-testing/lib32-keyutils/PKGBUILD
	multilib-testing/lib32-udev/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-keyutils/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	testing/dash/PKGBUILD
	testing/libssh2/PKGBUILD

2 files changed, 48 insertions, 8 deletions

diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index f1aa98ef9..fc40b6011 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135629 2011-08-16 19:39:58Z ibiru $
+# $Id: PKGBUILD 136643 2011-08-31 10:33:15Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=6.0
-_ffoxver=6.0
+pkgver=6.0.1
+_ffoxver=6.0.1
 pkgrel=1
 pkgver=2.0
 pkgrel=2 # hold ver
@@ -16,20 +16,24 @@ url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
         mozconfig
         mozilla-pkgconfig.patch
-        mips.patch)
+        mips.patch
+        moz-639554.patch)
 options=('!emptydirs' '!buildflags')
 replaces=('xulrunner-oss')
+
 build() {
   cd "${srcdir}/icecat-${_ffoxver}/"
   cp "${srcdir}/mozconfig" .mozconfig
 
   #fix libdir/sdkdir - fedora
-   patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
 
   [[ "$CARCH" == "mips64el" ]] && {
     echo "ac_add_options --disable-ipc" >> .mozconfig
     patch -Np0 -i "${srcdir}/mips.patch"
   }
+  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"
 
@@ -48,7 +52,8 @@ package() {
   # 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-$pkgver/sdk/bin/xpt.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
 }
-md5sums=('1840185865a1a8975df4a3db59080ddc'
-         '2358a2ddd35bcdd62ff42442dfe548d9'
-         '639ea80e823543dd415b90c0ee804186')
diff --git a/extra/xulrunner/moz-639554.patch b/extra/xulrunner/moz-639554.patch
new file mode 100644
index 000000000..30fe15c6e
--- /dev/null
+++ b/extra/xulrunner/moz-639554.patch
@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Chris Coulson <chrisccoulson@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:
+