[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ...

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ...
Date: Sun, 10 Apr 2011 06:56:24 +0000 (UTC)	[thread overview]
Message-ID: <c94399fbb43c3ba420d5c9fd970a1bb9eedae545.polynomial-c@gentoo> (raw)

commit:     c94399fbb43c3ba420d5c9fd970a1bb9eedae545
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 06:55:16 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 06:55:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=c94399fb

seamonkey: 2.1b3 was re-released so revbumped the ebuild.

---
 www-client/seamonkey/Manifest                      |    4 +-
 ...key-2.1b3-restore-tabbar-scrolling-from-b2.diff |   51 ++++++++++++++++++++
 ...enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch |   11 ++++
 ..._beta3.ebuild => seamonkey-2.1_beta3-r1.ebuild} |    7 ++-
 4 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index e096ab7..5308f90 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,11 +1,13 @@
 AUX 2.1/seamonkey-2.1b1-configure-fix.patch 690 RMD160 854bf17b5b5b5806c4936f80fbbd971e822a88e0 SHA1 10c39ddf76e3638fced4e48bbc2443b4eb88078c SHA256 f4b4a786ff743e9618d663832fbe7f21b36b0f84e1bf04cd0dae106da18fd2f4
 AUX 2.1/seamonkey-2.1b2-gconf-config-update.patch 1569 RMD160 e237530c4d95de84aa295927fd1c703d8a54b9a9 SHA1 6f78524f88fd7b3f4fef4eec1666eabe96c89992 SHA256 9da47f2752f7bb353297b93be3aaecf2d6004af3c91717d22e35a347ee6cf2a2
 AUX 2.1/seamonkey-2.1b2-system-cairo-fixup.patch 3364 RMD160 e823edc67c7d0984fed7645b09c417b93eb663ed SHA1 62b3f66be453a2fb13e2504858849aaef72bbb44 SHA256 fac11adcee4f506a005725a5741f55ba55810f7bcfc82fce5fba4317c84f4be5
+AUX 2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-b2.diff 1617 RMD160 085b370c0424130b5a773cb4621ec749f961d890 SHA1 9d8e6a27e170f5b93ada3d299c2b7828701945c2 SHA256 1c6e20c190412d72787e73d8beb3d9d676db73e569854f2b135be990a4f75763
 AUX 2.1/seamonkey-libnotify07.patch 1117 RMD160 d9258ba252d3c94e8ac706424e94f055b278b499 SHA1 22502e4414f125efbada4812116f1e189c749782 SHA256 05ed978e07d1d74b38c53b205f98cc502dc6ce31cb04a21ad5f20a7a2fb5bdac
 AUX 2.1/xulrunner-libpng15.diff 446 RMD160 a6b43dde909929befa6b7ec38f0fb51d0ddf4ac5 SHA1 6e9dd65b774022111c6723bda5341acadef8b040 SHA256 ece56d83be83178bc05bcd3b11251624371522d2db932974f4a6e72f49857e51
 AUX all-gentoo.js 788 RMD160 08464d4a78e2126dce9e482988af1720d54a087d SHA1 74aed071070a8d896b655fd975da67329939339c SHA256 3ca0cbee6ca3d8857e7afadcfe76f65bd9c4130936602a1dbabb484406df0f45
 AUX enigmail/enigmail-1.1.2-20110124-makefile.diff 1572 RMD160 3840707bebdc8785ea08689cc95e0b762ca116f5 SHA1 0b607adf7af0d4d9a969b2c14abb19e1c9e94888 SHA256 9fc6c5d59864d53536ff755a2245ec60c61a4ffa2a81920c869687e5604f3144
 AUX enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch 388 RMD160 978e6888f0dd25fae9f59e594c800c64626607dd SHA1 08261cf1027d10723fa74d2e00f20b734d679983 SHA256 3ed44f737ad3eb89eb58bb03cb375579b2002d0ac06982b0d17f281041c42959
