Date: Tuesday, September 27, 2011 @ 16:37:23 Author: ibiru Revision: 138760
update to 7.0 Modified: xulrunner/trunk/PKGBUILD xulrunner/trunk/mozconfig Deleted: xulrunner/trunk/moz-639554.patch ------------------+ PKGBUILD | 23 +++++++---------------- moz-639554.patch | 35 ----------------------------------- mozconfig | 1 - 3 files changed, 7 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-27 20:28:51 UTC (rev 138759) +++ PKGBUILD 2011-09-27 20:37:23 UTC (rev 138760) @@ -2,25 +2,23 @@ # Maintainer: Jan de Groot <[email protected]> # Contributor: Alexander Baldeck <[email protected]> pkgname=xulrunner -pkgver=6.0.1 -_ffoxver=6.0.1 +pkgver=7.0 +_ffoxver=7.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify') -makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'gconf') +makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') 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 - moz-639554.patch) + mozilla-pkgconfig.patch) options=('!emptydirs' '!buildflags') replaces=('xulrunner-oss') -md5sums=('43b71655e1307c7f62896339e70c9aed' - '2358a2ddd35bcdd62ff42442dfe548d9' - '639ea80e823543dd415b90c0ee804186' - '96d3c1790a56f8e6df88e327adccf3bf') +md5sums=('673a015a23e3fefa18d80db68c8b9fc1' + '108a53313284908cc3afe5e29a7557e9' + '639ea80e823543dd415b90c0ee804186') build() { cd "${srcdir}/mozilla-release" @@ -28,8 +26,6 @@ #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,11 +36,6 @@ cd "${srcdir}/mozilla-release" make -j1 -f client.mk DESTDIR="${pkgdir}" install - #Remove included dictionaries, add symlink to system myspell path. - #Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries" - # 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 Deleted: moz-639554.patch =================================================================== --- moz-639554.patch 2011-09-27 20:28:51 UTC (rev 138759) +++ moz-639554.patch 2011-09-27 20:37:23 UTC (rev 138760) @@ -1,35 +0,0 @@ - -# HG changeset patch -# User Chris Coulson <[email protected]> -# 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: - Modified: mozconfig =================================================================== --- mozconfig 2011-09-27 20:28:51 UTC (rev 138759) +++ mozconfig 2011-09-27 20:37:23 UTC (rev 138760) @@ -47,7 +47,6 @@ ac_add_options --enable-gio ac_add_options --disable-gnomevfs -ac_add_options --enable-gconf ac_add_options --enable-libnotify export BUILD_OFFICIAL=1
