[arch-commits] Commit in xulrunner/repos (5 files)
Date: Thursday, January 21, 2010 @ 12:38:22 Author: ibiru Revision: 64644 Merged revisions 64643 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xulrunner/trunk r64643 | ibiru | 2010-01-21 19:37:43 +0200 (Thu, 21 Jan 2010) | 2 lines upgpkg: xulrunner 1.9.2-1 bump to 1.9.2, remove 100-system-hunspell-corrections since is breaking compilations, remove nsThreadUtils.patch merged upstream, remove python/xpcom extensions since is not supported anymore Modified: xulrunner/repos/testing-i686/ (properties) xulrunner/repos/testing-i686/PKGBUILD xulrunner/repos/testing-i686/mozconfig xulrunner/repos/testing-i686/mozilla-pkgconfig.patch xulrunner/repos/testing-i686/xulrunner-version.patch -+ PKGBUILD| 32 +++--- mozconfig |2 mozilla-pkgconfig.patch | 139 -- xulrunner-version.patch |2 4 files changed, 62 insertions(+), 113 deletions(-) Property changes on: xulrunner/repos/testing-i686 ___ Modified: svnmerge-integrated - /xulrunner/trunk:1-63328 + /xulrunner/trunk:1-64643 Modified: testing-i686/PKGBUILD === --- testing-i686/PKGBUILD 2010-01-21 17:37:43 UTC (rev 64643) +++ testing-i686/PKGBUILD 2010-01-21 17:38:22 UTC (rev 64644) @@ -2,9 +2,9 @@ # Maintainer: Alexander Baldeck alexan...@archlinux.org # Contributor: Jan de Groot j...@archlinux.org pkgname=xulrunner -pkgver=1.9.1.7 -_ffoxver=3.5.7 -pkgrel=2 +pkgver=1.9.2 +_ffoxver=3.6 +pkgrel=1 pkgdesc=Mozilla Runtime Environment arch=(i686 x86_64) license=('MPL' 'GPL' 'LGPL') @@ -16,42 +16,32 @@ 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 - 100-system-hunspell-corrections.patch mozilla-pkgconfig.patch fix-mozilla-launcher.patch mozilla-ps-pdf-simplify-operators.patch -nsThreadUtils.patch xulrunner-version.patch xulrunner-png14.patch) -md5sums=('82e6f568ddeaae52e85aa089277f5d14' - '7c87142a23e75bbd4d41e0c8de8ab4a6' - '5efd6772ed0ecf8eddec5d5650191d3c' - 'd806ffcd9fa8d178ebfa9057c1221fbf' +md5sums=('458051557ff49e6a352c1d56eee5782a' + 'c99bced771a39690bd71e5e1c1770e73' + 'b747631cbe9d1f5037baeb8a8dcdae35' '63eee2d1da3b43c9d604f2253f242f40' '13dca58c04e62a8916691c63c5c492a0' - 'ccc3a0672c783c043434f256fbd38c86' - 'd8a3066a3d9039b6f375316ed763e8f8' + '371303c5bdc4fa0d955d14521b93b69d' '3bd0566180ad2daa32743b3ce58b2095') build() { - cd ${srcdir}/mozilla-1.9.1 + cd ${srcdir}/mozilla-1.9.2 cp ${srcdir}/mozconfig .mozconfig - #Upstream patch. Still not applied to 1.9.0.1 + #Upstream patch. Still not applied to 1.9.2 patch -Np1 -i ${srcdir}/mozilla-ps-pdf-simplify-operators.patch || return 1 - #fix build with system hunspell - gentoo - patch -Np0 -i ${srcdir}/100-system-hunspell-corrections.patch || return 1 - - #fix libdir/sdkdir - fedora - with local modifications + #fix libdir/sdkdir - fedora patch -Np1 -i ${srcdir}/mozilla-pkgconfig.patch || return 1 #Fix stub launcher - archlinux patch -Np0 -i ${srcdir}/fix-mozilla-launcher.patch || return 1 - #Fix epiphany crashes - requires epiphany rebuild - patch -Np1 -i ${srcdir}/nsThreadUtils.patch || return 1 - #Force installation to the same path for every version patch -Np1 -i ${srcdir}/xulrunner-version.patch || return 1 @@ -59,7 +49,7 @@ unset CFLAGS unset CXXFLAGS - export LDFLAGS=${LDFLAGS} -Wl,-rpath,/usr/lib/xulrunner-1.9.1 + export LDFLAGS=${LDFLAGS} -Wl,-rpath,/usr/lib/xulrunner-1.9.2 make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS || return 1 make -j1 DESTDIR=${pkgdir} install || return 1 Modified: testing-i686/mozconfig === --- testing-i686/mozconfig 2010-01-21 17:37:43 UTC (rev 64643) +++ testing-i686/mozconfig 2010-01-21 17:38:22 UTC (rev 64644) @@ -26,7 +26,7 @@ ac_add_options --disable-crashreporter ac_add_options --enable-safe-browsing ac_add_options --enable-startup-notification -ac_add_options --enable-extensions=default,python/xpcom +ac_add_options --enable-extensions=default export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 Modified: testing-i686/mozilla-pkgconfig.patch === --- testing-i686/mozilla-pkgconfig.patch2010-01-21 17:37:43 UTC (rev 64643) +++ testing-i686/mozilla-pkgconfig.patch2010-01-21 17:38:22 UTC (rev 64644) @@ -1,80 +1,59 @@ -diff -r f1af606531f5 xulrunner/installer/Makefile.in a/xulrunner/installer/Makefile.in Sat Nov 22 20:22:22
[arch-commits] Commit in xulrunner/repos (5 files)
Date: Thursday, January 21, 2010 @ 12:40:48 Author: ibiru Revision: 64645 Merged revisions 64643 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xulrunner/trunk r64643 | ibiru | 2010-01-21 19:37:43 +0200 (Thu, 21 Jan 2010) | 2 lines upgpkg: xulrunner 1.9.2-1 bump to 1.9.2, remove 100-system-hunspell-corrections since is breaking compilations, remove nsThreadUtils.patch merged upstream, remove python/xpcom extensions since is not supported anymore Modified: xulrunner/repos/testing-x86_64/ (properties) xulrunner/repos/testing-x86_64/PKGBUILD xulrunner/repos/testing-x86_64/mozconfig xulrunner/repos/testing-x86_64/mozilla-pkgconfig.patch xulrunner/repos/testing-x86_64/xulrunner-version.patch -+ PKGBUILD| 32 +++--- mozconfig |2 mozilla-pkgconfig.patch | 139 -- xulrunner-version.patch |2 4 files changed, 62 insertions(+), 113 deletions(-) Property changes on: xulrunner/repos/testing-x86_64 ___ Modified: svnmerge-integrated - /xulrunner/trunk:1-63330 + /xulrunner/trunk:1-64644 Modified: testing-x86_64/PKGBUILD === --- testing-x86_64/PKGBUILD 2010-01-21 17:38:22 UTC (rev 64644) +++ testing-x86_64/PKGBUILD 2010-01-21 17:40:48 UTC (rev 64645) @@ -2,9 +2,9 @@ # Maintainer: Alexander Baldeck alexan...@archlinux.org # Contributor: Jan de Groot j...@archlinux.org pkgname=xulrunner -pkgver=1.9.1.7 -_ffoxver=3.5.7 -pkgrel=2 +pkgver=1.9.2 +_ffoxver=3.6 +pkgrel=1 pkgdesc=Mozilla Runtime Environment arch=(i686 x86_64) license=('MPL' 'GPL' 'LGPL') @@ -16,42 +16,32 @@ 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 - 100-system-hunspell-corrections.patch mozilla-pkgconfig.patch fix-mozilla-launcher.patch mozilla-ps-pdf-simplify-operators.patch -nsThreadUtils.patch xulrunner-version.patch xulrunner-png14.patch) -md5sums=('82e6f568ddeaae52e85aa089277f5d14' - '7c87142a23e75bbd4d41e0c8de8ab4a6' - '5efd6772ed0ecf8eddec5d5650191d3c' - 'd806ffcd9fa8d178ebfa9057c1221fbf' +md5sums=('458051557ff49e6a352c1d56eee5782a' + 'c99bced771a39690bd71e5e1c1770e73' + 'b747631cbe9d1f5037baeb8a8dcdae35' '63eee2d1da3b43c9d604f2253f242f40' '13dca58c04e62a8916691c63c5c492a0' - 'ccc3a0672c783c043434f256fbd38c86' - 'd8a3066a3d9039b6f375316ed763e8f8' + '371303c5bdc4fa0d955d14521b93b69d' '3bd0566180ad2daa32743b3ce58b2095') build() { - cd ${srcdir}/mozilla-1.9.1 + cd ${srcdir}/mozilla-1.9.2 cp ${srcdir}/mozconfig .mozconfig - #Upstream patch. Still not applied to 1.9.0.1 + #Upstream patch. Still not applied to 1.9.2 patch -Np1 -i ${srcdir}/mozilla-ps-pdf-simplify-operators.patch || return 1 - #fix build with system hunspell - gentoo - patch -Np0 -i ${srcdir}/100-system-hunspell-corrections.patch || return 1 - - #fix libdir/sdkdir - fedora - with local modifications + #fix libdir/sdkdir - fedora patch -Np1 -i ${srcdir}/mozilla-pkgconfig.patch || return 1 #Fix stub launcher - archlinux patch -Np0 -i ${srcdir}/fix-mozilla-launcher.patch || return 1 - #Fix epiphany crashes - requires epiphany rebuild - patch -Np1 -i ${srcdir}/nsThreadUtils.patch || return 1 - #Force installation to the same path for every version patch -Np1 -i ${srcdir}/xulrunner-version.patch || return 1 @@ -59,7 +49,7 @@ unset CFLAGS unset CXXFLAGS - export LDFLAGS=${LDFLAGS} -Wl,-rpath,/usr/lib/xulrunner-1.9.1 + export LDFLAGS=${LDFLAGS} -Wl,-rpath,/usr/lib/xulrunner-1.9.2 make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS || return 1 make -j1 DESTDIR=${pkgdir} install || return 1 Modified: testing-x86_64/mozconfig === --- testing-x86_64/mozconfig2010-01-21 17:38:22 UTC (rev 64644) +++ testing-x86_64/mozconfig2010-01-21 17:40:48 UTC (rev 64645) @@ -26,7 +26,7 @@ ac_add_options --disable-crashreporter ac_add_options --enable-safe-browsing ac_add_options --enable-startup-notification -ac_add_options --enable-extensions=default,python/xpcom +ac_add_options --enable-extensions=default export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 Modified: testing-x86_64/mozilla-pkgconfig.patch === --- testing-x86_64/mozilla-pkgconfig.patch 2010-01-21 17:38:22 UTC (rev 64644) +++ testing-x86_64/mozilla-pkgconfig.patch 2010-01-21 17:40:48 UTC (rev 64645) @@ -1,80 +1,59 @@ -diff -r f1af606531f5 xulrunner/installer/Makefile.in