summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Goehre <chris@sigxcpu.org>2014-12-04 12:57:18 -0500
committerChristoph Goehre <chris@sigxcpu.org>2014-12-04 12:57:18 -0500
commit10ce8205726b34bd2b429668ff526a907956bf5e (patch)
tree336c12dfbe8cb1c734b2db4bfea3f22482888880
parentb5acb03f683647cb4b42c857f830c42bf120a28c (diff)
rebuild patch queue from patch-queue branch
added patches: debian/patches/FTBFS-armhf-fixing-ARM-CPU-detection.patch debian/patches/fixing-various-FTBFS-due-different-datatype-char-beh.patch
-rw-r--r--debian/patches/FTBFS-armhf-fixing-ARM-CPU-detection.patch36
-rw-r--r--debian/patches/debian-hacks/stop-configure-if-with-system-bz2-was-passed-but-no-.patch2
-rw-r--r--debian/patches/fixing-various-FTBFS-due-different-datatype-char-beh.patch78
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/system-libs/Allow-to-build-against-system-libffi.patch2
5 files changed, 118 insertions, 2 deletions
diff --git a/debian/patches/FTBFS-armhf-fixing-ARM-CPU-detection.patch b/debian/patches/FTBFS-armhf-fixing-ARM-CPU-detection.patch
new file mode 100644
index 0000000..2d6f8e2
--- /dev/null
+++ b/debian/patches/FTBFS-armhf-fixing-ARM-CPU-detection.patch
@@ -0,0 +1,36 @@
+From: Carsten Schoenert <c.schoenert@t-online.de>
+Date: Sun, 23 Nov 2014 08:43:56 +0100
+Subject: FTBFS armhf: fixing ARM CPU detection
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1066853
+The armv7 CPU detection didn't match non adroid based platform with
+armv7 correctly.
+This patch should be not needed in further releases after Thunderbird 35.
+---
+ .../trunk/webrtc/system_wrappers/source/cpu_features.cc | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc b/mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc
+index b924d773..af29d08 100644
+--- a/mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc
++++ b/mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features.cc
+@@ -66,6 +66,19 @@ static int GetCPUInfo(CPUFeature feature) {
+ (void)feature;
+ return 0;
+ }
++
++#if !defined(WEBRTC_GONK) && !defined(ANDROID)
++#ifdef WEBRTC_ARCH_ARM_V7
++uint64_t WebRtc_GetCPUFeaturesARM(void) {
++ return kCPUFeatureARMv7
++#ifdef WEBRTC_ARCH_ARM_NEON
++ | kCPUFeatureNEON
++#endif
++ | kCPUFeatureVFPv3;
++}
++#endif // WEBRTC_ARCH_ARM_V7
++#endif // !WEBRTC_GONK && !ANDROID
++
+ #endif
+
+ WebRtc_CPUInfo WebRtc_GetCPUInfo = GetCPUInfo;
diff --git a/debian/patches/debian-hacks/stop-configure-if-with-system-bz2-was-passed-but-no-.patch b/debian/patches/debian-hacks/stop-configure-if-with-system-bz2-was-passed-but-no-.patch
index adf5902..49bd02d 100644
--- a/debian/patches/debian-hacks/stop-configure-if-with-system-bz2-was-passed-but-no-.patch
+++ b/debian/patches/debian-hacks/stop-configure-if-with-system-bz2-was-passed-but-no-.patch
@@ -8,7 +8,7 @@ Subject: stop configure if '--with-system-bz2' was passed,
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mozilla/configure.in b/mozilla/configure.in
-index 895beac..edf1575 100644
+index 5852478..0b701d9 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -3770,7 +3770,7 @@ if test -z "$BZ2_DIR" -o "$BZ2_DIR" = no; then
diff --git a/debian/patches/fixing-various-FTBFS-due-different-datatype-char-beh.patch b/debian/patches/fixing-various-FTBFS-due-different-datatype-char-beh.patch
new file mode 100644
index 0000000..48920df
--- /dev/null
+++ b/debian/patches/fixing-various-FTBFS-due-different-datatype-char-beh.patch
@@ -0,0 +1,78 @@
+From: Carsten Schoenert <c.schoenert@t-online.de>
+Date: Sun, 23 Nov 2014 08:02:35 +0100
+Subject: fixing various FTBFS due different datatype char behaviour
+
+The default behaviour for the datatype char depends on the platform and
+compiler. So the 'char' type will interpreted as 'signed char' on x86
+based platforms but as 'unsigned char' on arm* and powerpc* for example.
+
+This patch is based on
+https://bugzilla.mozilla.org/show_bug.cgi?id=1085151
+It's probably not needed in further Thunderbird releases.
+---
+ mailnews/base/search/src/nsMsgFilterList.cpp | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/mailnews/base/search/src/nsMsgFilterList.cpp b/mailnews/base/search/src/nsMsgFilterList.cpp
+index 5564d10..806c8ab 100644
+--- a/mailnews/base/search/src/nsMsgFilterList.cpp
++++ b/mailnews/base/search/src/nsMsgFilterList.cpp
+@@ -32,6 +32,8 @@ static const char16_t unicodeFormatter[] = {
+ (char16_t)0,
+ };
+
++// Marker for EOF or failure during read
++#define EOF_CHAR (char) 0xFF
+
+ nsMsgFilterList::nsMsgFilterList() :
+ m_fileVersion(0)
+@@ -383,11 +385,11 @@ char nsMsgFilterList::ReadChar(nsIInputStream *aStream)
+ uint32_t bytesRead;
+ nsresult rv = aStream->Read(&newChar, 1, &bytesRead);
+ if (NS_FAILED(rv) || !bytesRead)
+- return -1;
++ return EOF_CHAR;
+ uint64_t bytesAvailable;
+ rv = aStream->Available(&bytesAvailable);
+ if (NS_FAILED(rv))
+- return -1;
++ return EOF_CHAR;
+ else
+ {
+ if (m_startWritingToBuffer)
+@@ -422,7 +424,7 @@ char nsMsgFilterList::LoadAttrib(nsMsgFilterFileAttribValue &attrib, nsIInputStr
+ int i;
+ for (i = 0; i + 1 < (int)(sizeof(attribStr)); )
+ {
+- if (curChar == (char) -1 || (!(curChar & 0x80) && isspace(curChar)) || curChar == '=')
++ if (curChar == EOF_CHAR || (!(curChar & 0x80) && isspace(curChar)) || curChar == '=')
+ break;
+ attribStr[i++] = curChar;
+ curChar = ReadChar(aStream);
+@@ -481,7 +483,7 @@ nsresult nsMsgFilterList::LoadValue(nsCString &value, nsIInputStream *aStream)
+ }
+ else
+ {
+- if (curChar == (char) -1 || curChar == '"' || curChar == '\n' || curChar == '\r')
++ if (curChar == EOF_CHAR || curChar == '"' || curChar == '\n' || curChar == '\r')
+ {
+ value += valueStr;
+ break;
+@@ -490,7 +492,7 @@ nsresult nsMsgFilterList::LoadValue(nsCString &value, nsIInputStream *aStream)
+ valueStr += curChar;
+ curChar = ReadChar(aStream);
+ }
+- while (curChar != -1);
++ while (curChar != EOF_CHAR);
+ return NS_OK;
+ }
+
+@@ -513,7 +515,7 @@ nsresult nsMsgFilterList::LoadTextFilters(nsIInputStream *aStream)
+
+ char curChar;
+ curChar = LoadAttrib(attrib, bufStream);
+- if (curChar == (char) -1) //reached eof
++ if (curChar == EOF_CHAR) //reached eof
+ break;
+ err = LoadValue(value, bufStream);
+ if (NS_FAILED(err))
diff --git a/debian/patches/series b/debian/patches/series
index 97e11b1..dd64212 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,5 @@ porting-alpha/fix-FTBFS-on-alpha.patch
porting-kfreebsd-hurd/FTBFS-hurd-adding-GNU-Hurd-to-the-list-of-OS-systems.patch
porting-kfreebsd-hurd/correcting-file-inclusion-for-kfreebsd.patch
debian-hacks/pass-OS_LDFLAGS-to-all-ldap-libraries.patch
+fixing-various-FTBFS-due-different-datatype-char-beh.patch
+FTBFS-armhf-fixing-ARM-CPU-detection.patch
diff --git a/debian/patches/system-libs/Allow-to-build-against-system-libffi.patch b/debian/patches/system-libs/Allow-to-build-against-system-libffi.patch
index 8000c2c..24a1b9a 100644
--- a/debian/patches/system-libs/Allow-to-build-against-system-libffi.patch
+++ b/debian/patches/system-libs/Allow-to-build-against-system-libffi.patch
@@ -8,7 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=551138
1 file changed, 12 insertions(+)
diff --git a/mozilla/js/src/configure.in b/mozilla/js/src/configure.in
-index 314807b..4adeed4 100644
+index 4605e4a..d6ecf98 100644
--- a/mozilla/js/src/configure.in
+++ b/mozilla/js/src/configure.in
@@ -3254,6 +3254,18 @@ if test -n "$JSGC_GENERATIONAL"; then