+AUX enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch 388 RMD160 50285565b464fcf11ea2c4332f99a595c8543cc8 SHA1 137ebbc0441e290b56879525a31cba1a7977cd93 SHA256 935ad53a3a6e042d8a3f890d2dcb96cbfc3a81779fdd1f15b6eaa14b69334d75
 AUX icon/seamonkey.desktop 285 RMD160 b684a071867d4d66799dd6b08187c6b66fa789bb SHA1 e95f4f7ab1d2c436e3b641768ce6514367992f56 SHA256 a95d1da8080d4e83f399b0ffeefa20d0a6fd0dc8a3da8edc41cd8cedb34557f7
 AUX icon/seamonkey.png 4172 RMD160 d296c4d4e0920e4476f4c6c607946434202ad521 SHA1 f76213195e2dc002ff2e411ed0247d2624ce7b09 SHA256 7ffc1911a62b526702f3c991365dd8f18b6427c7e173456a101db4fb4c43ae59
 DIST enigmail-1.1.2-20110124.tar.bz2 862291 RMD160 6b7b4a9a4295c5d0b0ff149d3750b3c059e29d47 SHA1 a4d81224def58e68ca6b8fc291b93d3598279096 SHA256 89c24933ccdf765d5a0928127a5139e3f800a2b5bf7c20020d0870e78e70f044
@@ -40,4 +42,4 @@ DIST seamonkey-2.1b3-ru.xpi 891638 RMD160 58ea86a0c9552ec939782ae07245e6fb65bdf2
 DIST seamonkey-2.1b3-sk.xpi 843090 RMD160 32f1c70a1bb5635c7e57d6b7862601398ba31594 SHA1 9d87f6882d2548a68df190d8f47ed0f63a2c0431 SHA256 01d4a0e2aae52ee6acc7388e16cbb5b00f370a30d9e2335ed22c23fb7e9d9f6a
 DIST seamonkey-2.1b3.source.tar.bz2 84193584 RMD160 6d4f1d224d680e6fed773ba5306cbabcbae4ca62 SHA1 7b4ba58cf5df42cec8e840f2f0416604a1ad87d9 SHA256 97afefa90d86c873d3e78238bab44f57efedba296291fe0320458b26df9d9ec9
 EBUILD seamonkey-2.1_beta2.ebuild 9938 RMD160 d25cfd907b05a60add6f2e5783f6bdfa45b7dcf9 SHA1 8c9c3737078166fa0a5501b149ac72e7448fb99f SHA256 3f19c147f4528374ac731d3bdca8f3eb179b8a7135334d904b896313efa7e8b3
-EBUILD seamonkey-2.1_beta3.ebuild 9731 RMD160 f252ce3190eb820693aa9e51de606251ae56b403 SHA1 fec1a3775b5d59ae5a6ace660b83e3f40fd72d85 SHA256 6d007d8c69e2e7dea744167e2813d81b52251ace29454f637b95515a780875fd
+EBUILD seamonkey-2.1_beta3-r1.ebuild 9878 RMD160 76c30a9727f076351a3b76380fa25de9a45dac04 SHA1 4158b2d86a17fe4c47ebe8aa0e44bc0fa24a15d8 SHA256 c1f33886625ca99ad5bfb95145580340619356cf5491d074852d9b2eacf585c7

