diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-13 15:56:32 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-14 01:41:56 -0400 |
| commit | 9f7ae77fe287d7856718c5dfd60891be9b561b1d (patch) | |
| tree | be9b00c7f6110d41c5e3450bc784ffe81ef1805b /gnu/packages/patches/icecat-CVE-2015-4491.patch | |
| parent | 837294b7a431eaecbaf9336e574fe23d55d40d42 (diff) | |
| download | guix-9f7ae77fe287d7856718c5dfd60891be9b561b1d.tar guix-9f7ae77fe287d7856718c5dfd60891be9b561b1d.tar.gz | |
gnu: icecat: Update to 38.3.0-gnu1.
* gnu/packages/patches/icecat-CVE-2015-4473-partial.patch,
gnu/packages/patches/icecat-CVE-2015-4482.patch,
gnu/packages/patches/icecat-CVE-2015-4488.patch,
gnu/packages/patches/icecat-CVE-2015-4489.patch,
gnu/packages/patches/icecat-CVE-2015-4491.patch,
gnu/packages/patches/icecat-CVE-2015-4492.patch,
gnu/packages/patches/icecat-CVE-2015-4495.patch,
gnu/packages/patches/icecat-enable-acceleration-and-webgl.patch,
gnu/packages/patches/icecat-libvpx-1.4.patch: Delete files.
* gnu/packages/patches/icecat-avoid-bundled-includes.patch: New file.
* gnu-system.am (dist_patch_DATA): Add new patch. Remove the deleted ones.
* gnu/packages/gnuzilla.scm (icecat): Update to 38.3.0-gnu1.
[source]: Add new patch. Remove the deleted ones.
[inputs]: Add libxcomposite.
[arguments]: Add 'ensure-no-mtimes-pre-1980' phase. Adapt
'remove-h264parse-from-blacklist' and
'arrange-to-link-libxul-with-libraries-it-might-dlopen' phases to the
new version.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2015-4491.patch')
| -rw-r--r-- | gnu/packages/patches/icecat-CVE-2015-4491.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2015-4491.patch b/gnu/packages/patches/icecat-CVE-2015-4491.patch deleted file mode 100644 index c16885cfc7..0000000000 --- a/gnu/packages/patches/icecat-CVE-2015-4491.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c154557bc0aa7e310824717f3e829dd82e6726e4 Mon Sep 17 00:00:00 2001 -From: Lee Salzman <lsalzman@mozilla.com> -Date: Tue, 21 Jul 2015 13:16:44 -0400 -Subject: [PATCH] Bug 1184009 - Limit image preview sizes. r=acomminos, - a=lmandel - ---HG-- -extra : transplant_source : %9B%86%13%60%B2%97%F1%8Fb%CB%9C%8D%FBWo%C9%EBPs1 ---- - widget/gtk/nsFilePicker.cpp | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp -index 0b5a8dc..3c0d543 100644 ---- a/widget/gtk/nsFilePicker.cpp -+++ b/widget/gtk/nsFilePicker.cpp -@@ -101,13 +101,16 @@ UpdateFilePreviewWidget(GtkFileChooser *file_chooser, - return; - } - -- GdkPixbuf *preview_pixbuf; -+ GdkPixbuf *preview_pixbuf = nullptr; - // Only scale down images that are too big - if (preview_width > MAX_PREVIEW_SIZE || preview_height > MAX_PREVIEW_SIZE) { -- preview_pixbuf = gdk_pixbuf_new_from_file_at_size(image_filename, -- MAX_PREVIEW_SIZE, -- MAX_PREVIEW_SIZE, -- nullptr); -+ if (ceil(preview_width / double(MAX_PREVIEW_SIZE) + 1.0) * -+ ceil(preview_height / double(MAX_PREVIEW_SIZE) + 1.0) < 0x7FFFFF) { -+ preview_pixbuf = gdk_pixbuf_new_from_file_at_size(image_filename, -+ MAX_PREVIEW_SIZE, -+ MAX_PREVIEW_SIZE, -+ nullptr); -+ } - } - else { - preview_pixbuf = gdk_pixbuf_new_from_file(image_filename, nullptr); --- -2.4.3 - |