diff options
Diffstat (limited to 'source/xap/mozilla-thunderbird')
| -rwxr-xr-x | source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild | 3 | ||||
| -rw-r--r-- | source/xap/mozilla-thunderbird/mozilla.rust_1_29_0.patch | 43 |
2 files changed, 0 insertions, 46 deletions
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index 3050ec831..ec9d2fcb1 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -161,9 +161,6 @@ cd thunderbird-$RELEASEVER || exit 1 # Retain GTK+ v2 scrolling behavior: zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p2 --verbose || exit 1 -# Fix build when using Rust 1.29.0: -zcat $CWD/mozilla.rust_1_29_0.patch.gz | patch -p1 --verbose || exit 1 - # Fetch localization, if requested: if [ ! -z $MOZLOCALIZE ]; then LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE" diff --git a/source/xap/mozilla-thunderbird/mozilla.rust_1_29_0.patch b/source/xap/mozilla-thunderbird/mozilla.rust_1_29_0.patch deleted file mode 100644 index 94864605d..000000000 --- a/source/xap/mozilla-thunderbird/mozilla.rust_1_29_0.patch +++ /dev/null @@ -1,43 +0,0 @@ - -# HG changeset patch -# User Chris Manchester <cmanchester@mozilla.com> -# Date 1533063488 25200 -# Node ID 36f4ba2fb6f5139b7942e81554190354da1f369a -# Parent ff18e94c90460faa9cca8ff39a0ea4876b0c2039 -Bug 1479540 - Accept "triplet" strings with only two parts in moz.configure. r=froydnj - -MozReview-Commit-ID: 7pFhoJgBMhQ - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -587,17 +587,26 @@ option('--target', nargs=1, - @imports(_from='__builtin__', _import='KeyError') - @imports(_from='__builtin__', _import='ValueError') - def split_triplet(triplet, allow_unknown=False): - # The standard triplet is defined as - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM - # There is also a quartet form: - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # But we can consider the "KERNEL-OPERATING_SYSTEM" as one. -- cpu, manufacturer, os = triplet.split('-', 2) -+ # Additionally, some may omit "unknown" when the manufacturer -+ # is not specified and emit -+ # CPU_TYPE-OPERATING_SYSTEM -+ parts = triplet.split('-', 2) -+ if len(parts) == 3: -+ cpu, _, os = parts -+ elif len(parts) == 2: -+ cpu, os = parts -+ else: -+ die("Unexpected triplet string: %s" % triplet) - - # Autoconf uses config.sub to validate and canonicalize those triplets, - # but the granularity of its results has never been satisfying to our - # use, so we've had our own, different, canonicalization. We've also - # historically not been very consistent with how we use the canonicalized - # values. Hopefully, this will help us make things better. - # The tests are inherited from our decades-old autoconf-based configure, - # which can probably be improved/cleaned up because they are based on a - - |