commit ac301103690c8e53c1a4d9a8aa4941a03f4a7356 Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Mar 19 07:44:14 2016 -0400

Update config file for ESR45 rebase --- ...xed-WinIMEHandler.cpp-cross-compilatio.mozpatch | 27 -- ...emove-support-for-pre-ANSI-C-compilers.nsspatch | 468 --------------------- ...1197282-include-atomic-in-videodecoder.mozpatch | 53 --- projects/instantbird/config | 10 - projects/instantbird/disable-fb.patch | 43 -- .../ifdef-performance-toolkit-xpt.patch | 31 -- projects/instantbird/theme-extension-update.patch | 12 - projects/instantbird/trac-16476.patch | 24 -- 8 files changed, 668 deletions(-)

diff --git a/projects/instantbird/0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch b/projects/instantbird/0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch deleted file mode 100644 index bbdd3da..0000000 --- a/projects/instantbird/0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch +++ /dev/null @@ -1,27 +0,0 @@ -From 1ee7581cb435262227c66290c3269a064db1d33c Mon Sep 17 00:00:00 2001 -From: Jacek Caban jacek@codeweavers.com -Date: Thu, 13 Aug 2015 17:37:57 +0200 -Subject: [PATCH] Bug 1192248 - Fixed WinIMEHandler.cpp cross compilation. - r=masayuki - ---- - widget/windows/WinIMEHandler.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/widget/windows/WinIMEHandler.cpp b/widget/windows/WinIMEHandler.cpp -index 28b4f5a704f7..365146fb175a 100644 ---- a/widget/windows/WinIMEHandler.cpp -+++ b/widget/windows/WinIMEHandler.cpp -@@ -18,9 +18,9 @@ - #include "WinUtils.h" - - #include "shellapi.h" --#include "Shlobj.h" --#include "PowrProf.h" --#include "Setupapi.h" -+#include "shlobj.h" -+#include "powrprof.h" -+#include "setupapi.h" - #include "cfgmgr32.h" - - const char* kOskPathPrefName = "ui.osk.on_screen_keyboard_path"; diff --git a/projects/instantbird/Remove-support-for-pre-ANSI-C-compilers.nsspatch b/projects/instantbird/Remove-support-for-pre-ANSI-C-compilers.nsspatch deleted file mode 100644 index a611410..0000000 --- a/projects/instantbird/Remove-support-for-pre-ANSI-C-compilers.nsspatch +++ /dev/null @@ -1,468 +0,0 @@ -# HG changeset patch -# User Felix Janda felix.janda@posteo.de -# Date 1435085630 25200 -# Tue Jun 23 11:53:50 2015 -0700 -# Node ID 1c628bb28ce0ae24e50bf3421d6c7b0abfeeef6f -# Parent 22bc54abbfc7cfd3583d603cc2e589fe67a692e2 -Bug 1128184: lib/dbm: Remove support for pre-ANSI-C compilers. r=wtc. - -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/config/config.mk ---- a/lib/dbm/config/config.mk Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/config/config.mk Tue Jun 23 11:53:50 2015 -0700 -@@ -25,10 +25,6 @@ - DEFINES += -DHAVE_SNPRINTF - endif - --ifeq (,$(filter-out IRIX Linux,$(OS_TARGET))) --DEFINES += -DHAVE_SYS_CDEFS_H --endif -- - ifeq (,$(filter-out DGUX NCR ReliantUNIX SCO_SV SCOOS UNIXWARE,$(OS_TARGET))) - DEFINES += -DHAVE_SYS_BYTEORDER_H - endif -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/include/cdefs.h ---- a/lib/dbm/include/cdefs.h Mon Jun 22 12:15:41 2015 -0700 -+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 -@@ -1,126 +0,0 @@ --/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* -- * Copyright (c) 1991, 1993 -- * The Regents of the University of California. All rights reserved. -- * -- * This code is derived from software contributed to Berkeley by -- * Berkeley Software Design, Inc. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. ***REMOVED*** - see -- * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change -- * 4. Neither the name of the University nor the names of its contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -- * -- * @(#)cdefs.h 8.7 (Berkeley) 1/21/94 -- */ -- --#ifndef _CDEFS_H_ --#define _CDEFS_H_ -- --#if defined(__cplusplus) --#define __BEGIN_DECLS extern "C" { --#define __END_DECLS } --#else --#define __BEGIN_DECLS --#define __END_DECLS --#endif -- --/* -- * The __CONCAT macro is used to concatenate parts of symbol names, e.g. -- * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo. -- * The __CONCAT macro is a bit tricky -- make sure you don't put spaces -- * in between its arguments. __CONCAT can also concatenate double-quoted -- * strings produced by the __STRING macro, but this only works with ANSI C. -- */ --#if defined(__STDC__) || defined(__cplusplus) || defined(_WINDOWS) || defined(XP_OS2) --#define __P(protos) protos /* full-blown ANSI C */ --#define __CONCAT(x,y) x ## y --#define __STRING(x) #x -- --/* On HP-UX 11.00, <sys/stdsyms.h> defines __const. */ --#ifndef __const --#define __const const /* define reserved names to standard */ --#endif /* __const */ --#define __signed signed --#define __volatile volatile --#ifndef _WINDOWS --#if defined(__cplusplus) --#define __inline inline /* convert to C++ keyword */ --#else --#if !defined(__GNUC__) && !defined(__MWERKS__) --#define __inline /* delete GCC keyword */ --#endif /* !__GNUC__ */ --#endif /* !__cplusplus */ --#endif /* !_WINDOWS */ -- --#else /* !(__STDC__ || __cplusplus) */ --#define __P(protos) () /* traditional C preprocessor */ --#define __CONCAT(x,y) x/**/y --#define __STRING(x) "x" -- --#ifndef __GNUC__ --#define __const /* delete pseudo-ANSI C keywords */ --#define __inline --#define __signed --#define __volatile --/* -- * In non-ANSI C environments, new programs will want ANSI-only C keywords -- * deleted from the program and old programs will want them left alone. -- * When using a compiler other than gcc, programs using the ANSI C keywords -- * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS. -- * When using "gcc -traditional", we assume that this is the intent; if -- * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone. -- */ --#ifndef NO_ANSI_KEYWORDS --#define const /* delete ANSI C keywords */ --#define inline --#define signed --#define volatile --#endif --#endif /* !__GNUC__ */ --#endif /* !(__STDC__ || __cplusplus) */ -- --/* -- * GCC1 and some versions of GCC2 declare dead (non-returning) and -- * pure (no side effects) functions using "volatile" and "const"; -- * unfortunately, these then cause warnings under "-ansi -pedantic". -- * GCC2 uses a new, peculiar __attribute__((attrs)) style. All of -- * these work for GNU C++ (modulo a slight glitch in the C++ grammar -- * in the distribution version of 2.5.5). -- */ --#if !defined(__GNUC__) || __GNUC__ < 2 || __GNUC_MINOR__ < 5 --#define __attribute__(x) /* delete __attribute__ if non-gcc or gcc1 */ --#if defined(__GNUC__) && !defined(__STRICT_ANSI__) --#define __dead __volatile --#define __pure __const --#endif --#endif -- --/* Delete pseudo-keywords wherever they are not available or needed. */ --#ifndef __dead --#define __dead --#define __pure --#endif -- --#endif /* !_CDEFS_H_ */ -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/include/manifest.mn ---- a/lib/dbm/include/manifest.mn Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/include/manifest.mn Tue Jun 23 11:53:50 2015 -0700 -@@ -8,8 +8,7 @@ - - MODULE = dbm - --EXPORTS = cdefs.h \ -- mcom_db.h \ -+EXPORTS = mcom_db.h \ - ncompat.h \ - winfile.h \ - $(NULL) -@@ -19,7 +18,6 @@ - extern.h \ - queue.h \ - hash.h \ -- mpool.h \ - search.h \ - $(NULL) - -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/include/mcom_db.h ---- a/lib/dbm/include/mcom_db.h Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/include/mcom_db.h Tue Jun 23 11:53:50 2015 -0700 -@@ -56,12 +56,6 @@ - - #ifdef __DBINTERFACE_PRIVATE - --#ifdef HAVE_SYS_CDEFS_H --#include <sys/cdefs.h> --#else --#include "cdefs.h" --#endif -- - #ifdef HAVE_SYS_BYTEORDER_H - #include <sys/byteorder.h> - #endif -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/include/mpool.h ---- a/lib/dbm/include/mpool.h Mon Jun 22 12:15:41 2015 -0700 -+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 -@@ -1,97 +0,0 @@ --/*- -- * Copyright (c) 1991, 1993, 1994 -- * The Regents of the University of California. All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. ***REMOVED*** - see -- * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change -- * 4. Neither the name of the University nor the names of its contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -- * -- * @(#)mpool.h 8.2 (Berkeley) 7/14/94 -- */ -- --#include <sys/queue.h> -- --/* -- * The memory pool scheme is a simple one. Each in-memory page is referenced -- * by a bucket which is threaded in up to two of three ways. All active pages -- * are threaded on a hash chain (hashed by page number) and an lru chain. -- * Inactive pages are threaded on a free chain. Each reference to a memory -- * pool is handed an opaque MPOOL cookie which stores all of this information. -- */ --#define HASHSIZE 128 --#define HASHKEY(pgno) ((pgno - 1) % HASHSIZE) -- --/* The BKT structures are the elements of the queues. */ --typedef struct _bkt { -- CIRCLEQ_ENTRY(_bkt) hq; /* hash queue */ -- CIRCLEQ_ENTRY(_bkt) q; /* lru queue */ -- void *page; /* page */ -- pgno_t pgno; /* page number */ -- --#define MPOOL_DIRTY 0x01 /* page needs to be written */ --#define MPOOL_PINNED 0x02 /* page is pinned into memory */ -- uint8 flags; /* flags */ --} BKT; -- --typedef struct MPOOL { -- CIRCLEQ_HEAD(_lqh, _bkt) lqh; /* lru queue head */ -- /* hash queue array */ -- CIRCLEQ_HEAD(_hqh, _bkt) hqh[HASHSIZE]; -- pgno_t curcache; /* current number of cached pages */ -- pgno_t maxcache; /* max number of cached pages */ -- pgno_t npages; /* number of pages in the file */ -- uint32 pagesize; /* file page size */ -- int fd; /* file descriptor */ -- /* page in conversion routine */ -- void (*pgin) (void *, pgno_t, void *); -- /* page out conversion routine */ -- void (*pgout) (void *, pgno_t, void *); -- void *pgcookie; /* cookie for page in/out routines */ --#ifdef STATISTICS -- uint32 cachehit; -- uint32 cachemiss; -- uint32 pagealloc; -- uint32 pageflush; -- uint32 pageget; -- uint32 pagenew; -- uint32 pageput; -- uint32 pageread; -- uint32 pagewrite; --#endif --} MPOOL; -- --__BEGIN_DECLS --MPOOL *mpool_open (void *, int, pgno_t, pgno_t); --void mpool_filter (MPOOL *, void (*)(void *, pgno_t, void *), -- void (*)(void *, pgno_t, void *), void *); --void *mpool_new (MPOOL *, pgno_t *); --void *mpool_get (MPOOL *, pgno_t, uint); --int mpool_put (MPOOL *, void *, uint); --int mpool_sync (MPOOL *); --int mpool_close (MPOOL *); --#ifdef STATISTICS --void mpool_stat (MPOOL *); --#endif --__END_DECLS -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/src/h_bigkey.c ---- a/lib/dbm/src/h_bigkey.c Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/src/h_bigkey.c Tue Jun 23 11:53:50 2015 -0700 -@@ -72,8 +72,8 @@ - #include "page.h" - /* #include "extern.h" */ - --static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int)); --static int collect_data __P((HTAB *, BUFHEAD *, int, int)); -+static int collect_key(HTAB *, BUFHEAD *, int, DBT *, int); -+static int collect_data(HTAB *, BUFHEAD *, int, int); - - /* - * Big_insert -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/src/h_func.c ---- a/lib/dbm/src/h_func.c Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/src/h_func.c Tue Jun 23 11:53:50 2015 -0700 -@@ -45,14 +45,14 @@ - /* #include "extern.h" */ - - #if 0 --static uint32 hash1 __P((const void *, size_t)); --static uint32 hash2 __P((const void *, size_t)); --static uint32 hash3 __P((const void *, size_t)); -+static uint32 hash1(const void *, size_t); -+static uint32 hash2(const void *, size_t); -+static uint32 hash3(const void *, size_t); - #endif --static uint32 hash4 __P((const void *, size_t)); -+static uint32 hash4(const void *, size_t); - - /* Global default hash function */ --uint32 (*__default_hash) __P((const void *, size_t)) = hash4; -+uint32 (*__default_hash)(const void *, size_t) = hash4; - - /* - * HASH FUNCTIONS -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/src/h_page.c ---- a/lib/dbm/src/h_page.c Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/src/h_page.c Tue Jun 23 11:53:50 2015 -0700 -@@ -89,13 +89,12 @@ - - extern int mkstempflags(char *path, int extraFlags); - --static uint32 *fetch_bitmap __P((HTAB *, uint32)); --static uint32 first_free __P((uint32)); --static int open_temp __P((HTAB *)); --static uint16 overflow_page __P((HTAB *)); --static void squeeze_key __P((uint16 *, const DBT *, const DBT *)); --static int ugly_split -- __P((HTAB *, uint32, BUFHEAD *, BUFHEAD *, int, int)); -+static uint32 *fetch_bitmap(HTAB *, uint32); -+static uint32 first_free(uint32); -+static int open_temp(HTAB *); -+static uint16 overflow_page(HTAB *); -+static void squeeze_key(uint16 *, const DBT *, const DBT *); -+static int ugly_split(HTAB *, uint32, BUFHEAD *, BUFHEAD *, int, int); - - #define PAGE_INIT(P) { \ - ((uint16 *)(P))[0] = 0; \ -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/src/hash.c ---- a/lib/dbm/src/hash.c Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/src/hash.c Tue Jun 23 11:53:50 2015 -0700 -@@ -74,23 +74,23 @@ - /* - #include "extern.h" - */ --static int alloc_segs __P((HTAB *, int)); --static int flush_meta __P((HTAB *)); --static int hash_access __P((HTAB *, ACTION, DBT *, DBT *)); --static int hash_close __P((DB *)); --static int hash_delete __P((const DB *, const DBT *, uint)); --static int hash_fd __P((const DB *)); --static int hash_get __P((const DB *, const DBT *, DBT *, uint)); --static int hash_put __P((const DB *, DBT *, const DBT *, uint)); --static void *hash_realloc __P((SEGMENT **, size_t, size_t)); --static int hash_seq __P((const DB *, DBT *, DBT *, uint)); --static int hash_sync __P((const DB *, uint)); --static int hdestroy __P((HTAB *)); --static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *)); --static int init_htab __P((HTAB *, int)); -+static int alloc_segs(HTAB *, int); -+static int flush_meta(HTAB *); -+static int hash_access(HTAB *, ACTION, DBT *, DBT *); -+static int hash_close(DB *); -+static int hash_delete(const DB *, const DBT *, uint); -+static int hash_fd(const DB *); -+static int hash_get(const DB *, const DBT *, DBT *, uint); -+static int hash_put(const DB *, DBT *, const DBT *, uint); -+static void *hash_realloc(SEGMENT **, size_t, size_t); -+static int hash_seq(const DB *, DBT *, DBT *, uint); -+static int hash_sync(const DB *, uint); -+static int hdestroy(HTAB *); -+static HTAB *init_hash(HTAB *, const char *, HASHINFO *); -+static int init_htab(HTAB *, int); - #if BYTE_ORDER == LITTLE_ENDIAN --static void swap_header __P((HTAB *)); --static void swap_header_copy __P((HASHHDR *, HASHHDR *)); -+static void swap_header(HTAB *); -+static void swap_header_copy(HASHHDR *, HASHHDR *); - #endif - - /* Fast arithmetic, relying on powers of 2, */ -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/src/hash_buf.c ---- a/lib/dbm/src/hash_buf.c Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/src/hash_buf.c Tue Jun 23 11:53:50 2015 -0700 -@@ -70,7 +70,7 @@ - #include "page.h" - /* #include "extern.h" */ - --static BUFHEAD *newbuf __P((HTAB *, uint32, BUFHEAD *)); -+static BUFHEAD *newbuf(HTAB *, uint32, BUFHEAD *); - - /* Unlink B from its place in the lru */ - #define BUF_REMOVE(B) { \ -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/src/memmove.c ---- a/lib/dbm/src/memmove.c Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/src/memmove.c Tue Jun 23 11:53:50 2015 -0700 -@@ -37,11 +37,6 @@ - static char sccsid[] = "@(#)bcopy.c 8.1 (Berkeley) 6/4/93"; - #endif /* LIBC_SCCS and not lint */ - --#ifdef HAVE_SYS_CDEFS_H --#include <sys/cdefs.h> --#else --#include "cdefs.h" --#endif - #include <string.h> - - /* -diff -r 22bc54abbfc7 -r 1c628bb28ce0 lib/dbm/src/snprintf.c ---- a/lib/dbm/src/snprintf.c Mon Jun 22 12:15:41 2015 -0700 -+++ b/lib/dbm/src/snprintf.c Tue Jun 23 11:53:50 2015 -0700 -@@ -4,32 +4,14 @@ - #include <stddef.h> - #include <stdio.h> - --#ifdef HAVE_SYS_CDEFS_H --#include <sys/cdefs.h> --#else --#include "cdefs.h" --#endif -- - #include "prtypes.h" - - #include <ncompat.h> - --#ifdef __STDC__ - #include <stdarg.h> --#else --#include <varargs.h> --#endif - - int --#ifdef __STDC__ - snprintf(char *str, size_t n, const char *fmt, ...) --#else --snprintf(str, n, fmt, va_alist) -- char *str; -- size_t n; -- const char *fmt; -- va_dcl --#endif - { - va_list ap; - #ifdef VSPRINTF_CHARSTAR -@@ -37,11 +19,7 @@ - #else - int rval; - #endif --#ifdef __STDC__ - va_start(ap, fmt); --#else -- va_start(ap); --#endif - #ifdef VSPRINTF_CHARSTAR - rp = vsprintf(str, fmt, ap); - va_end(ap); diff --git a/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch b/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch deleted file mode 100644 index c6e3b3c..0000000 --- a/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch +++ /dev/null @@ -1,53 +0,0 @@ - -# HG changeset patch -# User Jacek Caban jacek@codeweavers.com -# Date 1440499220 -7200 -# Node ID 0d3b1fd5f2d10562fec06f21f7297c0722159a6b -# Parent c4b66462595789190a33a11b211e3977ecc7c5f6 -Bug 1197282 - Include <atomic> in VideoDecoder.h. r=cpearce - -diff --git a/media/gmp-clearkey/0.1/AnnexB.cpp b/media/gmp-clearkey/0.1/AnnexB.cpp ---- a/media/gmp-clearkey/0.1/AnnexB.cpp -+++ b/media/gmp-clearkey/0.1/AnnexB.cpp -@@ -12,16 +12,18 @@ - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - #include "AnnexB.h" - #include "Endian.h" - -+#include <cstring> -+ - using mozilla::BigEndian; - - static const uint8_t kAnnexBDelimiter[] = { 0, 0, 0, 1 }; - - /* static */ void - AnnexB::ConvertFrameInPlace(std::vector<uint8_t>& aBuffer) - { - for (size_t i = 0; i < aBuffer.size() - 4 - sizeof(kAnnexBDelimiter) + 1; ) { -diff --git a/media/gmp-clearkey/0.1/VideoDecoder.h b/media/gmp-clearkey/0.1/VideoDecoder.h ---- a/media/gmp-clearkey/0.1/VideoDecoder.h -+++ b/media/gmp-clearkey/0.1/VideoDecoder.h -@@ -12,16 +12,18 @@ - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - #ifndef __VideoDecoder_h__ - #define __VideoDecoder_h__ - -+#include <atomic> -+ - #include "gmp-task-utils.h" - #include "gmp-video-decode.h" - #include "gmp-video-host.h" - #include "WMFH264Decoder.h" - - #include "mfobjects.h" - - class VideoDecoder : public GMPVideoDecoder - diff --git a/projects/instantbird/config b/projects/instantbird/config index 0496cef..61ae74c 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -59,11 +59,9 @@ input_files: - filename: irc-default-server.patch - filename: top-protocols.patch - filename: disable-links.patch - - filename: disable-fb.patch - filename: account-picture.patch - filename: show-traffic-tor.patch - filename: hide-get-protocols.patch - - filename: theme-extension-update.patch - filename: ctcp-time.patch - filename: ctcp-ping.patch - filename: xmpp-inband-registration.patch @@ -79,9 +77,7 @@ input_files: - filename: search-context-menu.patch - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch - - filename: ifdef-performance-toolkit-xpt.patch - filename: 8ea23862252b-remove__DATE__and__TIME__.nsspatch - - filename: Remove-support-for-pre-ANSI-C-compilers.nsspatch - filename: themes-remove-links.patch - filename: branding/blistWindow.png - filename: branding/blistWindow16.png @@ -106,8 +102,6 @@ input_files: enable: '[% c("var/osx") %]' - filename: cert_override.txt enable: '[% c("var/osx") %]' - - filename: trac-16476.patch - enable: '[% c("var/osx") %]' - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - filename: gmploader-sandbox.mozpatch @@ -118,10 +112,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch enable: '[% c("var/windows") %]' - - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch - enable: '[% c("var/windows") %]' - - filename: 0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch - enable: '[% c("var/windows") %]' - filename: 0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch diff --git a/projects/instantbird/disable-fb.patch b/projects/instantbird/disable-fb.patch deleted file mode 100644 index 63d6d1c..0000000 --- a/projects/instantbird/disable-fb.patch +++ /dev/null @@ -1,43 +0,0 @@ -# Modified from aleth's https://hg.mozilla.org/comm-central/rev/4f1b3e5af8ef - -diff --git a/chat/chat-prefs.js b/chat/chat-prefs.js ---- a/chat/chat-prefs.js -+++ b/chat/chat-prefs.js -@@ -82,6 +82,8 @@ - pref("chat.irc.automaticList", true); - // Disable Skype until it can be tested further. - pref("chat.prpls.prpl-skype.disable", true); -+// Disable Facebook as the XMPP gateway no longer exists. -+pref("chat.prpls.prpl-facebook.disable", true); - - // loglevel is the minimum severity level that a libpurple message - // must have to be reported in the Error Console. -diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js ---- a/im/content/accountWizard.js -+++ b/im/content/accountWizard.js -@@ -18,6 +18,13 @@ - if (proto == null) - continue; - -+ // If the preference is set to disable this prpl, don't show it in the -+ // full list of protocols. -+ let pref = "chat.prpls." + topProto + ".disable"; -+ if (Services.prefs.getPrefType(pref) == Services.prefs.PREF_BOOL && -+ Services.prefs.getBoolPref(pref)) -+ continue; -+ - let item = document.createElement("richlistitem"); - item.className = "top-protocol"; - topProtoList.insertBefore(item, document.getElementById("otherListItem")); -diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in ---- a/im/installer/package-manifest.in -+++ b/im/installer/package-manifest.in -@@ -227,8 +227,6 @@ - @RESPATH@/components/imConversations.manifest - @RESPATH@/components/imCore.js - @RESPATH@/components/imCore.manifest --@RESPATH@/components/facebook.js --@RESPATH@/components/facebook.manifest - @RESPATH@/components/gtalk.js - @RESPATH@/components/gtalk.manifest - @RESPATH@/components/irc.js diff --git a/projects/instantbird/ifdef-performance-toolkit-xpt.patch b/projects/instantbird/ifdef-performance-toolkit-xpt.patch deleted file mode 100644 index 863f9b7..0000000 --- a/projects/instantbird/ifdef-performance-toolkit-xpt.patch +++ /dev/null @@ -1,31 +0,0 @@ -# HG changeset patch -# User Arlo Breault arlolra@gmail.com -# Date 1443532131 -7200 -# Tue Sep 29 15:08:51 2015 +0200 -# Node ID 3c43eb71066949342af540518d3051565de9cb8a -# Parent e1a209673d05dc27dd5a8230b257b1ddcc1cb055 -Port bug 1164707 to /im - -diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in ---- a/im/installer/package-manifest.in -+++ b/im/installer/package-manifest.in -@@ -422,17 +422,19 @@ - #ifdef MOZ_WEBRTC - @RESPATH@/components/PeerConnection.js - @RESPATH@/components/PeerConnection.manifest - #endif - @RESPATH@/components/toolkit_asyncshutdown.xpt - @RESPATH@/components/toolkit_filewatcher.xpt - @RESPATH@/components/toolkit_formautofill.xpt - @RESPATH@/components/toolkit_osfile.xpt -+#ifdef NIGHTLY_BUILD - @RESPATH@/components/toolkit_perfmonitoring.xpt -+#endif - @RESPATH@/components/toolkit_xulstore.xpt - @RESPATH@/components/toolkitplaces.manifest - @RESPATH@/components/toolkitsearch.manifest - #ifdef UNIX_BUT_NOT_MAC - @RESPATH@/components/toolkitremote.xpt - #endif - #ifdef MOZ_GTK - @RESPATH@/components/filepicker.xpt diff --git a/projects/instantbird/theme-extension-update.patch b/projects/instantbird/theme-extension-update.patch deleted file mode 100644 index 8ad39d4..0000000 --- a/projects/instantbird/theme-extension-update.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in -index a7e38bb..5eea8ba 100644 ---- a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in -+++ b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in -@@ -26,6 +26,7 @@ - <!-- Front End MetaData --> - em:nameInstantbird (default)</em:name> - em:descriptionThe default theme.</em:description> -+ em:updateURLhttps://127.0.0.1/</em:updateURL> - - <!-- EXTENSION AUTHORS! - DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES diff --git a/projects/instantbird/trac-16476.patch b/projects/instantbird/trac-16476.patch deleted file mode 100644 index 2f9829a..0000000 --- a/projects/instantbird/trac-16476.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User aleth aleth@instantbird.org -# Date 1446954539 28800 -# Sat Nov 07 19:48:59 2015 -0800 -# Branch GECKO410b1_2015090809_RELBRANCH -# Node ID 47ab76be5ae63ddaef16a424243ed3acc403f94f -# Parent 492c769c46c9ea9e54fab00d6f0310afd100885a -Bug 1222238 - Avoid hang in proxy preferences pane. r=clokep - -diff --git a/im/content/preferences/messagestyle.js b/im/content/preferences/messagestyle.js ---- a/im/content/preferences/messagestyle.js -+++ b/im/content/preferences/messagestyle.js -@@ -177,9 +177,8 @@ - // uses to determine if there are further messages pending to be - // added. The +1 ensures no scroll occurs after we add the last - // message here. -- this.browser._autoScrollEnabled = false; -- this.browser.getPendingMessagesCount = -- () => previewObserver.conv.messages.length + 1; -+ this.browser.autoScrollEnabled = () => false; -+ this.browser.contentWindow.autoScrollEnabled = () => false; - - // Display all queued messages. Use a timeout so that message text - // modifiers can be added with observers for this notification.