diff options
Diffstat (limited to 'source/xap')
4 files changed, 1 insertions, 84 deletions
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index 5febac109..4018d57e5 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -197,9 +197,6 @@ sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \ # Retain GTK+ v2 scrolling behavior: zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --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 # https://bugzilla.mozilla.org/show_bug.cgi?id=1256955 if [ ! -z $MOZLOCALIZE ]; then diff --git a/source/xap/mozilla-firefox/mozilla.rust_1_29_0.patch b/source/xap/mozilla-firefox/mozilla.rust_1_29_0.patch deleted file mode 100644 index 94864605d..000000000 --- a/source/xap/mozilla-firefox/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 - - diff --git a/source/xap/mozilla-thunderbird/80754eac3809 b/source/xap/mozilla-thunderbird/80754eac3809 deleted file mode 100644 index c38efb653..000000000 --- a/source/xap/mozilla-thunderbird/80754eac3809 +++ /dev/null @@ -1,32 +0,0 @@ - -# HG changeset patch -# User Magnus Melin <mkmelin+mozilla@iki.fi> -# Date 1533928828 -10800 -# Node ID 80754eac3809bff2f8fe4ea05bd16dbaf3dfe1a7 -# Parent 020481090e4e241e345f92410688c9f81e543911 -Bug 1482248 - don't crash on empty file name in nsMsgLocalStoreUtils::nsShouldIgnoreFile. r=jorgk - -diff --git a/mailnews/local/src/nsMsgLocalStoreUtils.cpp b/mailnews/local/src/nsMsgLocalStoreUtils.cpp ---- a/mailnews/local/src/nsMsgLocalStoreUtils.cpp -+++ b/mailnews/local/src/nsMsgLocalStoreUtils.cpp -@@ -23,16 +23,19 @@ nsMsgLocalStoreUtils::AddDirectorySepara - path->GetLeafName(leafName); - leafName.AppendLiteral(FOLDER_SUFFIX); - return path->SetLeafName(leafName); - } - - bool - nsMsgLocalStoreUtils::nsShouldIgnoreFile(nsAString& name) - { -+ if (name.IsEmpty()) -+ return true; -+ - char16_t firstChar = name.First(); - if (firstChar == '.' || firstChar == '#' || - name.CharAt(name.Length() - 1) == '~') - return true; - - if (name.LowerCaseEqualsLiteral("msgfilterrules.dat") || - name.LowerCaseEqualsLiteral("rules.dat") || - name.LowerCaseEqualsLiteral("filterlog.html") || - diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index c15e590dd..3050ec831 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-thunderbird VERSION=$(basename $(ls thunderbird-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b) -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Specify this variable for a localized build. # For example, to build a version of Thunderbird with Italian support, run @@ -161,11 +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 crash with 60.0: -( cd comm - zcat $CWD/80754eac3809.gz | patch -p1 --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 |