commit 6f79eec63edb3bd7ca356bec4768a0c475275dd6 Author: Nicolas Vigier boklm@torproject.org Date: Thu Oct 8 17:28:34 2015 +0200

Add patch to fix OSX build --- ...move-a-dead-iOS-related-conditional-fr.mozpatch | 31 ++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 33 insertions(+)

diff --git a/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch b/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch new file mode 100644 index 0000000..895626e --- /dev/null +++ b/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch @@ -0,0 +1,31 @@ +From ee0ef02a1fa4e473201bfbdcee8cea9cf5bd3357 Mon Sep 17 00:00:00 2001 +From: Ted Mielczarek ted@mielczarek.org +Date: Mon, 13 Jul 2015 07:20:30 -0400 +Subject: [PATCH] bug 1183129 - Remove a dead iOS-related conditional from + configure.in. r=glandium + +--HG-- +extra : rebase_source : 59f06d0f9e6734dc005e5458a05da062367d71cb +--- + configure.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index f76c761739d2..7f38650138c8 100644 +--- a/configure.in ++++ b/configure.in +@@ -4345,10 +4345,7 @@ cairo-cocoa) + CXXFLAGS="$CXXFLAGS $TK_CFLAGS" + MOZ_USER_DIR="Mozilla" + MOZ_FS_LAYOUT=bundle +- # skip event loop instrumentation on UIKit for now +- if test "$MOZ_WIDGET_TOOLKIT" == "cocoa"; then +- MOZ_INSTRUMENT_EVENT_LOOP=1 +- fi ++ MOZ_INSTRUMENT_EVENT_LOOP=1 + ;; + + cairo-uikit) +-- +2.1.0 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 2674ba2..a385bd0 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -130,6 +130,8 @@ input_files: - filename: block-plugins.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' + - filename: 0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch + enable: '[% c("var/osx") %]' - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: python