May 2015 - tor-commits - lists.torproject.org

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 22 May '15

22 May '15

commit 2702b2dd770c4db4340bae4df49140ed29831372 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 15:15:55 2015 +0000 Update translations for torbutton-branddtd_completed --- ja/brand.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ja/brand.dtd b/ja/brand.dtd index dd9e0d2..2efb954 100644 --- a/ja/brand.dtd +++ b/ja/brand.dtd @@ -6,3 +6,9 @@ <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "FirefoxおよびFirefoxのロゴはMozilla財団の登録商標です。"> + + +<!ENTITY plugins.installed.find "クリックするとインストールされたシステムプラグインをロードします。"> +<!ENTITY plugins.installed.enable "プラグインを有効化"> +<!ENTITY plugins.installed.disable "プラグインを無効化"> +<!ENTITY plugins.installed.disable.tip "クリックするとインストールされたプラグインを読み込まなくします。">

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 22 May '15

22 May '15

commit 6b1d2efe34420b02e28981894207ad3d5b536493 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 15:15:51 2015 +0000 Update translations for torbutton-branddtd --- ja/brand.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ja/brand.dtd b/ja/brand.dtd index 35a8894..2efb954 100644 --- a/ja/brand.dtd +++ b/ja/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "FirefoxおよびFirefoxのロゴはMozilla財団の登録商標です。">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "クリックするとインストールされたシステムプラグインをロードします。"> +<!ENTITY plugins.installed.enable "プラグインを有効化"> +<!ENTITY plugins.installed.disable "プラグインを無効化"> +<!ENTITY plugins.installed.disable.tip "クリックするとインストールされたプラグインを読み込まなくします。">

1 0

[translation/tor_animation_completed] Update translations for tor_animation_completed
by translation＠torproject.org 22 May '15

22 May '15

