From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RAVmK-0003zz-VY for garchives@archives.gentoo.org; Sun, 02 Oct 2011 23:49:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D324121C1B7; Sun, 2 Oct 2011 23:48:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 972EA21C1B7 for ; Sun, 2 Oct 2011 23:48:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B2AF1B4008 for ; Sun, 2 Oct 2011 23:48:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1ACAF80042 for ; Sun, 2 Oct 2011 23:48:46 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <46ede62a1d885fc9f670e710b41bedae6a978793.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/ X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/Manifest mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_are_enabled.patch mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild mail-client/thunderbird/thunderbird-7.0.1.ebuild X-VCS-Directories: mail-client/thunderbird/ mail-client/thunderbird/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 46ede62a1d885fc9f670e710b41bedae6a978793 Date: Sun, 2 Oct 2011 23:48:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0f73ca485dd7028b0399f3f5cc80901a commit: 46ede62a1d885fc9f670e710b41bedae6a978793 Author: Jory A. Pratt gentoo org> AuthorDate: Sun Oct 2 23:47:54 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Oct 2 23:47:54 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D46ede62a multiple bug fixes, use system libffi, support multiple archs --- mail-client/thunderbird/Manifest | 6 +- .../Copy_xpcshell_only_if_tests_are_enabled.patch | 71 --------------= ------ ...rd-7.0.1.ebuild =3D> thunderbird-7.0.1-r1.ebuild} | 19 ++++-- 3 files changed, 17 insertions(+), 79 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/M= anifest index 4bf0d8b..219252f 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -1,9 +1,9 @@ -AUX Copy_xpcshell_only_if_tests_are_enabled.patch 2828 RMD160 a69ed58183= 1c0d4c674c650d6ce38e279d593d8e SHA1 0cd598d09424beaca1dc387c75575cd49fbd9= f39 SHA256 38686ca5bcfb06501e1f82ee0f98a359a71c44a9789ce33413439e28495bfb= 0e AUX icon/thunderbird-unbranded.desktop 280 RMD160 9a479a1f7c82021962ea35= ee7289e0ba24fea967 SHA1 5ab05edfba3bd1df21145107167176280a2b14eb SHA256 3= 693d0b91739c01f838d53955f8c3fd9906347a9dde2338d94d7f2a169cd4a46 AUX icon/thunderbird.desktop 270 RMD160 09855ea05674863e5daca1465446ef60= dcc58ba8 SHA1 594b164f3d410497315a1bae4b1b0222786aca5e SHA256 e8756ac8a42= 1ac18f28b3620b2a021199f3bc4a3a9c566479a9b6697a5305dea AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d7362448204c7ea6cf= 81b06446373097e358d44 SHA1 b3e706e3c24eda4d87e3f13bd4a43dfb45a3dfb3 SHA25= 6 ecf4bafbf81675abb01c3e0f0ab9fdf3c5722868ed0440670e2a530ca85f219c DIST enigmail-1.3.2.tar.gz 1371388 RMD160 f9320279e67767a8023ac863b8d089= e370018201 SHA1 8bf39664f22e383d026c07d4acd714a1ccfd9d6d SHA256 46ffa0748= 29472ba6714e1ada37b8cc083d0dd4e16c21ad0c2893c5eef68893d -DIST thunderbird-7.0-patches-0.1.tar.bz2 2521 RMD160 33198b67001d73910c2= 92ad9e6b02473b0293670 SHA1 71036622e59e5ecfe0190b4213c82da959de0d3c SHA25= 6 1419e4544d4b7d2558f10b012da7abc5ea262d7b1291a92e3b4f4527eb8a7672 +DIST firefox-7.0-patches-0.5.tar.xz 14652 RMD160 94593a3e01247b4e5fe9c01= a80e902937ed3b32b SHA1 c9cfd5e46a18e4e6adfa8334936f854c3e14a687 SHA256 e2= f1de9cfbb87cd982ed205b3b5f33e3bcd952b2093a9969281a761cc0a9e293 +DIST thunderbird-7.0-patches-0.4.tar.xz 1600 RMD160 117ab25696595c601add= 3041142312ea0bc16685 SHA1 f343c165b7201ba34c5d794a508caa5ef42326e9 SHA256= ef5ee490574240dcc3d44dcd1f198a2a03405a396e557795c3bf65d22c1c060a DIST thunderbird-7.0.1-ar.xpi 427454 RMD160 b0749214d4b25657a491e621fb5f= f7942f54f53c SHA1 070f6e98f56bdbcf92ad851e255befac8235278c SHA256 d8b7890= d3036b0cf313c9f1c1bf5be13feeb75001d2732e3785667759cc16bc7 DIST thunderbird-7.0.1-ca.xpi 408520 RMD160 a3afd32ee13596dcad3235df389d= a876b2a02532 SHA1 ef6e6849be09550465a0404f7d3a73542029eecc SHA256 4bdb7ca= 95347516f11ab6bcd31adbfd5f6ebbba6936020d3164d5b56ef57839f DIST thunderbird-7.0.1-cs.xpi 408949 RMD160 cfa526dc82b597673a521dc20ec7= 781c5dd04de9 SHA1 3e27bbb05a106b529964d988a61e9a7c86227899 SHA256 783dde5= 2ce6153e555e2a0e3e712a4c7668abc5bf5e58c93ca72bc136c7f75db @@ -41,4 +41,4 @@ DIST thunderbird-7.0.1-tr.xpi 403127 RMD160 50dbfd65e13= f604d0d88dc8c675fec9b36ba DIST thunderbird-7.0.1-uk.xpi 454368 RMD160 a3f00a485bd9236a02b466f34f1d= 0634df8a4499 SHA1 09163cc5347c1baf0c0b475a2c0b7b4a779f60a2 SHA256 b2d7ab6= 7be708e4f3ed02d0701748c027250491f9aa41a0f60d150cd8fb41466 DIST thunderbird-7.0.1-zh-TW.xpi 420847 RMD160 95095a3f45c4dd38983d9e5d9= b6087e57600564e SHA1 defbc32b529699297e8f58642d0530ab2ee0d609 SHA256 7362= f1cc5541006c06f1373d1cd90a4c04d496b5b79443524af7d1654a73d668 DIST thunderbird-7.0.1.source.tar.bz2 87405591 RMD160 04d39464b5c7c3128a= 00b0eaff806b3307e0a22e SHA1 ccfc6fe3fe4ad07b214e20bc440d20e14d3ffbe5 SHA2= 56 83f578bbfa0cb5d0f7faba6214993806050fab3e2039996344a11c9457525242 -EBUILD thunderbird-7.0.1.ebuild 8533 RMD160 d7ca2e61c5049154bfaa4f2b1f2c= 4b7496c66e2a SHA1 295730ce2ea05e0f225c1caf21fae0dc77eb3fab SHA256 733758a= a12b96e3886cda0e8fe9f63759aeb1cd4b7ea069955a2cd136aa6e7eb +EBUILD thunderbird-7.0.1-r1.ebuild 8850 RMD160 28d8b4b1bfb9335ecaf4e60a5= d3c24774871a9ea SHA1 a08b50cad22859c3a5603506a2f53351c600d282 SHA256 c843= c0bb86cd469df6956496ee4d4651bcd033b171f652a75da36a862174af18 diff --git a/mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_ar= e_enabled.patch b/mail-client/thunderbird/files/Copy_xpcshell_only_if_tes= ts_are_enabled.patch deleted file mode 100644 index 342f7de..0000000 --- a/mail-client/thunderbird/files/Copy_xpcshell_only_if_tests_are_enabl= ed.patch +++ /dev/null @@ -1,71 +0,0 @@ -# HG changeset patch -# User Takanori MATSUURA -# Date 1311059208 -32400 -# Node ID 6d8318b1709e2259c1077ba1f80374bfc45af9ba -# Parent 6596041bb85c5106dc474767bc481c6522f926f3 -Bug 672286 - Copy xpcshell.ini only if ENABLE_TESTS is set; r=3DStandard= 8 - -diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in ---- a/mail/app/Makefile.in -+++ b/mail/app/Makefile.in -@@ -252,24 +252,27 @@ LIBS +=3D -lphexlib - endif -=20 - libs:: $(srcdir)/profile/prefs.js - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile -=20 - libs:: blocklist.xml - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin -=20 -+ifdef ENABLE_TESTS - # XXX This is a hack to ensure that we get the right xpcshell.ini for o= ur tests - # and that we can share the core mozilla-central xpcshell.ini. - # mozilla-central does this in testing/xpcshell-tests which means that = it is - # very hard for anyone to specify anything else. - libs:: -+ $(NSINSTALL) -D $(MOZDEPTH)/_tests/xpcshell - cp $(MOZILLA_SRCDIR)/testing/xpcshell/xpcshell.ini $(MOZDEPTH)/_tests/= xpcshell/xpcshell-core.ini - $(INSTALL) $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcs= hell - cp $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all= -test-dirs.list -+endif -=20 - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -=20 - AB :=3D $(firstword $(subst -, ,$(AB_CD))) -=20 - APP_NAME =3D $(MOZ_APP_DISPLAYNAME) -=20 - LOWER_APP_NAME =3D $(shell echo $(APP_NAME) | tr '[A-Z]' '[a-z]') -diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in ---- a/suite/app/Makefile.in -+++ b/suite/app/Makefile.in -@@ -216,24 +216,27 @@ ifeq ($(OS_ARCH),WINNT) - $(PERL) -pe 's/(? $(DIST)/bin/license.txt - else - $(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/ - endif -=20 - libs:: blocklist.xml - $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin -=20 -+ifdef ENABLE_TESTS - # XXX This is a hack to ensure that we get the right xpcshell.ini for o= ur tests - # and that we can share the core mozilla-central xpcshell.ini. - # mozilla-central does this in testing/xpcshell-tests which means that = it is - # very hard for anyone to specify anything else. - libs:: -+ $(NSINSTALL) -D $(MOZDEPTH)/_tests/xpcshell - cp $(MOZILLA_SRCDIR)/testing/xpcshell/xpcshell.ini $(MOZDEPTH)/_tests/= xpcshell/xpcshell-core.ini - $(INSTALL) $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpc= shell - cp $(topsrcdir)/suite/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/al= l-test-dirs.list -+endif -=20 - ifdef MOZ_OMNIJAR - # Make extensions end up as XPIs instead of flat chrome when doing omni= .jar. - # APP_EXTENSIONS exist only bundled with the application, - # PROFILE_EXTENSIONS will be copied to the profile in installed builds. - # NOTE: This is a hack to run this at the end of compilation, would be = nicer - # if this was done right away for built-in extensions in omnijar mode. - # Listed extension GUIDs: - - diff --git a/mail-client/thunderbird/thunderbird-7.0.1.ebuild b/mail-clie= nt/thunderbird/thunderbird-7.0.1-r1.ebuild similarity index 94% rename from mail-client/thunderbird/thunderbird-7.0.1.ebuild rename to mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild index 1aed28a..9d68c29 100644 --- a/mail-client/thunderbird/thunderbird-7.0.1.ebuild +++ b/mail-client/thunderbird/thunderbird-7.0.1-r1.ebuild @@ -18,12 +18,14 @@ KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~spa= rc ~x86 ~x86-fbsd ~amd64-linu SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"bindist gconf +crashreporter +crypt +ipc +lightning mozdom" -PATCH=3D"${PN}-7.0-patches-0.1" +PATCH=3D"${PN}-7.0-patches-0.4" +PATCHFF=3D"firefox-7.0-patches-0.5" =20 FTP_URI=3D"ftp://ftp.mozilla.org/pub/${PN}/releases/" SRC_URI=3D"${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMV= ER}.tar.gz ) - http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" + http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz + http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz" =20 if ! [[ ${PV} =3D~ alpha|beta ]]; then # This list can be updated using get_langs.sh from the mozilla overlay @@ -55,6 +57,7 @@ RDEPEND=3D">=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nspr-4.8.8 gconf? ( >=3Dgnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] + virtual/libffi !x11-plugins/lightning !x11-plugins/enigmail system-sqlite? ( >=3Ddev-db/sqlite-3.7.5[fts3,secure-delete,unlock-noti= fy,debug=3D] ) @@ -126,12 +129,17 @@ src_unpack() { } =20 src_prepare() { - # Apply our patches + # Apply our Thunderbird patchset EPATCH_SUFFIX=3D"patch" \ EPATCH_FORCE=3D"yes" \ - epatch "${WORKDIR}" + epatch "${WORKDIR}/thunderbird" =20 - epatch "${FILESDIR}/Copy_xpcshell_only_if_tests_are_enabled.patch" + # Apply our patchset from firefox to thunderbird as well + pushd "${S}"/mozilla &>/dev/null || die + EPATCH_SUFFIX=3D"patch" \ + EPATCH_FORCE=3D"yes" \ + epatch "${WORKDIR}/firefox" + popd &>/dev/null || die =20 if use crypt ; then mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail @@ -183,6 +191,7 @@ src_configure() { mozconfig_annotate '' --with-default-mozilla-five-home=3D"${EPREFIX}${M= OZILLA_FIVE_HOME}" mozconfig_annotate '' --with-user-appdir=3D.thunderbird mozconfig_annotate '' --with-system-png + mozconfig_annotate '' --enable-system-ffi =20 # Use enable features mozconfig_use_enable lightning calendar