pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
firefox-hg: Remove uncommented or obsolete patches.
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sat Apr 30 19:39:44 2016 +0200
Changeset: 78314757e9f0f43e4883aee000ccabb9e7519d86
Modified Files:
firefox-hg/distinfo
Removed Files:
firefox-hg/patches/patch-bf
firefox-hg/patches/patch-config_rules.mk
firefox-hg/patches/patch-ipc_chromium_src_base_process__util.h
firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
firefox-hg/patches/patch-js__src__vm__SPSProfiler.cpp
firefox-hg/patches/patch-media_libcubeb_src_cubeb__alsa.c
firefox-hg/patches/patch-mfbt_Alignment.h
firefox-hg/patches/patch-mfbt_Attributes.h
firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp
firefox-hg/patches/patch-toolkit_toolkit.mozbuild
Log Message:
firefox-hg: Remove uncommented or obsolete patches.
firefox still builds and works as well as before on NetBSD 7.99.28/amd64.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78314757e9f0f43e4883aee000ccabb9e7519d86
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
firefox-hg/distinfo | 11 -----
firefox-hg/patches/patch-bf | 13 ------
firefox-hg/patches/patch-config_rules.mk | 12 ------
.../patch-ipc_chromium_src_base_process__util.h | 14 -------
firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_ast.py | 25 -----------
firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py | 27 ------------
.../patches/patch-js__src__vm__SPSProfiler.cpp | 17 --------
.../patches/patch-media_libcubeb_src_cubeb__alsa.c | 14 -------
firefox-hg/patches/patch-mfbt_Alignment.h | 48 ----------------------
firefox-hg/patches/patch-mfbt_Attributes.h | 32 ---------------
.../patches/patch-security_pkix_lib_pkixnames.cpp | 15 -------
firefox-hg/patches/patch-toolkit_toolkit.mozbuild | 15 -------
12 files changed, 243 deletions(-)
diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index c0d63b0..d8660dc 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -5,30 +5,19 @@ RMD160 (firefox-31.0.source.tar.bz2) = 8512ed164920c9fdad492ba2b47b46aae4894564
Size (firefox-31.0.source.tar.bz2) = 147507120 bytes
SHA1 (patch-aa) = d285a3c63b9ccc5f6a80a8dd5db9744de2478af6
SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
-SHA1 (patch-bf) = 87cd1a9a1d7503e0748569028a3d693124d43208
SHA1 (patch-browser_extensions_loop_run-all-loop-tests.sh) = 9f4bc8548485912f0b076ad63e4a64473da2e64d
SHA1 (patch-browser_installer_package-manifest.in) = 5a96a90a2c14c419ccab4de2e68f7bb21e738e3e
SHA1 (patch-build_autoconf_nss.m4) = 4241f056d0a046e3d028d823aa5ac54ada0a742b
SHA1 (patch-build_gyp.mozbuild) = 2842da0783d344dd12e86adde447f7cda6191518
-SHA1 (patch-config_rules.mk) = debd5acd52f4f7593ea4e54dd0fdad91eeb46839
SHA1 (patch-config_system-headers) = 24d880987c3e396a044b013b9bc541798e473648
SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e104bea7922dac0ce441bca4ba7a6f9b2379d17a
-SHA1 (patch-ipc_chromium_src_base_process__util.h) = 3a8f1b4d613af11fe7657255ba26fe5fe28a08dc
-SHA1 (patch-ipc_ipdl_ipdl_cxx_ast.py) = c91e03a142d38e68f1bcaa4c3d0d0231445232b3
-SHA1 (patch-ipc_ipdl_ipdl_cxx_cgen.py) = d7f7dc85b1ff26c6d7e902f94c0ac09f04497105
-SHA1 (patch-js__src__vm__SPSProfiler.cpp) = 989ba25e4c5308d21d07baa802decce13609a475
SHA1 (patch-js_src_jit_AtomicOperations.h) = 6baf712644b290173b874910246eab6da438b7de
SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = c2b7bc27a7e54476b00e142e79b456cbbe9d5d8c
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 57650470a96312fb1c4a2634711ede69e36666ff
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 9ff1dcf200feaf67bf576f07beb612e0ec91d7d1
SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = c7f8c14339c4cc5feb86c267aab300b06f9a7470
-SHA1 (patch-mfbt_Alignment.h) = 1d97ee858b62c31112fe90ebb2d8fe430c95ed56
-SHA1 (patch-mfbt_Attributes.h) = 4dd9acf3e19dbfaa5f3bbdf4982cfaa821c6d5cd
SHA1 (patch-modules_libpref_init_all.js) = 73dbe0c7001f9bfadb6ff7b50c340f7d135cb42a
-SHA1 (patch-security_pkix_lib_pkixnames.cpp) = 8f127128664049f28cb1d905a0528cf22dca12e0
SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform_macros.h) = 4abe361ffcab9f923e9ae7b9bdc0dfdb9ddce820
SHA1 (patch-toolkit_library_moz.build) = cc0af099f3f8b845aa44048d32db3fde8538d134
-SHA1 (patch-toolkit_toolkit.mozbuild) = a92b9f5114c3eab2c8e9f1d0eb21926235d2203a
SHA1 (patch-xg) = 2b472858270a109c2b317bb08698c12717174510
SHA1 (patch-xl) = 337960ba518f1f142b45ae91d3f122ee5e0c9da3
SHA1 (patch-xm) = 85000d412a7e7aa9ea8c337c9bc72b55d9e7ca63
diff --git a/firefox-hg/patches/patch-bf b/firefox-hg/patches/patch-bf
deleted file mode 100644
index 74d25ff..0000000
--- a/firefox-hg/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2015/01/29 11:27:51 thomasklausner Exp $
-
---- js/src/jsnativestack.cpp.orig 2013-09-10 03:43:36.000000000 +0000
-+++ js/src/jsnativestack.cpp
-@@ -114,7 +114,7 @@ js::GetNativeStackBaseImpl()
- pthread_attr_init(&sattr);
- # if defined(__OpenBSD__)
- stack_t ss;
--# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
-+# elif defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD) || defined(__NetBSD__) /* XXX tnn not sure why NETBSD isn't defined, it looks like it should be ... */
- /* e.g. on FreeBSD 4.8 or newer, neundorf%kde.org@localhost */
- pthread_attr_get_np(thread, &sattr);
- # else
diff --git a/firefox-hg/patches/patch-config_rules.mk b/firefox-hg/patches/patch-config_rules.mk
deleted file mode 100644
index 3bbbf89..0000000
--- a/firefox-hg/patches/patch-config_rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-config_rules.mk,v 1.3 2014/11/06 15:47:24 thomasklausner Exp $
-
---- config/rules.mk.orig 2014-11-06 09:56:12.000000000 +0000
-+++ config/rules.mk
-@@ -770,6 +770,7 @@ endif
- ifdef DTRACE_PROBE_OBJ
- EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
- OBJS += $(DTRACE_PROBE_OBJ)
-+EXCLUDED_OBJS += $(DTRACE_PROBE_OBJ)
- endif
-
- $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(STATIC_LIBS_DEPS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS)) $(EXTRA_DEPS) $(GLOBAL_DEPS)
diff --git a/firefox-hg/patches/patch-ipc_chromium_src_base_process__util.h b/firefox-hg/patches/patch-ipc_chromium_src_base_process__util.h
deleted file mode 100644
index 5b6f342..0000000
--- a/firefox-hg/patches/patch-ipc_chromium_src_base_process__util.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ipc_chromium_src_base_process__util.h,v 1.2 2015/01/29 11:43:22 thomasklausner Exp $
-
---- ipc/chromium/src/base/process_util.h.orig 2014-09-28 08:30:05.000000000 +0000
-+++ ipc/chromium/src/base/process_util.h
-@@ -41,6 +41,9 @@
- typedef PROCESSENTRY32 ProcessEntry;
- typedef IO_COUNTERS IoCounters;
- #elif defined(OS_POSIX)
-+#ifndef NAME_MAX
-+#define NAME_MAX _POSIX_NAME_MAX
-+#endif
- // TODO(port): we should not rely on a Win32 structure.
- struct ProcessEntry {
- int pid;
diff --git a/firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_ast.py b/firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
deleted file mode 100644
index 63a3022..0000000
--- a/firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_ast.py
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ipc_ipdl_ipdl_cxx_ast.py,v 1.1 2014/09/29 10:46:25 thomasklausner Exp $
-
-Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
-Make sure storage provided for attributes is properly aligned
-in the generated C++ code.
-
---- ipc/ipdl/ipdl/cxx/ast.py.orig 2015-10-20 08:24:26.000000000 +0000
-+++ ipc/ipdl/ipdl/cxx/ast.py
-@@ -340,12 +340,13 @@ Type.VOIDPTR = Type('void', ptr=1)
- Type.AUTO = Type('auto')
-
- class TypeArray(Node):
-- def __init__(self, basetype, nmemb):
-- '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr'''
-+ def __init__(self, basetype, nmemb, alignType):
-+ '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr, |alignType| is a type'''
- self.basetype = basetype
- self.nmemb = nmemb
-+ self.alignType = alignType
- def __deepcopy__(self, memo):
-- return TypeArray(deepcopy(self.basetype, memo), nmemb)
-+ return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)
-
- class TypeEnum(Node):
- def __init__(self, name=None):
diff --git a/firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py b/firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
deleted file mode 100644
index d25d51a..0000000
--- a/firefox-hg/patches/patch-ipc_ipdl_ipdl_cxx_cgen.py
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ipc_ipdl_ipdl_cxx_cgen.py,v 1.1 2014/09/29 10:46:25 thomasklausner Exp $
-
-Part of https://bugzilla.mozilla.org/show_bug.cgi?id=1026499:
-Make sure storage provided for attributes is properly aligned
-in the generated C++ code.
-
---- ipc/ipdl/ipdl/cxx/cgen.py.orig 2014-07-17 01:45:18.000000000 +0000
-+++ ipc/ipdl/ipdl/cxx/cgen.py
-@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
- def visitDecl(self, d):
- # C-syntax arrays make code generation much more annoying
- if isinstance(d.type, TypeArray):
-+ self.write('MOZ_ALIGNED_DECL(')
- d.type.basetype.accept(self)
- else:
- d.type.accept(self)
-@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):
- if isinstance(d.type, TypeArray):
- self.write('[')
- d.type.nmemb.accept(self)
-- self.write(']')
-+ self.write('], MOZ_ALIGNOF(')
-+ d.type.alignType.accept(self)
-+ self.write('))')
-
- def visitParam(self, p):
- self.visitDecl(p)
diff --git a/firefox-hg/patches/patch-js__src__vm__SPSProfiler.cpp b/firefox-hg/patches/patch-js__src__vm__SPSProfiler.cpp
deleted file mode 100644
index cef7917..0000000
--- a/firefox-hg/patches/patch-js__src__vm__SPSProfiler.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-js__src__vm__SPSProfiler.cpp,v 1.1 2014/09/29 10:46:25 thomasklausner Exp $
-
-Unclear fallout from our version of bug 840242, attachment v1: some architectures
-fail to link if we do not add the inlines here - might be compiler/arch specific.
-
-
---- js/src/vm/SPSProfiler.cpp.orig 2014-04-18 02:03:21.000000000 +0000
-+++ js/src/vm/SPSProfiler.cpp
-@@ -4,6 +4,8 @@
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-+#include "jscntxtinlines.h"
-+
- #include "vm/SPSProfiler.h"
-
- #include "mozilla/DebugOnly.h"
diff --git a/firefox-hg/patches/patch-media_libcubeb_src_cubeb__alsa.c b/firefox-hg/patches/patch-media_libcubeb_src_cubeb__alsa.c
deleted file mode 100644
index b0c6f02..0000000
--- a/firefox-hg/patches/patch-media_libcubeb_src_cubeb__alsa.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.2 2014/12/08 11:52:34 thomasklausner Exp $
-
---- media/libcubeb/src/cubeb_alsa.c.orig 2014-12-03 19:51:04.000000000 +0000
-+++ media/libcubeb/src/cubeb_alsa.c
-@@ -7,6 +7,9 @@
- #undef NDEBUG
- #define _DEFAULT_SOURCE
- #define _BSD_SOURCE
-+#if defined(__NetBSD__)
-+#define _NETBSD_SOURCE
-+#endif
- #define _XOPEN_SOURCE 500
- #include <pthread.h>
- #include <sys/time.h>
diff --git a/firefox-hg/patches/patch-mfbt_Alignment.h b/firefox-hg/patches/patch-mfbt_Alignment.h
deleted file mode 100644
index 36fdc4b..0000000
--- a/firefox-hg/patches/patch-mfbt_Alignment.h
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-mfbt_Alignment.h,v 1.2 2015/08/17 07:30:48 thomasklausner Exp $
-
-Make MOZ_ALIGNOF() use gcc's builtin __alignof__.
-From https://bugzilla.mozilla.org/show_bug.cgi?id=1026499
-
---- mfbt/Alignment.h.orig 2015-08-16 14:08:46.000000000 +0000
-+++ mfbt/Alignment.h
-@@ -10,11 +10,20 @@
- #define mozilla_Alignment_h
-
- #include "mozilla/Attributes.h"
-+#include "mozilla/Attributes.h"
-+
- #include <stddef.h>
- #include <stdint.h>
-
- namespace mozilla {
-
-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
-+#define MOZ_ALIGNOF(T) alignof(T)
-+#elif defined(__GNUC__)
-+#define MOZ_ALIGNOF(T) __alignof__(T)
-+#elif defined(_MSC_VER)
-+#define MOZ_ALIGNOF(T) __alignof(T)
-+#else
- /*
- * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
- * bytes of alignment a given type needs.
-@@ -33,6 +42,7 @@ public:
- };
-
- #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
-+#endif
-
- /*
- * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
-@@ -44,7 +54,10 @@ public:
- * will declare a two-character array |arr| aligned to 8 bytes.
- */
-
--#if defined(__GNUC__)
-+#if defined(MOZ_HAVE_CXX11_ALIGNAS)
-+# define MOZ_ALIGNED_DECL(_type, _align) \
-+ alignas(_align) _type
-+#elif defined(__GNUC__)
- # define MOZ_ALIGNED_DECL(_type, _align) \
- _type __attribute__((aligned(_align)))
- #elif defined(_MSC_VER)
diff --git a/firefox-hg/patches/patch-mfbt_Attributes.h b/firefox-hg/patches/patch-mfbt_Attributes.h
deleted file mode 100644
index 7fa4e30..0000000
--- a/firefox-hg/patches/patch-mfbt_Attributes.h
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-mfbt_Attributes.h,v 1.6 2015/08/17 07:30:48 thomasklausner Exp $
-
---- mfbt/Attributes.h.orig 2016-04-25 13:39:04.000000000 +0000
-+++ mfbt/Attributes.h
-@@ -50,6 +50,7 @@
- * don't indicate support for them here, due to
- * http://stackoverflow.com/questions/20498142/visual-studio-2013-explicit-keyword-bug
- */
-+# define MOZ_HAVE_CXX11_ALIGNAS
- # define MOZ_HAVE_NEVER_INLINE __declspec(noinline)
- # define MOZ_HAVE_NORETURN __declspec(noreturn)
- # if _MSC_VER >= 1900
-@@ -72,6 +73,9 @@
- # ifndef __has_extension
- # define __has_extension __has_feature /* compatibility, for older versions of clang */
- # endif
-+# if __has_extension(cxx_alignas)
-+# define MOZ_HAVE_CXX11_ALIGNAS
-+# endif
- # if __has_extension(cxx_constexpr)
- # define MOZ_HAVE_CXX11_CONSTEXPR
- # endif
-@@ -85,6 +89,9 @@
- # define MOZ_HAVE_NORETURN __attribute__((noreturn))
- # endif
- #elif defined(__GNUC__)
-+# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
-+# define MOZ_HAVE_CXX11_ALIGNAS
-+# endif
- # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
- # define MOZ_HAVE_CXX11_CONSTEXPR
- # define MOZ_HAVE_CXX11_CONSTEXPR_IN_TEMPLATES
diff --git a/firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp b/firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp
deleted file mode 100644
index b664619..0000000
--- a/firefox-hg/patches/patch-security_pkix_lib_pkixnames.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-For memmove().
-
---- security/pkix/lib/pkixnames.cpp.orig 2016-03-19 10:59:41.602327520 +0000
-+++ security/pkix/lib/pkixnames.cpp
-@@ -37,6 +37,8 @@
- #include "pkixcheck.h"
- #include "pkixutil.h"
-
-+#include <string.h>
-+
- namespace mozilla { namespace pkix {
-
- namespace {
diff --git a/firefox-hg/patches/patch-toolkit_toolkit.mozbuild b/firefox-hg/patches/patch-toolkit_toolkit.mozbuild
deleted file mode 100644
index f455d5f..0000000
--- a/firefox-hg/patches/patch-toolkit_toolkit.mozbuild
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-toolkit_toolkit.mozbuild,v 1.2 2014/10/03 13:48:56 thomasklausner Exp $
-
---- toolkit/toolkit.mozbuild.orig 2014-10-03 13:16:21.000000000 +0000
-+++ toolkit/toolkit.mozbuild
-@@ -38,8 +38,8 @@ DIRS += [
- if CONFIG['MOZ_AUTH_EXTENSION']:
- DIRS += ['/extensions/auth']
-
--if CONFIG['MOZ_UPDATER']:
-- DIRS += ['/other-licenses/bsdiff']
-+#if CONFIG['MOZ_UPDATER']:
-+# DIRS += ['/other-licenses/bsdiff']
-
- # Gecko/Core components.
-
Home |
Main Index |
Thread Index |
Old Index