commit 492334309439bc4c7cbf75cb26ad6dd2b7b7f80d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 14:46:09 2015 +0000 Update translations for tor_animation_completed --- ja.srt | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/ja.srt b/ja.srt new file mode 100644 index 0000000..d7f134e --- /dev/null +++ b/ja.srt @@ -0,0 +1,158 @@ +1 +00:00:00,660 --> 00:00:02,780 +私達はインターネットに親しむようになりました。 + +2 +00:00:03,120 --> 00:00:07,700 +私達は常に自分自身やプライベートな生活の情報を +インターネットに共有しています。 + +3 +00:00:08,000 --> 00:00:09,960 +食べたものや出会った人、 + +4 +00:00:10,180 --> 00:00:12,480 +行った場所や読んだもの。 + +5 +00:00:13,280 --> 00:00:14,640 +いいことを教えましょう。 + +6 +00:00:14,920 --> 00:00:17,740 +今この瞬間、 +もし誰かがあなたのことを探そうとしたら、 + +7 +00:00:18,060 --> 00:00:22,480 +その誰かはあなたのIDや正確な位置情報、使っているOS、 + +8 +00:00:22,800 --> 00:00:26,500 +過去に訪れた全てのWebサイト、 +Webを見るときに使っているブラウザー、 + +9 +00:00:26,700 --> 00:00:29,140 +その他多くのあなたの情報を見ることができます。 + +10 +00:00:29,200 --> 00:00:31,500 +もしあなたに、あなたを攻撃しようとする見知らぬ他人へ + +11 +00:00:31,700 --> 00:00:34,000 +情報を提供したつもりがなくても。 + +12 +00:00:34,500 --> 00:00:37,000 +でも Tor を使えば大丈夫！ + +13 +00:00:37,140 --> 00:00:40,840 +Tor Browser はインターネット上の +プライバシーと個人情報を守ります。 + +14 +00:00:41,560 --> 00:00:44,760 +Tor はセキュリティを高めるために +データを3重に暗号化し、 + +15 +00:00:44,940 --> 00:00:49,760 +世界中のボランティアにより運用される +サーバーを3回経由させます。 + +16 +00:00:50,280 --> 00:00:53,520 +これによりインターネットのあらゆる場所で +匿名でコミュニケーションすることができます。 + +17 +00:00:56,560 --> 00:00:58,280 +また、Tor は企業や政府による監視から + +18 +00:00:58,400 --> 00:01:01,900 +データを守ります。 + +19 +00:01:02,880 --> 00:01:07,340 +もしかするとあなたはインターネットを監視し、コントロールしようとする +抑圧的な国に住んでいるかもしれません。 + +20 +00:01:07,900 --> 00:01:11,800 +もしかするとあなたは個人情報を巨大企業に +与えたくないと思っているかもしれません。 + +21 +00:01:12,880 --> 00:01:15,640 +Tor は監視者を混乱させ +あなたを匿名にするために、 + +22 +00:01:15,920 --> 00:01:18,800 +全てのユーザーを全く同じ見た目に +見せかけます。 + +23 +00:01:19,500 --> 00:01:22,980 +つまり、もっとたくさんの人が +Tor ネットワークを利用するようになれば、 + +24 +00:01:23,140 --> 00:01:27,800 +同じ見た目の群衆の中へ +簡単にまぎれることができるようになるのです。 + +25 +00:01:28,700 --> 00:01:31,240 +あなたがインターネット上で行っていることを知ろうとする + +26 +00:01:31,400 --> 00:01:34,100 +監視者をバイパスすることができます。 + +27 +00:01:36,540 --> 00:01:39,440 +初めてあなたが商品をクリックして以来、 +いつもあなたを追跡していた広告は + +28 +00:01:39,640 --> 00:01:41,300 +もうあなたを追跡することができません。 + +29 +00:01:43,880 --> 00:01:47,380 +Tor を使うことで、あなたが訪問したサイトは +あなたが誰なのか、 + +30 +00:01:47,540 --> 00:01:49,760 +世界のどこから訪れたのか +分からなくなります。 + +31 +00:01:49,920 --> 00:01:51,920 +あなたがログインして、教えてあげるまでは。 + +32 +00:01:54,200 --> 00:01:55,840 +Tor をダウンロードして利用することで、 + +33 +00:01:56,200 --> 00:01:58,560 +あなたは匿名を欲している人々、例えば… + +34 +00:01:58,880 --> 00:02:01,640 +活動家やジャーナリスト、ブロガーを +守ることができます。 + +35 +00:02:02,000 --> 00:02:07,000 +Tor をダウンロードして利用しましょう！ +または、リレーを実行しましょう！ +

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 22 May '15

22 May '15

