svn commit: r438317 - head/www/firefox-esr/files
Jan Beich
jbeich at FreeBSD.org
Tue Apr 11 21:36:10 UTC 2017
Author: jbeich
Date: Tue Apr 11 21:36:08 2017
New Revision: 438317
URL: https://svnweb.freebsd.org/changeset/ports/438317
Log:
www/firefox-esr: copy forgotten patches
Added:
head/www/firefox-esr/files/patch-bug1321877
- copied unchanged from r438263, head/www/firefox/files/patch-bug1321877
head/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk
- copied unchanged from r438263, head/www/firefox/files/patch-toolkit_mozapps_installer_packager_mk
Copied: head/www/firefox-esr/files/patch-bug1321877 (from r438263, head/www/firefox/files/patch-bug1321877)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-bug1321877 Tue Apr 11 21:36:08 2017 (r438317, copy of r438263, head/www/firefox/files/patch-bug1321877)
@@ -0,0 +1,42 @@
+commit a13d95795217
+Author: <tharvik at 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
Copied: head/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk (from r438263, head/www/firefox/files/patch-toolkit_mozapps_installer_packager_mk)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/firefox-esr/files/patch-toolkit_mozapps_installer_packager_mk Tue Apr 11 21:36:08 2017 (r438317, copy of r438263, head/www/firefox/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 -)
More information about the svn-ports-head
mailing list