Remove an uneeded patch (harmless, does not change binary)

4 files changed, 6 insertions, 29 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index fd66c2db234..76fd0900094 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.106 2013/07/02 07:18:18 martin Exp $
+$NetBSD: distinfo,v 1.107 2013/07/04 08:07:09 martin Exp $
 
 SHA1 (firefox-22.0.source.tar.bz2) = db2d5b028b6ea95b5f006b46e153f50f7a52bf80
 RMD160 (firefox-22.0.source.tar.bz2) = 9f206a786fcc366cb0ea03c4a5140809d1402272
@@ -22,7 +22,6 @@ SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598
 SHA1 (patch-config_system-headers) = 5957acc2b4d14a1a9e71791bca3eb76c448a02b2
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-extensions_auth_nsAuthGSSAPI.cpp) = 548886fc4a86a988f3f91650061ddc04f37653a8
-SHA1 (patch-gfx__2d__Blur.cpp) = 7dc3825acc303f5a67a46249da7656ec653e2721
 SHA1 (patch-gfx__skia__include__core__SkPreConfig.h) = 447b3a311bfb25a0519b60b105ac360d3fe74370
 SHA1 (patch-gfx_skia_Makefile.in) = ddc7e4a375f4cfd7dd76c5b37835bbcd3ad13cf1
 SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = 493fced792610ea1ce5ab6b1e043ef36b33f8279
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk
index d594c1935c7..e4b7eaf1416 100644
--- a/www/firefox/mozilla-common.mk
+++ b/www/firefox/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.7 2013/06/26 11:32:12 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.8 2013/07/04 08:07:09 martin Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -26,7 +26,7 @@ CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
 
 CONFIGURE_ARGS+=	--disable-tests --disable-pedantic
 CONFIGURE_ARGS+=	--enable-crypto
-CONFIGURE_ARGS+=	--enable-optimize=-O2 --with-pthreads
+CONFIGURE_ARGS+=	--with-pthreads
 CONFIGURE_ARGS+=	--disable-javaxpcom
 CONFIGURE_ARGS+=	--enable-default-toolkit=cairo-gtk2
 CONFIGURE_ARGS+=	--enable-svg --enable-mathml
diff --git a/www/firefox/options.mk b/www/firefox/options.mk
index 41589693ec0..a3e8410d7d8 100644
--- a/www/firefox/options.mk
+++ b/www/firefox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2013/06/26 11:32:12 ryoon Exp $
+# $NetBSD: options.mk,v 1.15 2013/07/04 08:07:09 martin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.firefox
 PKG_SUPPORTED_OPTIONS=	official-mozilla-branding
@@ -37,12 +37,13 @@ CONFIGURE_ARGS+=	--disable-jemalloc
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=	--enable-debug --enable-debug-symbols
+CONFIGURE_ARGS+=	--enable-debug="-g -O0" --enable-debug-symbols --disable-optimize
 CONFIGURE_ARGS+=	--disable-install-strip
 PLIST.debug=		yes
 .else
 CONFIGURE_ARGS+=	--disable-debug --disable-debug-symbols
 CONFIGURE_ARGS+=	--enable-install-strip
+CONFIGURE_ARGS+=	--enable-optimize=-O2 
 .endif
 
 .if !empty(PKG_OPTIONS:Mpulseaudio)
diff --git a/www/firefox/patches/patch-gfx__2d__Blur.cpp b/www/firefox/patches/patch-gfx__2d__Blur.cpp
deleted file mode 100644
index d44118914a5..00000000000
--- a/www/firefox/patches/patch-gfx__2d__Blur.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-gfx__2d__Blur.cpp,v 1.1 2013/06/21 23:11:42 ryoon Exp $
-
-Bugzilla #883624:
-Force pointer/offset arithmetic to be done as ptrdiff_t, to avoid 32bit
-underflows on 64bit archs.
-
---- gfx/2d/Blur.cpp.orig	2013-05-11 21:19:29.000000000 +0200
-+++ gfx/2d/Blur.cpp	2013-06-16 11:24:47.000000000 +0200
-@@ -670,10 +670,10 @@
-   for (int32_t y = 0; y < size.height; y++) {
-     bool inSkipRectY = y > skipRect.y && y < skipRect.YMost();
- 
--    uint32_t *topLeftBase = innerIntegral + ((y - aTopLobe) * stride32bit - aLeftLobe);
--    uint32_t *topRightBase = innerIntegral + ((y - aTopLobe) * stride32bit + aRightLobe);
--    uint32_t *bottomRightBase = innerIntegral + ((y + aBottomLobe) * stride32bit + aRightLobe);
--    uint32_t *bottomLeftBase = innerIntegral + ((y + aBottomLobe) * stride32bit - aLeftLobe);
-+    uint32_t *topLeftBase = innerIntegral + ((ptrdiff_t)(y - aTopLobe) * stride32bit - aLeftLobe);
-+    uint32_t *topRightBase = innerIntegral + ((ptrdiff_t)(y - aTopLobe) * stride32bit + aRightLobe);
-+    uint32_t *bottomRightBase = innerIntegral + ((ptrdiff_t)(y + aBottomLobe) * stride32bit + aRightLobe);
-+    uint32_t *bottomLeftBase = innerIntegral + ((ptrdiff_t)(y + aBottomLobe) * stride32bit - aLeftLobe);
- 
-     for (int32_t x = 0; x < size.width; x++) {
-       if (inSkipRectY && x > skipRect.x && x < skipRect.XMost()) {