commit e8e4ce3c4c99f5853c14cdd79ff32ce7d0395553 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 14:46:06 2015 +0000 Update translations for tor_animation --- ja.srt | 87 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/ja.srt b/ja.srt index 58813ef..d7f134e 100644 --- a/ja.srt +++ b/ja.srt @@ -39,125 +39,120 @@ Webを見るときに使っているブラウザー、 10 00:00:29,200 --> 00:00:31,500 -もし見知らぬ人と情報を共有したつもりが -あなたになかったとしても。 +もしあなたに、あなたを攻撃しようとする見知らぬ他人へ 11 00:00:31,700 --> 00:00:34,000 -who could easily use this data -to exploit you. +情報を提供したつもりがなくても。 12 00:00:34,500 --> 00:00:37,000 -But not if you're using Tor! +でも Tor を使えば大丈夫！ 13 00:00:37,140 --> 00:00:40,840 -Tor Browser protects our privacy -and identity on the Internet. +Tor Browser はインターネット上の +プライバシーと個人情報を守ります。 14 00:00:41,560 --> 00:00:44,760 -Tor secures your connection -with three layers of encryption +Tor はセキュリティを高めるために +データを3重に暗号化し、 15 00:00:44,940 --> 00:00:49,760 -and passes it through three voluntarily -operated servers around the world, +世界中のボランティアにより運用される +サーバーを3回経由させます。 16 00:00:50,280 --> 00:00:53,520 -which enables us to communicate -anonymously over the Internet. +これによりインターネットのあらゆる場所で +匿名でコミュニケーションすることができます。 17 00:00:56,560 --> 00:00:58,280 -Tor also protects our data +また、Tor は企業や政府による監視から 18 00:00:58,400 --> 00:01:01,900 -against corporate or government targeted -and mass surveillance. +データを守ります。 19 00:01:02,880 --> 00:01:07,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +もしかするとあなたはインターネットを監視し、コントロールしようとする +抑圧的な国に住んでいるかもしれません。 20 00:01:07,900 --> 00:01:11,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +もしかするとあなたは個人情報を巨大企業に +与えたくないと思っているかもしれません。 21 00:01:12,880 --> 00:01:15,640 -Tor makes all of its users -to look the same +Tor は監視者を混乱させ +あなたを匿名にするために、 22 00:01:15,920 --> 00:01:18,800 -which confuses the observer -and makes you anonymous. +全てのユーザーを全く同じ見た目に +見せかけます。 23 00:01:19,500 --> 00:01:22,980 -So, the more people use the Tor network, -the stronger it gets +つまり、もっとたくさんの人が +Tor ネットワークを利用するようになれば、 24 00:01:23,140 --> 00:01:27,800 -as it's easier to hide in a crowd -of people who look exactly the same. +同じ見た目の群衆の中へ +簡単にまぎれることができるようになるのです。 25 00:01:28,700 --> 00:01:31,240 -You can bypass the censorship -without being worried about +あなたがインターネット上で行っていることを知ろうとする 26 00:01:31,400 --> 00:01:34,100 -the censor knowing what you do -on the Internet. +監視者をバイパスすることができます。 27 00:01:36,540 --> 00:01:39,440 -The ads won't follow you -everywhere for months, +初めてあなたが商品をクリックして以来、 +いつもあなたを追跡していた広告は 28 00:01:39,640 --> 00:01:41,300 -starting when you first -clicked on a product. +もうあなたを追跡することができません。 29 00:01:43,880 --> 00:01:47,380 -By using Tor, the sites you visit -won't even know who you are, +Tor を使うことで、あなたが訪問したサイトは +あなたが誰なのか、 30 00:01:47,540 --> 00:01:49,760 -from what part of the world -you're visiting them, +世界のどこから訪れたのか +分からなくなります。 31 00:01:49,920 --> 00:01:51,920 -unless you login and tell them so. +あなたがログインして、教えてあげるまでは。 32 00:01:54,200 --> 00:01:55,840 -By downloading and using Tor, +Tor をダウンロードして利用することで、 33 00:01:56,200 --> 00:01:58,560 -you can protect the people -who need anonymity, +あなたは匿名を欲している人々、例えば… 34 00:01:58,880 --> 00:02:01,640 -like activists, journalists and bloggers. +活動家やジャーナリスト、ブロガーを +守ることができます。 35 00:02:02,000 --> 00:02:07,000 -Download and use Tor! Or run a relay! +Tor をダウンロードして利用しましょう！ +または、リレーを実行しましょう！

1 0

[tor/master] Revert "Try using SSL_get_ciphers in place of session->ciphers"
by nickm＠torproject.org 22 May '15

22 May '15

