Partially regenerate patches to avoid "ignoring"

4 files changed, 22 insertions, 22 deletions

diff --git a/www/firefox24/distinfo b/www/firefox24/distinfo
index 44d1cc4e27b..a0964c3fec2 100644
--- a/www/firefox24/distinfo
+++ b/www/firefox24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2014/03/21 15:00:51 ryoon Exp $
+$NetBSD: distinfo,v 1.9 2014/03/26 13:56:22 ryoon Exp $
 
 SHA1 (firefox-24.4.0esr.source.tar.bz2) = 11e3e78482440628d3095d02821e714027665d33
 RMD160 (firefox-24.4.0esr.source.tar.bz2) = a940856c9d1d17a483b5defbdcceaa10cd92876a
@@ -6,8 +6,8 @@ Size (firefox-24.4.0esr.source.tar.bz2) = 119614180 bytes
 SHA1 (patch-aa) = bc6b89aa36a429ee148685618cca08dba3e01bbc
 SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
 SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2
-SHA1 (patch-ao) = ebf95a9abf76439cdd890ea34f75f0d8d1114fe0
-SHA1 (patch-as) = c7786810f05a38bd58ee7fe33c9ae17ad872a28a
+SHA1 (patch-ao) = fdb521b3d895b85f8b2b0516cdc1eec6a6b5f6e1
+SHA1 (patch-as) = 0c1818ca9fd663810e655cf5078e60526f7d58c3
 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
 SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d
 SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
@@ -36,7 +36,7 @@ SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = 493fced792610ea1ce5ab6b1e043e
 SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__name.h) = 61a6611b3dd08f5bd56681244eefbfa3f209f6a1
 SHA1 (patch-gfx_skia_src_sfnt_SkSFNTHeader.h) = 9d997d23ed80370e5b36648b9b35d80c5db88be8
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574
-SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = 7fcc7b0fcf5a33486214197e925fbc8e6e22e2ee
+SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = c2e25f3ae1d2c3e97f6855bdafabcdefd404cf66
 SHA1 (patch-ipc_chromium_Makefile.in) = ee56ff382dc6027780a02832c765335c25076eba
 SHA1 (patch-ipc_chromium_chromium-config.mk) = 6eab1cb974a5a8550e9ea8f9290a9cec8e2aa133
 SHA1 (patch-ipc_chromium_src_base_base__paths.h) = 7bc83577a9678542db4dff7dda19d751ff6d78c1
diff --git a/www/firefox24/patches/patch-ao b/www/firefox24/patches/patch-ao
index a2c504fc672..b7bfffbce90 100644
--- a/www/firefox24/patches/patch-ao
+++ b/www/firefox24/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 2013/11/03 04:51:59 ryoon Exp $
+$NetBSD: patch-ao,v 1.2 2014/03/26 13:56:22 ryoon Exp $
 
---- toolkit/mozapps/installer/packager.mk.orig	2013-03-26 22:18:05.000000000 +0000
+--- toolkit/mozapps/installer/packager.mk.orig	2014-03-15 16:06:46.000000000 +0000
 +++ toolkit/mozapps/installer/packager.mk
