diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-04-11 21:36:08 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-04-11 21:36:08 +0000 |
| commit | 3c15a7ef8000bdcdbf72193a749351378b9e5c5f (patch) | |
| tree | d9d29c3e4f26db8eecfa064fcfbbc945cbb09b09 /www/firefox-esr | |
| parent | 894be6cfc9878f1479e6928fa231cfa0c517852c (diff) | |
| download | ports-3c15a7ef8000bdcdbf72193a749351378b9e5c5f.tar.gz ports-3c15a7ef8000bdcdbf72193a749351378b9e5c5f.zip | |
Notes
Diffstat (limited to 'www/firefox-esr')
| -rw-r--r-- | www/firefox-esr/files/patch-bug1321877 | 42 | ||||
| -rw-r--r-- | www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk | 13 |
2 files changed, 55 insertions, 0 deletions
diff --git a/www/firefox-esr/files/patch-bug1321877 b/www/firefox-esr/files/patch-bug1321877 new file mode 100644 index 000000000000..50b1b175dd3d --- /dev/null +++ b/www/firefox-esr/files/patch-bug1321877 @@ -0,0 +1,42 @@ +commit a13d95795217 +Author: <tharvik@gmail.com> +Date: Thu Dec 8 18:20:12 2016 -0600 + + Bug 1321877. Fix compiler warnings in Downscaler.h when skia is not enabled. r=tnikkel +--- + image/Downscaler.h | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git image/Downscaler.h image/Downscaler.h +index 21179a38f200..0bdef0eaa646 100644 +--- image/Downscaler.h ++++ image/Downscaler.h +@@ -154,14 +154,14 @@ private: + class Downscaler + { + public: +- explicit Downscaler(const nsIntSize&) ++ explicit Downscaler(const nsIntSize&) : mScale(1.0, 1.0) + { + MOZ_RELEASE_ASSERT(false, "Skia is not enabled"); + } + +- const nsIntSize& OriginalSize() const { return nsIntSize(); } +- const nsIntSize& TargetSize() const { return nsIntSize(); } +- const gfxSize& Scale() const { return gfxSize(1.0, 1.0); } ++ const nsIntSize& OriginalSize() const { return mSize; } ++ const nsIntSize& TargetSize() const { return mSize; } ++ const gfxSize& Scale() const { return mScale; } + + nsresult BeginFrame(const nsIntSize&, const Maybe<nsIntRect>&, uint8_t*, bool, bool = false) + { +@@ -177,6 +177,9 @@ public: + DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); } + void ResetForNextProgressivePass() { } + const nsIntSize FrameSize() const { return nsIntSize(0, 0); } ++private: ++ nsIntSize mSize; ++ gfxSize mScale; + }; + + #endif // MOZ_ENABLE_SKIA diff --git a/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk b/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk new file mode 100644 index 000000000000..42da812a1df5 --- /dev/null +++ b/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk @@ -0,0 +1,13 @@ +$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.11 2012/06/11 15:29:56 landry Exp $ +install headers/idl/sdk libs only if xulrunner +--- toolkit/mozapps/installer/packager.mk.orig Fri Jun 1 14:04:20 2012 ++++ toolkit/mozapps/installer/packager.mk Tue Jun 5 07:55:51 2012 +@@ -127,7 +127,7 @@ endif + $(NSINSTALL) -D $(DESTDIR)$(bindir) + $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) +-ifdef INSTALL_SDK # Here comes the hard part ++ifeq ($(MOZ_APP_NAME),xulrunner) + $(NSINSTALL) -D $(DESTDIR)$(includedir) + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir) && tar -xf -) |