commit c8024b633eeff6161292666b209b538fda9df4ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 22 10:22:11 2015 -0400 Revert "Try using SSL_get_ciphers in place of session->ciphers" This reverts commit 67964cfa787461bc56380fe46439fd5c9863bb4f. It was the cause of #16153, and was not in any released Tor. We need a better solution for getting session->ciphers. --- src/common/tortls.c | 36 +++++------------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 57d5408..2b8daaa 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1597,39 +1597,13 @@ tor_tls_classify_client_ciphers(const SSL *ssl, static int tor_tls_client_is_using_v2_ciphers(const SSL *ssl) { - STACK_OF(SSL_CIPHER) *ciphers = SSL_get_ciphers(ssl); - -#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0) - { - SSL_SESSION *session; - STACK_OF(SSL_CIPHER) *c1; - int i; - if (!(session = SSL_get_session((SSL *)ssl))) { - log_info(LD_NET, "No session on TLS?"); - return CIPHERS_ERR; - } - c1 = session->ciphers; - - if (sk_SSL_CIPHER_num(c1) != sk_SSL_CIPHER_num(ciphers)) { - log_warn(LD_BUG, "Whoops. session->ciphers doesn't " - "match SSL_get_ciphers()"); - return 0; - } - for (i = 0; i < sk_SSL_CIPHER_num(c1); ++i) { - SSL_CIPHER *a = sk_SSL_CIPHER_value(ciphers, i); - SSL_CIPHER *b = sk_SSL_CIPHER_value(c1, i); - unsigned long a_id = SSL_CIPHER_get_id(a); - unsigned long b_id = SSL_CIPHER_get_id(b); - if (a_id != b_id) { - log_warn(LD_BUG, "Cipher mismatch between session->ciphers and " - "SSL_get_ciphers() at %d: %lx vs %lx", i, - a_id, b_id); - } - } + SSL_SESSION *session; + if (!(session = SSL_get_session((SSL *)ssl))) { + log_info(LD_NET, "No session on TLS?"); + return CIPHERS_ERR; } -#endif - return tor_tls_classify_client_ciphers(ssl, ciphers) >= CIPHERS_V2; + return tor_tls_classify_client_ciphers(ssl, session->ciphers) >= CIPHERS_V2; } /** Invoked when we're accepting a connection on <b>ssl</b>, and the connection

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 22 May '15

22 May '15

commit 1c325b6aec2922438e65981e154f6c1ec501fb9d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 14:16:18 2015 +0000 Update translations for torbutton-aboutdialogdtd_completed --- ja/aboutdialog.dtd | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ja/aboutdialog.dtd b/ja/aboutdialog.dtd new file mode 100644 index 0000000..b17b17b --- /dev/null +++ b/ja/aboutdialog.dtd @@ -0,0 +1,19 @@ +<!ENTITY project.start "&brandShortName; は"> + +<!ENTITY project.tpoLink "&vendorShortName; によって開発されました。"> +<!ENTITY project.end "あなたのオンラインでのプライバシーと自由を守る非営利団体です。"> + +<!ENTITY help.start "支援に興味がありますか？"> + +<!ENTITY help.donateLink "寄付"> +<!ENTITY help.or "や"> + +<!ENTITY help.getInvolvedLink "参加"> +<!ENTITY help.end "で支援してください！"> + +<!ENTITY bottomLinks.questions "質問がありますか？"> + +<!ENTITY bottomLinks.grow "Tor ネットワークを育てましょう！"> + +<!ENTITY bottomLinks.license "ライセンス情報"> +<!ENTITY tor.TrademarkStatement "'Tor' と 'Onion Logo' は Tor Project, Inc. の登録商標です。">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 22 May '15

22 May '15

commit ab87220a204af3d43811191bbd9deb65ea7b59a7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 14:16:14 2015 +0000 Update translations for torbutton-aboutdialogdtd --- ja/aboutdialog.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ja/aboutdialog.dtd b/ja/aboutdialog.dtd index 5099ad7..b17b17b 100644 --- a/ja/aboutdialog.dtd +++ b/ja/aboutdialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; は">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "&vendorShortName; によって開発されました。"> +<!ENTITY project.end "あなたのオンラインでのプライバシーと自由を守る非営利団体です。"> -<!ENTITY help.start "Want to help? "> +<!ENTITY help.start "支援に興味がありますか？">  -<!ENTITY help.donateLink "Donate"> -<!ENTITY help.or " or "> +<!ENTITY help.donateLink "寄付"> +<!ENTITY help.or "や">  -<!ENTITY help.getInvolvedLink "get involved"> -<!ENTITY help.end "!"> +<!ENTITY help.getInvolvedLink "参加"> +<!ENTITY help.end "で支援してください！">  -<!ENTITY bottomLinks.questions "Questions?"> +<!ENTITY bottomLinks.questions "質問がありますか？">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Tor ネットワークを育てましょう！">  -<!ENTITY bottomLinks.license "Licensing Information"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY bottomLinks.license "ライセンス情報"> +<!ENTITY tor.TrademarkStatement "'Tor' と 'Onion Logo' は Tor Project, Inc. の登録商標です。">

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 22 May '15