diff --git a/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-b2.diff b/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-b2.diff
new file mode 100644
index 0000000..d42312c
--- /dev/null
+++ b/www-client/seamonkey/files/2.1/seamonkey-2.1b3-restore-tabbar-scrolling-from-b2.diff
@@ -0,0 +1,51 @@
+
+diff --git a/suite/browser/tabbrowser.xml b/suite/browser/tabbrowser.xml
+--- a/suite/browser/tabbrowser.xml
++++ b/suite/browser/tabbrowser.xml
+@@ -2995,17 +2995,17 @@
+           tab.style.minWidth = this.mPrefs.getIntPref("browser.tabs.tabMinWidth") + "px";
+           tab.style.maxWidth = this.mPrefs.getIntPref("browser.tabs.tabMaxWidth") + "px";
+           window.addEventListener("resize", this, false);
+         ]]>
+       </constructor>
+ 
+       <destructor>
+         <![CDATA[
+-          document.removeEventListener("resize", this, false);
++          window.removeEventListener("resize", this, false);
+         ]]>
+       </destructor>
+ 
+       <field name="mPrefs" readonly="true">
+         Components.classes["@mozilla.org/preferences-service;1"]
+                   .getService(Components.interfaces.nsIPrefBranch2);
+       </field>
+ 
+@@ -3118,16 +3118,23 @@
+       <handler event="TabSelect" action="this._handleTabSelect();"/>
+ 
+       <handler event="transitionend">
+         <![CDATA[
+           if (event.propertyName == "max-width")
+             this._handleNewTab(event.target);
+         ]]>
+       </handler>
++
++      <handler event="DOMMouseScroll" phase="capturing">
++        <![CDATA[
++          this.advanceSelectedTab(event.detail < 0 ? -1 : 1);
++          event.stopPropagation();
++        ]]>
++      </handler>
+     </handlers>
+   </binding>
+ 
+   <binding id="tabbrowser-alltabs-popup"
+            extends="chrome://global/content/bindings/popup.xml#popup">
+     <implementation implements="nsIDOMEventListener">
+       <method name="_tabOnTabClose">
+         <parameter name="aEvent"/>
+
+
+
+

diff --git a/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
new file mode 100644
index 0000000..7714844
--- /dev/null
+++ b/www-client/seamonkey/files/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
@@ -0,0 +1,11 @@
+--- enigmail/package/install.rdf
++++ enigmail/package/install.rdf
+@@ -23,7 +23,7 @@
+       <Description>
+         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+         <em:minVersion>2.1a1pre</em:minVersion>
+-        <em:maxVersion>2.1a2</em:maxVersion>
++        <em:maxVersion>2.1b3</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <em:targetApplication>

diff --git a/www-client/seamonkey/seamonkey-2.1_beta3.ebuild b/www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild
similarity index 97%
rename from www-client/seamonkey/seamonkey-2.1_beta3.ebuild
rename to www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild
index 5b20c71..32f7cff 100644
--- a/www-client/seamonkey/seamonkey-2.1_beta3.ebuild
+++ b/www-client/seamonkey/seamonkey-2.1_beta3-r1.ebuild
@@ -19,6 +19,8 @@ MY_PV="${MY_PV/_beta/b}"
 MY_PV="${MY_PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
 
+[[ ${MY_PV} == 2.1b3 ]] && MY_PV="${MY_PV}-real"
+
 # release versions usually have language packs. So be careful with changing this.
 HAS_LANGS="true"
 if [[ ${PV} == *_pre* ]] ; then
@@ -144,10 +146,13 @@ src_prepare() {
 	fi
 	epatch "${FILESDIR}"/2.1/${PN}-2.1b2-gconf-config-update.patch
 
+	EPATCH_OPTS="-R" \
+	epatch "${FILESDIR}"/2.1/${PN}-2.1b3-restore-tabbar-scrolling-from-b2.diff
+
 	if use crypt && use mailclient ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
 		cd "${S}"/mailnews/extensions/enigmail || die
-		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b2-versionfix.patch
+		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-seamonkey-2.1b3-versionfix.patch
 		epatch "${FILESDIR}"/enigmail/enigmail-1.1.2-20110124-makefile.diff
 		eautomake
 		makemake2

next             reply	other threads:[~2011-04-10  6:56 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-10  6:56 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-02-09  5:55 [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, Lars Wendler
2011-06-23 10:07 Lars Wendler
2011-03-01 22:51 Lars Wendler
2011-02-13 11:47 Lars Wendler

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e096ab7 dfblob:5308f90 dfblob:d42312c dfblob:7714844
dfblob:5b20c71 dfblob:32f7cff )
 OR (
bs:"[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/enigmail/, www-client/seamonkey/, ..." )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c94399fbb43c3ba420d5c9fd970a1bb9eedae545.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox