diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2018-07-18 23:44:21 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2018-07-18 23:44:21 +0000 |
commit | e344179e4710fcd9e8b27f21ad966399c6676062 (patch) | |
tree | 25470098899348b52b879360dae665e7d4b833ee /mail/thunderbird/files/patch-bug1412558 | |
parent | - missed a '+" (diff) |
mail/thunderbird: drop patches in preparation for update
$ svn commit
Sending Mk/Uses/gecko.mk
Sending mail/thunderbird/Makefile
Sending mail/thunderbird/distinfo
Sending mail/thunderbird/files/patch-addon-search
Replacing mail/thunderbird/files/patch-bug1021761
Adding mail/thunderbird/files/patch-bug1144632
Deleting mail/thunderbird/files/patch-bug1186967
[...]
Transmitting file data ..........done
Committing transaction...
svn: E165001: Commit failed (details follow):
svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output:
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug702179"
== Additional errors may compound and may not be accurate ==
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1021761"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug1288587"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-bug847568"
Do not replace a file. This can lose history. Path: "/head/mail/thunderbird/files/patch-env-api-keys"
[...]
Pointy hat to: portmgr (multi-steps are error prone)
Diffstat (limited to 'mail/thunderbird/files/patch-bug1412558')
-rw-r--r-- | mail/thunderbird/files/patch-bug1412558 | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/mail/thunderbird/files/patch-bug1412558 b/mail/thunderbird/files/patch-bug1412558 deleted file mode 100644 index 536162ba6edf..000000000000 --- a/mail/thunderbird/files/patch-bug1412558 +++ /dev/null @@ -1,83 +0,0 @@ -diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp -index 53fc3c9937f7..b23771ab80fa 100644 ---- mozilla/dom/media/flac/FlacDecoder.cpp -+++ mozilla/dom/media/flac/FlacDecoder.cpp -@@ -7,6 +7,7 @@ - #include "FlacDecoder.h" - #include "MediaContainerType.h" - #include "MediaPrefs.h" -+#include "PDMFactory.h" - - namespace mozilla { - -@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled() - { - #ifdef MOZ_FFVPX - return MediaPrefs::FlacEnabled(); -+#elif defined(MOZ_FFMPEG) -+ RefPtr<PDMFactory> platform = new PDMFactory(); -+ return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"), -+ /* DecoderDoctorDiagnostics* */ nullptr); - #else - // Until bug 1295886 is fixed. - return false; -diff --git media/ffvpx/README_MOZILLA media/ffvpx/README_MOZILLA -index 5d3a6037efe0..43144b726a92 100644 ---- mozilla/media/ffvpx/README_MOZILLA -+++ mozilla/media/ffvpx/README_MOZILLA -@@ -17,14 +17,6 @@ configuration files were generated as follow using the configure script: - config*: - replace: /HAVE_(MALLOC_H|ARC4RANDOM|LOCALTIME_R|MEMALIGN|POSIX_MEMALIGN)/d - --config_darwin32.h: --add to configure command: --disable-asm --disable-yasm --cc='clang -m32' -- --config_unix32.h: --add to configure command: --disable-asm --disable-yasm --cc='clang -m32' --replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0/ and s/HAVE_MEMALIGN 1/HAVE_MEMALIGN 0/ and s/HAVE_POSIX_MEMALIGN 1/HAVE_POSIX_MEMALIGN 0/ -- -- - config_unix64.h/config_unix64.asm: - replace: s/HAVE_SYSCTL 1/HAVE_SYSCTL 0 - -diff --git media/ffvpx/config.h media/ffvpx/config.h -index dab01e05cd65..26ebe529bd98 100644 ---- mozilla/media/ffvpx/config.h -+++ mozilla/media/ffvpx/config.h -@@ -27,17 +27,9 @@ - #define HAVE_LIBC_MSVCRT 0 - #endif - #elif defined(XP_DARWIN) --#if defined(HAVE_64BIT_BUILD) - #include "config_darwin64.h" --#else --#include "config_darwin32.h" --#endif - #elif defined(XP_UNIX) --#if defined(HAVE_64BIT_BUILD) - #include "config_unix64.h" --#else --#include "config_unix32.h" --#endif - #endif - #include "config_common.h" - #endif // MOZ_FFVPX_CONFIG_H -diff --git old-configure.in old-configure.in -index b8ce71278548..410be683c2f6 100644 ---- mozilla/old-configure.in -+++ mozilla/old-configure.in -@@ -3279,11 +3279,11 @@ dnl = FFmpeg's ffvpx configuration - dnl ======================================================== - - MOZ_FFVPX= --case "$CPU_ARCH" in -- x86) -+case "$OS_ARCH:$CPU_ARCH" in -+ WINNT:x86) - MOZ_FFVPX=1 - ;; -- x86_64) -+ *:x86_64) - MOZ_FFVPX=1 - ;; - esac |