22 May '15

commit 7b04dc46dcf3b28a8a9da747ca692da60b459198 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 14:16:08 2015 +0000 Update translations for tor_animation --- ja.srt | 82 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/ja.srt b/ja.srt index 78c998d..58813ef 100644 --- a/ja.srt +++ b/ja.srt @@ -1,165 +1,163 @@ 1 00:00:00,660 --> 00:00:02,780 -We've gotten very used to the Internet. +私達はインターネットに親しむようになりました。 2 00:00:03,120 --> 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +私達は常に自分自身やプライベートな生活の情報を +インターネットに共有しています。 3 00:00:08,000 --> 00:00:09,960 -food we eat, people we meet, +食べたものや出会った人、 4 00:00:10,180 --> 00:00:12,480 -places we go, and the stuff we read. +行った場所や読んだもの。 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +いいことを教えましょう。 6 00:00:14,920 --> 00:00:17,740 -Right at this moment, -if someone attempts to look you up, +今この瞬間、 +もし誰かがあなたのことを探そうとしたら、 7 00:00:18,060 --> 00:00:22,480 -they'll see your real identity, -precise location, operating system, +その誰かはあなたのIDや正確な位置情報、使っているOS、 8 00:00:22,800 --> 00:00:26,500 -all the sites you've visited, -the browser you use to surf the web, +過去に訪れた全てのWebサイト、 +Webを見るときに使っているブラウザー、 9 00:00:26,700 --> 00:00:29,140 -and so much more information -about you and your life +その他多くのあなたの情報を見ることができます。 10 -00:00:29,620 --> 00:00:32,460 -which you probably didn't mean -to share with unknown strangers, +00:00:29,200 --> 00:00:31,500 +もし見知らぬ人と情報を共有したつもりが +あなたになかったとしても。 11 -00:00:32,920 --> 00:00:35,840 +00:00:31,700 --> 00:00:34,000 who could easily use this data to exploit you. 12 -00:00:36,220 --> 00:00:38,120 +00:00:34,500 --> 00:00:37,000 But not if you're using Tor! 13 -00:00:39,140 --> 00:00:42,840 +00:00:37,140 --> 00:00:40,840 Tor Browser protects our privacy and identity on the Internet. 14 -00:00:43,560 --> 00:00:46,760 +00:00:41,560 --> 00:00:44,760 Tor secures your connection with three layers of encryption 15 -00:00:46,940 --> 00:00:51,760 +00:00:44,940 --> 00:00:49,760 and passes it through three voluntarily operated servers around the world, 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 which enables us to communicate anonymously over the Internet. 17 -00:00:58,560 --> 00:01:00,280 +00:00:56,560 --> 00:00:58,280 Tor also protects our data 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 against corporate or government targeted and mass surveillance. 19 -00:01:04,880 --> 00:01:09,340 +00:01:02,880 --> 00:01:07,340 Perhaps you live in a repressive country which tries to control and surveil the Internet. 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 Or perhaps you don't want big corporations taking advantage of your personal information. 21 -00:01:14,880 --> 00:01:17,640 +00:01:12,880 --> 00:01:15,640 Tor makes all of its users to look the same 22 -00:01:17,920 --> 00:01:20,800 +00:01:15,920 --> 00:01:18,800 which confuses the observer and makes you anonymous. 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 So, the more people use the Tor network, the stronger it gets 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 as it's easier to hide in a crowd of people who look exactly the same. 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 You can bypass the censorship without being worried about 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 the censor knowing what you do on the Internet. 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 The ads won't follow you everywhere for months, 28 -00:01:41,640 --> 00:01:43,300 +00:01:39,640 --> 00:01:41,300 starting when you first clicked on a product. 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 By using Tor, the sites you visit won't even know who you are, 30 -00:01:49,540 --> 00:01:51,760 +00:01:47,540 --> 00:01:49,760 from what part of the world you're visiting them, 31 -00:01:51,920 --> 00:01:53,920 +00:01:49,920 --> 00:01:51,920 unless you login and tell them so. 32 -00:01:56,200 --> 00:01:57,840 +00:01:54,200 --> 00:01:55,840 By downloading and using Tor, 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 you can protect the people who need anonymity, 34 -00:02:00,880 --> 00:02:03,640 +00:01:58,880 --> 00:02:01,640 like activists, journalists and bloggers. 35 -00:02:04,000 --> 00:02:09,000 +00:02:02,000 --> 00:02:07,000 Download and use Tor! Or run a relay!

