openbsd-ports/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsWindow_cpp
landry 4d98df5567 Update to mozilla-firefox 3.6.6. Fixes a bunch of MFSA, see
http://www.mozilla.org/security/known-vulnerabilities/firefox36.html
The new plugin sandboxing code is disabled because :
- it only supports binary blobs plugins we don't have
- it is an horrible maze of #ifdef linux-apple-win32 coming straight
  from an old version of chromium. Future versions should have better BSD
support..
tested by several on ports@, thanks!
2010-06-28 21:24:22 +00:00

26 lines
1.1 KiB
Plaintext

$OpenBSD: patch-widget_src_gtk2_nsWindow_cpp,v 1.3 2010/06/28 21:24:22 landry Exp $
Don't try to use png icons when setting app icon for window manager
Firefox uses itss building libpng for APNG support, and gdk_pixbuf_new_from_file
bails out later on when trying to load png files.
--- widget/src/gtk2/nsWindow.cpp.orig Fri Jun 11 22:41:24 2010
+++ widget/src/gtk2/nsWindow.cpp Thu Jun 24 10:08:33 2010
@@ -38,6 +38,8 @@
*
* ***** END LICENSE BLOCK ***** */
+#include <stdint.h>
+
#ifdef MOZ_PLATFORM_MAEMO
// needed to include hildon parts in gtk.h
#define MAEMO_CHANGES
@@ -2141,8 +2143,7 @@ nsWindow::SetIcon(const nsAString& aIconSpec)
// The last two entries (for the old XPM format) will be ignored unless
// no icons are found using the other suffixes. XPM icons are depricated.
- const char extensions[6][7] = { ".png", "16.png", "32.png", "48.png",
- ".xpm", "16.xpm" };
+ const char extensions[2][7] = {".xpm", "16.xpm" };
for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(extensions); i++) {
// Don't bother looking for XPM versions if we found a PNG.