diff options
author | ryoon <ryoon@pkgsrc.org> | 2013-02-03 12:59:29 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2013-02-03 12:59:29 +0000 |
commit | f58977df90062ae70c3edf44a70d3fac44e7b9b5 (patch) | |
tree | 6eaf84173724950677e13ef12457009c8f805056 /devel | |
parent | b31a3cc86f867f96f88c9fb9d4c65b0a89d77a1a (diff) | |
download | pkgsrc-f58977df90062ae70c3edf44a70d3fac44e7b9b5.tar.gz |
Remove obsolete patches.
Noticed by Jan Beich.
These patches are not used or already fixed in another way.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/xulrunner/Makefile | 6 | ||||
-rw-r--r-- | devel/xulrunner/distinfo | 10 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-ax | 13 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-config_system-headers | 15 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h | 120 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-js_src_config_system-headers | 15 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-js_src_jscpucfg.h | 27 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c | 14 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp | 21 | ||||
-rw-r--r-- | devel/xulrunner/patches/patch-storage_src_Makefile.in | 29 |
10 files changed, 5 insertions, 265 deletions
diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index 36dd12c9e92..08d9e1148d4 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.92 2013/02/01 22:21:06 wiz Exp $ +# $NetBSD: Makefile,v 1.93 2013/02/03 12:59:29 ryoon Exp $ .include "dist.mk" PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel www MAINTAINER= pkgsrc-users@NetBSD.org @@ -28,6 +28,8 @@ ALL_ENV+= MOZILLA_PKG_NAME=xulrunner MAKE_ENV+= FREEBL_NO_DEPEND=0 +GCC_REQD+= 4.5 + # workround for link of xulrunner-bin etc. LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner -Wl,-rpath,${PREFIX}/lib diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index 85aad788e33..1f501a08c46 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.91 2013/01/20 11:17:23 ryoon Exp $ +$NetBSD: distinfo,v 1.92 2013/02/03 12:59:29 ryoon Exp $ SHA1 (firefox-18.0.1.source.tar.bz2) = 26415396233450a4e66bb0e0a73a258e1cb174ef RMD160 (firefox-18.0.1.source.tar.bz2) = 12079743329084ca6f9d0eed23ee6ece6da1e867 @@ -19,7 +19,6 @@ SHA1 (patch-at) = c5cb543ab423657d546559de0603356c9bc2f2f3 SHA1 (patch-au) = d577fc9a0091915e36d67a6ad82f0e7bfc107e7b SHA1 (patch-av) = 20dcf216808667d71e527a6126b1a9b76130a13b SHA1 (patch-aw) = 237be5fa18846b51b67ef2c2ea5f4fb427c529aa -SHA1 (patch-ax) = f5cf522e27651fb65b9c5e9a8f855f5be85d3c49 SHA1 (patch-ay) = 70c68275b6dc41e66fcf8330e9ebcc4743363926 SHA1 (patch-az) = 2012a7fef2eac59f48ff21fea0e205e89b313e46 SHA1 (patch-ba) = 1692053c1b0e65dd38bcf37cc1a80390cce081eb @@ -29,34 +28,27 @@ SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85 SHA1 (patch-build_autoconf_nss.m4) = 4731f46a41f6d4ff31a6da07c9badb328a0f676f SHA1 (patch-config_baseconfig.mk) = 4f8e966e5e9684c165929d02f82099fb4befcc75 -SHA1 (patch-config_system-headers) = efd98efa4c141f03d73b1b0afa5437a19987805c SHA1 (patch-dom_system_OSFileConstants.cpp) = 692f3c538311fdae777ada67fc1362513c06bc10 SHA1 (patch-gfx_skia_Makefile.in) = ddc7e4a375f4cfd7dd76c5b37835bbcd3ad13cf1 SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__head.h) = 493fced792610ea1ce5ab6b1e043ef36b33f8279 SHA1 (patch-gfx_skia_src_sfnt_SkOTTable__name.h) = 61a6611b3dd08f5bd56681244eefbfa3f209f6a1 SHA1 (patch-gfx_skia_src_sfnt_SkSFNTHeader.h) = 9d997d23ed80370e5b36648b9b35d80c5db88be8 SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = 1ebc8e894e9d63961f49ba0798ad3eed100d95a6 -SHA1 (patch-ipc_chromium_src_base_dir__reader__bsd.h) = 2c64811cc18813330ac6b4c4a846942fb4b480d6 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = faed34d94646453cd01acbdec1da2d9ec0f3d05f SHA1 (patch-ipc_ipdl_ipdl_lower.py) = 4025c0a4e149d9b2087331e10b342734fa77a905 -SHA1 (patch-js_src_config_system-headers) = 8d578675746d6292100c8d40435073c7a2cce832 -SHA1 (patch-js_src_jscpucfg.h) = e879a06e59537c730f01c2b5aa3fe7a3ffdabb2a SHA1 (patch-js_src_jsgc.cpp) = c514b7fb84002a1909638cd7f3386931cb0f2551 SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = f9b13d9e7910613c82f6b1ee4131a6c4eb1d4580 SHA1 (patch-mb) = 9d13c8eae6ea4a2993aa991d27f1fb5c671339ef SHA1 (patch-md) = 7fd607a3edd2ea5f7a5671fc6d06fba69c46c36f SHA1 (patch-me) = 2ff755782bd35caded8934000d039976dad44103 SHA1 (patch-media_libcubeb_src_Makefile.in) = a24f1a79a14b1933286cd85618fbe91db109176d -SHA1 (patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c) = 69fa597e345c61a7352d5a3fcc29f8644b65d575 SHA1 (patch-mp) = 4910e468bce689f02dc6a0d9ee92a827c9f5cf7b -SHA1 (patch-netwerk_protocol_http_HttpChannelParent.cpp) = 00b8402cedea55b8e883f4806bba4fece97efa2a SHA1 (patch-pa) = 8045cf02d83e87684b497dd30e890107f76a3bdf SHA1 (patch-pb) = 7665d8156fa734cdc2e1746558cc08b7eefce98e SHA1 (patch-pc) = 099a4f6ac32fd2f45c91eb525750bde96684693a SHA1 (patch-pd) = 9750259906ee270f6898e3c77288aa5260d6e9a7 SHA1 (patch-pg) = d6d6071cbe8a771873e1537034c0bb9186f8e245 SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121 -SHA1 (patch-storage_src_Makefile.in) = c987de5895680b05104287c9c5b4f87786789bc8 SHA1 (patch-toolkit_components_osfile_osfileutils.cpp) = baeaad49f79f8478a47e84879a2eaa4b57514f73 SHA1 (patch-toolkit_library_Makefile.in) = 9206b614833cdd27f9d29c478ab0490eea709983 SHA1 (patch-toolkit_toolkit-tiers.mk) = 59e5174edd04f3c4e5d6ebb450a42e4e1dee0801 diff --git a/devel/xulrunner/patches/patch-ax b/devel/xulrunner/patches/patch-ax deleted file mode 100644 index 2cb1973f7c8..00000000000 --- a/devel/xulrunner/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.7 2013/01/10 15:01:30 ryoon Exp $ - ---- xpcom/base/nsStackWalk.cpp.orig 2013-01-04 23:44:47.000000000 +0000 -+++ xpcom/base/nsStackWalk.cpp -@@ -23,7 +23,7 @@ struct CriticalAddress { - }; - static CriticalAddress gCriticalAddress; - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__NetBSD__) - #include <dlfcn.h> - #endif - diff --git a/devel/xulrunner/patches/patch-config_system-headers b/devel/xulrunner/patches/patch-config_system-headers deleted file mode 100644 index a26dc784634..00000000000 --- a/devel/xulrunner/patches/patch-config_system-headers +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-config_system-headers,v 1.3 2013/01/10 15:01:30 ryoon Exp $ - ---- config/system-headers.orig 2013-01-04 23:44:28.000000000 +0000 -+++ config/system-headers -@@ -1119,6 +1119,10 @@ gst/gst.h - gst/app/gstappsink.h - gst/app/gstappsrc.h - gst/video/video.h -+sys/thr.h -+sys/user.h -+kvm.h -+spawn.h - sys/msg.h - sys/ipc.h - sys/thr.h diff --git a/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h b/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h deleted file mode 100644 index 0dd5ec8d5fa..00000000000 --- a/devel/xulrunner/patches/patch-ipc_chromium_src_base_dir__reader__bsd.h +++ /dev/null @@ -1,120 +0,0 @@ -$NetBSD: patch-ipc_chromium_src_base_dir__reader__bsd.h,v 1.4 2013/01/10 15:01:30 ryoon Exp $ - ---- ipc/chromium/src/base/dir_reader_bsd.h.orig 2013-01-04 23:44:34.000000000 +0000 -+++ ipc/chromium/src/base/dir_reader_bsd.h -@@ -110,3 +110,115 @@ class DirReaderBSD { - } // namespace base - - #endif // BASE_DIR_READER_BSD_H_ -+// Copyright (c) 2010 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+// derived from dir_reader_linux.h -+ -+#ifndef BASE_DIR_READER_BSD_H_ -+#define BASE_DIR_READER_BSD_H_ -+#pragma once -+ -+#include <dirent.h> -+#include <errno.h> -+#include <fcntl.h> -+#include <stdint.h> -+#include <unistd.h> -+ -+#include "base/logging.h" -+#include "base/eintr_wrapper.h" -+ -+// See the comments in dir_reader_posix.h about this. -+ -+namespace base { -+ -+class DirReaderBSD { -+ public: -+ explicit DirReaderBSD(const char* directory_path) -+#ifdef O_DIRECTORY -+ : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)), -+#else -+ : fd_(open(directory_path, O_RDONLY)), -+#endif -+ offset_(0), -+ size_(0) { -+ memset(buf_, 0, sizeof(buf_)); -+ } -+ -+ ~DirReaderBSD() { -+ if (fd_ >= 0) { -+ if (HANDLE_EINTR(close(fd_))) -+ DLOG(ERROR) << "Failed to close directory handle"; -+ } -+ } -+ -+ bool IsValid() const { -+ return fd_ >= 0; -+ } -+ -+ // Move to the next entry returning false if the iteration is complete. -+ bool Next() { -+ if (size_) { -+ struct dirent* dirent = reinterpret_cast<struct dirent*>(&buf_[offset_]); -+#ifdef OS_DRAGONFLY -+ offset_ += _DIRENT_DIRSIZ(dirent); -+#else -+ offset_ += dirent->d_reclen; -+#endif -+ } -+ -+ if (offset_ != size_) -+ return true; -+ -+#ifdef OS_OPENBSD -+ const int r = getdirentries(fd_, buf_, sizeof(buf_), basep_); -+#else -+ const int r = getdents(fd_, buf_, sizeof(buf_)); -+#endif -+ if (r == 0) -+ return false; -+ if (r == -1) { -+#ifdef OS_OPENBSD -+ DLOG(ERROR) << "getdirentries returned an error: " << errno; -+#else -+ DLOG(ERROR) << "getdents returned an error: " << errno; -+#endif -+ return false; -+ } -+ size_ = r; -+ offset_ = 0; -+ return true; -+ } -+ -+ const char* name() const { -+ if (!size_) -+ return NULL; -+ -+ const struct dirent* dirent = -+ reinterpret_cast<const struct dirent*>(&buf_[offset_]); -+ return dirent->d_name; -+ } -+ -+ int fd() const { -+ return fd_; -+ } -+ -+ static bool IsFallback() { -+ return false; -+ } -+ -+ private: -+ const int fd_; -+ char buf_[512]; -+#ifdef OS_OPENBSD -+ off_t *basep_; -+#endif -+ size_t offset_, size_; -+ -+ DISALLOW_COPY_AND_ASSIGN(DirReaderBSD); -+}; -+ -+} // namespace base -+ -+#endif // BASE_DIR_READER_BSD_H_ diff --git a/devel/xulrunner/patches/patch-js_src_config_system-headers b/devel/xulrunner/patches/patch-js_src_config_system-headers deleted file mode 100644 index cbf39d6d9fe..00000000000 --- a/devel/xulrunner/patches/patch-js_src_config_system-headers +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-js_src_config_system-headers,v 1.3 2013/01/10 15:01:31 ryoon Exp $ - ---- js/src/config/system-headers.orig 2013-01-04 23:44:34.000000000 +0000 -+++ js/src/config/system-headers -@@ -1119,6 +1119,10 @@ gst/gst.h - gst/app/gstappsink.h - gst/app/gstappsrc.h - gst/video/video.h -+sys/thr.h -+sys/user.h -+kvm.h -+spawn.h - sys/msg.h - sys/ipc.h - sys/thr.h diff --git a/devel/xulrunner/patches/patch-js_src_jscpucfg.h b/devel/xulrunner/patches/patch-js_src_jscpucfg.h deleted file mode 100644 index 7af2c01bb42..00000000000 --- a/devel/xulrunner/patches/patch-js_src_jscpucfg.h +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-js_src_jscpucfg.h,v 1.5 2013/01/10 15:01:31 ryoon Exp $ - - ---- js/src/jscpucfg.h.orig 2013-01-04 23:44:35.000000000 +0000 -+++ js/src/jscpucfg.h -@@ -44,6 +44,21 @@ - # define IS_BIG_ENDIAN 1 - # endif - -+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__MirBSD__) || defined(__DragonFly__) -+#include <sys/endian.h> -+ -+#if defined(_BYTE_ORDER) -+#if _BYTE_ORDER == _LITTLE_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#elif _BYTE_ORDER == _BIG_ENDIAN -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#endif -+#else /* !defined(_BYTE_ORDER) */ -+#error "sys/endian.h does not define _BYTE_ORDER. Cannot determine endianness." -+#endif -+ - #elif defined(JS_HAVE_ENDIAN_H) - # include <endian.h> - diff --git a/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c b/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c deleted file mode 100644 index e2c572f5c38..00000000000 --- a/devel/xulrunner/patches/patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c,v 1.4 2013/01/10 15:01:31 ryoon Exp $ - ---- media/libsydneyaudio/src/sydney_audio_pulseaudio.c.orig 2013-01-04 23:44:40.000000000 +0000 -+++ media/libsydneyaudio/src/sydney_audio_pulseaudio.c -@@ -6,7 +6,9 @@ - #include <stdio.h> - #include <string.h> - #include <pthread.h> -+_Pragma("GCC visibility push(default)") - #include <pulse/pulseaudio.h> -+_Pragma("GCC visibility pop") - #include "sydney_audio.h" - - /* Pulseaudio implementation based heavily on sydney_audio_alsa.c */ diff --git a/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp b/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp deleted file mode 100644 index 4fa09e5c2c4..00000000000 --- a/devel/xulrunner/patches/patch-netwerk_protocol_http_HttpChannelParent.cpp +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-netwerk_protocol_http_HttpChannelParent.cpp,v 1.5 2013/01/10 15:01:31 ryoon Exp $ - -* Fix build with gcc<4.5, for example, DragonFly 3.0.1. - See https://bugzilla.mozilla.org/show_bug.cgi?id=621446 - ---- netwerk/protocol/http/HttpChannelParent.cpp.orig 2013-01-04 23:44:42.000000000 +0000 -+++ netwerk/protocol/http/HttpChannelParent.cpp -@@ -334,6 +334,13 @@ HttpChannelParent::RecvUpdateAssociatedC - return true; - } - -+// Compiling with a version of GCC <= 4.4 fails with an internal compiler -+// error. -+#if !defined(__GNUC__) || \ -+ (__GNUC__ >= 5) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) -+#pragma GCC optimize ("O0") -+#endif -+ - bool - HttpChannelParent::RecvRedirect2Verify(const nsresult& result, - const RequestHeaderTuples& changedHeaders) diff --git a/devel/xulrunner/patches/patch-storage_src_Makefile.in b/devel/xulrunner/patches/patch-storage_src_Makefile.in deleted file mode 100644 index e7ca8f2ce82..00000000000 --- a/devel/xulrunner/patches/patch-storage_src_Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-storage_src_Makefile.in,v 1.5 2013/01/10 15:01:31 ryoon Exp $ - -* Support jemalloc on *BSD - ---- storage/src/Makefile.in.orig 2013-01-04 23:44:44.000000000 +0000 -+++ storage/src/Makefile.in -@@ -34,6 +34,22 @@ DEFINES += -DMOZ_STORAGE_MEMORY - endif - endif - -+ifeq ($(OS_ARCH),DragonFly) -+DEFINES += -DXP_BSD -+endif -+ -+ifeq ($(OS_ARCH),FreeBSD) -+DEFINES += -DXP_BSD -+endif -+ -+ifeq ($(OS_ARCH),NetBSD) -+DEFINES += -DXP_BSD -+endif -+ -+ifeq ($(OS_ARCH),FreeBSD) -+DEFINES += -DXP_BSD -+endif -+ - EXPORTS_NAMESPACES = mozilla/storage - - EXPORTS_mozilla/storage = \ |