1 0

[tor-messenger-build/master] instantbird: add comm-central patch to fix bug 1150967
by boklm＠torproject.org 22 May '15

22 May '15

commit d603ba7b995b9d074ec5b817fec256d1da883dff Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 22 13:16:39 2015 +0200 instantbird: add comm-central patch to fix bug 1150967 --- projects/instantbird/config | 2 + .../instantbird/f2e7cea9bc6a-bug-1150967.patch | 86 ++++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 4959816..e6813fb 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -82,6 +82,8 @@ input_files: - filename: branding/default48.png - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' + - filename: f2e7cea9bc6a-bug-1150967.patch + enable: '[% c("var/windows") %]' - filename: 824009fbc42f.mozpatch enable: '[% c("var/windows") %]' - filename: Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch diff --git a/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch b/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch new file mode 100644 index 0000000..223019c --- /dev/null +++ b/projects/instantbird/f2e7cea9bc6a-bug-1150967.patch @@ -0,0 +1,86 @@ +# HG changeset patch +# User Sebastian Hengst <archaeopteryx(a)coole-files.de> +# Date 1428083489 -7200 +# Fri Apr 03 19:51:29 2015 +0200 +# Node ID f2e7cea9bc6aca3140fb49512d4cc16f85988540 +# Parent 1cc7a71a04355c949421c3789386c48af37f5f3b +Bug 1150967 - Port Bug 1147839 - Fix building installer on mingw by only including helper.exe if mknsisu is used. r=clokep,mkmelin,Neil a=Ratty for SeaMonkey CLOSED TREE + +diff -r 1cc7a71a0435 -r f2e7cea9bc6a im/installer/Makefile.in +--- a/im/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 ++++ b/im/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 +@@ -93,6 +93,10 @@ + DEFINES += -DMOZ_PURPLE + endif + ++ifdef MAKENSISU ++DEFINES += -DHAVE_MAKENSISU=1 ++endif ++ + ifdef MOZ_PKG_MANIFEST_P + MOZ_PKG_MANIFEST = package-manifest + +diff -r 1cc7a71a0435 -r f2e7cea9bc6a im/installer/package-manifest.in +--- a/im/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 ++++ b/im/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 +@@ -52,7 +52,7 @@ + @RESPATH@/searchplugins/* + @RESPATH@/dictionaries/* + @RESPATH@/hyphenation/* +-#ifdef XP_WIN32 ++#ifdef HAVE_MAKENSISU + @BINPATH@/uninstall/helper.exe + #endif + #ifdef MOZ_UPDATER +diff -r 1cc7a71a0435 -r f2e7cea9bc6a mail/installer/Makefile.in +--- a/mail/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 ++++ b/mail/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 +@@ -87,6 +87,10 @@ + DEFINES += -DMOZ_SHARED_MOZGLUE=1 + endif + ++ifdef MAKENSISU ++DEFINES += -DHAVE_MAKENSISU=1 ++endif ++ + ifdef MOZ_PKG_MANIFEST_P + MOZ_PKG_MANIFEST = package-manifest + +diff -r 1cc7a71a0435 -r f2e7cea9bc6a mail/installer/package-manifest.in +--- a/mail/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 ++++ b/mail/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 +@@ -53,7 +53,7 @@ + @RESPATH@/searchplugins/* + @RESPATH@/dictionaries/* + @RESPATH@/hyphenation/* +-#ifdef XP_WIN32 ++#ifdef HAVE_MAKENSISU + @BINPATH@/uninstall/helper.exe + #endif + #ifdef MOZ_UPDATER +diff -r 1cc7a71a0435 -r f2e7cea9bc6a suite/installer/Makefile.in +--- a/suite/installer/Makefile.in Thu Apr 02 19:46:06 2015 +0200 ++++ b/suite/installer/Makefile.in Fri Apr 03 19:51:29 2015 +0200 +@@ -121,6 +121,10 @@ + + DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) + ++ifdef MAKENSISU ++DEFINES += -DHAVE_MAKENSISU=1 ++endif ++ + ifdef MOZ_PKG_MANIFEST_P + MOZ_PKG_MANIFEST = package-manifest + +diff -r 1cc7a71a0435 -r f2e7cea9bc6a suite/installer/package-manifest.in +--- a/suite/installer/package-manifest.in Thu Apr 02 19:46:06 2015 +0200 ++++ b/suite/installer/package-manifest.in Fri Apr 03 19:51:29 2015 +0200 +@@ -54,7 +54,7 @@ + @RESPATH@/hyphenation/* + @RESPATH@/@PREF_DIR@/suite-l10n.js + @RESPATH@/searchplugins/* +-#ifdef XP_WIN32 ++#ifdef HAVE_MAKENSISU + @BINPATH@/uninstall/helper.exe + #endif + #ifdef MOZ_UPDATER