-@@ -911,8 +911,8 @@ endif
+@@ -676,8 +676,8 @@ endif
  	(cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
  	  (cd $(DESTDIR)$(installdir) && tar -xf -)
  	$(NSINSTALL) -D $(DESTDIR)$(bindir)
diff --git a/www/firefox24/patches/patch-as b/www/firefox24/patches/patch-as
index 8820bb3ae75..11b576ae41b 100644
--- a/www/firefox24/patches/patch-as
+++ b/www/firefox24/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.3 2014/01/03 17:15:23 richard Exp $
+$NetBSD: patch-as,v 1.4 2014/03/26 13:56:22 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- js/src/configure.in.orig	2013-12-06 02:21:11.000000000 +0000
+--- js/src/configure.in.orig	2014-03-15 16:06:29.000000000 +0000
 +++ js/src/configure.in
-@@ -2426,6 +2426,7 @@ EOF
+@@ -2431,6 +2431,7 @@ EOF
  #pragma GCC visibility push(hidden)
  #pragma GCC visibility push(default)
  #include <string.h>
@@ -12,7 +12,7 @@ Treat DragonFly like FreeBSD.
  #pragma GCC visibility pop
  
  __attribute__ ((visibility ("default"))) void Func() {
-@@ -2434,7 +2435,7 @@ __attribute__ ((visibility ("default")))
+@@ -2439,7 +2440,7 @@ __attribute__ ((visibility ("default")))
  }
  EOF
                         ac_cv_have_visibility_builtin_bug=no
@@ -21,7 +21,7 @@ Treat DragonFly like FreeBSD.
                           ac_cv_have_visibility_builtin_bug=yes
                         else
                           if test `grep -c "@PLT" conftest.S` = 0; then
-@@ -2499,7 +2500,7 @@ AC_LANG_C
+@@ -2504,7 +2505,7 @@ AC_LANG_C
  
  AC_ARG_ENABLE(dtrace,
                [  --enable-dtrace         build with dtrace support if available (default=no)],
@@ -30,7 +30,7 @@ Treat DragonFly like FreeBSD.
  if test "x$enable_dtrace" = "xyes"; then
    MOZ_CHECK_HEADER(sys/sdt.h, HAVE_DTRACE=1)
    if test -n "$HAVE_DTRACE"; then
-@@ -2659,7 +2660,7 @@ then
+@@ -2664,7 +2665,7 @@ then
      fi
  
  	case "$target" in
@@ -39,7 +39,7 @@ Treat DragonFly like FreeBSD.
  			AC_DEFINE(_REENTRANT)
  			AC_DEFINE(_THREAD_SAFE)
  			dnl -pthread links in -lpthread, so don't specify it explicitly.
-@@ -2738,14 +2739,19 @@ fi
+@@ -2743,14 +2744,19 @@ fi
  AC_CACHE_CHECK(
      [for res_ninit()],
      ac_cv_func_res_ninit,
@@ -62,7 +62,7 @@ Treat DragonFly like FreeBSD.
          [ac_cv_func_res_ninit=no])
      ])
  
-@@ -3519,7 +3525,7 @@ if test "$MOZ_MEMORY"; then
+@@ -3524,7 +3530,7 @@ if test "$MOZ_MEMORY"; then
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
@@ -71,7 +71,7 @@ Treat DragonFly like FreeBSD.
      AC_DEFINE(MOZ_MEMORY_BSD)
      ;;
    *-android*|*-linuxandroid*)
-@@ -4419,6 +4425,16 @@ fi
+@@ -4424,6 +4430,16 @@ fi
  dnl ========================================================
  dnl ECMAScript Internationalization API Support (uses ICU)
  dnl ========================================================
@@ -88,13 +88,13 @@ Treat DragonFly like FreeBSD.
  
  if test -n "$JS_STANDALONE"; then
      ENABLE_INTL_API=1
-@@ -4431,37 +4447,36 @@ MOZ_ARG_ENABLE_BOOL(intl-api,
+@@ -4436,37 +4452,36 @@ MOZ_ARG_ENABLE_BOOL(intl-api,
  dnl Settings for the implementation of the ECMAScript Internationalization API
  if test -n "$ENABLE_INTL_API"; then
      AC_DEFINE(ENABLE_INTL_API)
 -    # We build ICU as a static library.
 -    AC_DEFINE(U_STATIC_IMPLEMENTATION)
--
+ 
 -    case "$OS_TARGET" in
 -        WINNT)
 -            ICU_LIB_NAMES="icuin icuuc icudt"
@@ -105,7 +105,7 @@ Treat DragonFly like FreeBSD.
 -        *)
 -            AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
 -    esac
- 
+-
 -    ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
 -else
 -    ICU_LIB_NAMES=
diff --git a/www/firefox24/patches/patch-intl_hyphenation_src_hnjalloc.h b/www/firefox24/patches/patch-intl_hyphenation_src_hnjalloc.h
index 35b83582498..82aae741657 100644
--- a/www/firefox24/patches/patch-intl_hyphenation_src_hnjalloc.h
+++ b/www/firefox24/patches/patch-intl_hyphenation_src_hnjalloc.h
@@ -1,8 +1,8 @@
-$NetBSD: patch-intl_hyphenation_src_hnjalloc.h,v 1.1 2013/11/03 04:51:59 ryoon Exp $
+$NetBSD: patch-intl_hyphenation_src_hnjalloc.h,v 1.2 2014/03/26 13:56:22 ryoon Exp $
 
---- intl/hyphenation/src/hnjalloc.h.orig	2013-05-11 19:19:31.000000000 +0000
+--- intl/hyphenation/src/hnjalloc.h.orig	2014-03-15 16:06:28.000000000 +0000
 +++ intl/hyphenation/src/hnjalloc.h
-@@ -56,6 +56,9 @@
+@@ -24,6 +24,9 @@
   */
  
  #include <stdio.h> /* ensure stdio.h is loaded before our macros */