commit 577babf82549cd64e596792b6171fdad2baa9248
parent 43d2827eeedaf72acbe8eb4c0853eaae272c49f7
Author: Ruben Rodriguez <ruben@gnu.org>
Date: Fri, 1 Sep 2017 16:46:42 -0400
Revert "Fixed build error from upstream regression", patched upstream
This reverts commit f137dd0571291255b0d9f76be36fb10dcc41a790.
Diffstat:
2 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/data/patches/FileSystemDirectoryEntry.patch b/data/patches/FileSystemDirectoryEntry.patch
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Tom Ritter <tom@mozilla.com>
-# Date 1491237602 18000
-# Mon Apr 03 11:40:02 2017 -0500
-# Node ID 6acbb284e1bdb2294127e34cc1cfdb77d8a9a065
-# Parent 9f1a26953dedbee4e3796ee12135b0a540028cee
-Add FileSystemDirectoryEntry.h include
-https://bugzilla.mozilla.org/show_bug.cgi?id=1353765
-
-diff --git a/dom/filesystem/compat/FileSystemDirectoryReader.h b/dom/filesystem/compat/FileSystemDirectoryReader.h
---- a/dom/filesystem/compat/FileSystemDirectoryReader.h
-+++ b/dom/filesystem/compat/FileSystemDirectoryReader.h
-@@ -5,16 +5,17 @@
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
- #ifndef mozilla_dom_FileSystemDirectoryReader_h
- #define mozilla_dom_FileSystemDirectoryReader_h
-
- #include "mozilla/Attributes.h"
- #include "mozilla/ErrorResult.h"
- #include "mozilla/dom/BindingDeclarations.h"
-+#include "mozilla/dom/FileSystemDirectoryEntry.h"
- #include "nsCycleCollectionParticipant.h"
- #include "nsWrapperCache.h"
-
- namespace mozilla {
- namespace dom {
-
- class Directory;
- class FileSystem;
diff --git a/makeicecat b/makeicecat
@@ -115,10 +115,10 @@ mv compare-locales $SOURCEDIR/l10n
cd $SOURCEDIR
-for patch in $DATA/patches/*; do
- echo Patching with file: $patch
- patch -p1 < $patch
-done
+#for patch in $DATA/patches/*; do
+# echo Patching with file: $patch
+# patch -p1 < $patch
+#done
cp $DATA/Changelog.IceCat $DATA/README.IceCat .
cp $DATA/Changelog.IceCat $DATA/README.IceCat debian