1 0

[tor-messenger-build/master] instantbird: add patch to fix bug 1133689
by boklm＠torproject.org 22 May '15

22 May '15

commit 41acbc90ee38ed95b7fbe27e6be4c8bfa3c5e233 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri May 22 12:37:03 2015 +0200 instantbird: add patch to fix bug 1133689 --- ...ckport-Make-D3DVsyncDisplay-destructor.mozpatch | 45 ++++++++++++++++++++ projects/instantbird/config | 2 + 2 files changed, 47 insertions(+) diff --git a/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch b/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch new file mode 100644 index 0000000..7e891c1 --- /dev/null +++ b/projects/instantbird/Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch @@ -0,0 +1,45 @@ +From 6f443d4c93cee1df3ad645b06d1441df8c3706a3 Mon Sep 17 00:00:00 2001 +From: Nicolas Vigier <boklm(a)torproject.org> +Date: Fri, 22 May 2015 12:27:53 +0200 +Subject: [PATCH] Bug 1133689 (backport) - Make D3DVsyncDisplay destructor + private. + +--- + gfx/thebes/gfxWindowsPlatform.cpp | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp +index 37e6907fb3cb..5a7b18cc97da 100644 +--- a/gfx/thebes/gfxWindowsPlatform.cpp ++++ b/gfx/thebes/gfxWindowsPlatform.cpp +@@ -2001,13 +2001,6 @@ public: + mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate); + } + +- virtual ~D3DVsyncDisplay() +- { +- MOZ_ASSERT(NS_IsMainThread()); +- DisableVsync(); +- delete mVsyncThread; +- } +- + virtual void EnableVsync() override + { + MOZ_ASSERT(NS_IsMainThread()); +@@ -2110,6 +2103,13 @@ public: + } + + private: ++ virtual ~D3DVsyncDisplay() ++ { ++ MOZ_ASSERT(NS_IsMainThread()); ++ DisableVsync(); ++ delete mVsyncThread; ++ } ++ + bool IsInVsyncThread() + { + return mVsyncThread->thread_id() == PlatformThread::CurrentId(); +-- +2.1.0 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 3b0ca9c..4959816 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -84,6 +84,8 @@ input_files: enable: '[% c("var/windows") %]' - filename: 824009fbc42f.mozpatch enable: '[% c("var/windows") %]' + - filename: Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch + enable: '[% c("var/windows") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python

1 0