Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/seamonkey seamonkey: Remove hacks to disable multi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b2129f9be995
branches: trunk
changeset: 434409:b2129f9be995
user: nia <nia%pkgsrc.org@localhost>
date: Tue Jun 16 09:09:02 2020 +0000
description:
seamonkey: Remove hacks to disable multiprocess mode and remains of OSS
diffstat:
www/seamonkey/Makefile | 4 +-
www/seamonkey/distinfo | 14 +-
www/seamonkey/patches/patch-mail_app_Makefile.in | 15 -
www/seamonkey/patches/patch-mozilla_browser_app_profile_firefox.js | 15 -
www/seamonkey/patches/patch-mozilla_build_moz.configure_old.configure | 12 -
www/seamonkey/patches/patch-mozilla_dom_media_CubebUtils.cpp | 14 +-
www/seamonkey/patches/patch-mozilla_gfx_layers_client_ClientPaintedLayer.cpp | 17 +
www/seamonkey/patches/patch-mozilla_ipc_glue_CrossProcessSemaphore.h | 18 -
www/seamonkey/patches/patch-mozilla_ipc_glue_CrossProcessSemaphore__posix.cpp | 188 ----------
www/seamonkey/patches/patch-mozilla_toolkit_library_moz.build | 9 +-
10 files changed, 35 insertions(+), 271 deletions(-)
diffs (truncated from 390 to 300 lines):
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/Makefile
--- a/www/seamonkey/Makefile Tue Jun 16 09:04:38 2020 +0000
+++ b/www/seamonkey/Makefile Tue Jun 16 09:09:02 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.215 2020/06/07 22:32:55 nia Exp $
+# $NetBSD: Makefile,v 1.216 2020/06/16 09:09:02 nia Exp $
DISTNAME= seamonkey-${SM_VER}.source
PKGNAME= seamonkey-${SM_VER:S/b/beta/}
-PKGREVISION= 2
+PKGREVISION= 3
SM_VER= 2.53.2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/distinfo
--- a/www/seamonkey/distinfo Tue Jun 16 09:04:38 2020 +0000
+++ b/www/seamonkey/distinfo Tue Jun 16 09:09:02 2020 +0000
@@ -1,22 +1,20 @@
-$NetBSD: distinfo,v 1.164 2020/06/02 06:11:28 rillig Exp $
+$NetBSD: distinfo,v 1.165 2020/06/16 09:09:02 nia Exp $
SHA1 (seamonkey-2.53.2.source.tar.xz) = 7c6e3295a751aa36c8325e20ef1367d0fb643120
RMD160 (seamonkey-2.53.2.source.tar.xz) = 567c8bd64166e5854c712f2c2d6ca0dea182c75b
SHA512 (seamonkey-2.53.2.source.tar.xz) = 58dd605a916ef7fb9cad112bb54fffc837690e458e1254b685f21df1bc8808a9b53d27147cad1064294c789d1f77f17c9f6adecf2be906afa44128496f72a805
Size (seamonkey-2.53.2.source.tar.xz) = 291744036 bytes
SHA1 (patch-ldap_c-sdk_include_portable.h) = b262539b92c6822a5ae8c98743d2d71b27bb076a
-SHA1 (patch-mail_app_Makefile.in) = 5c55c0f80b6ccbf0ff7f88a35c164a9312ac2b77
+SHA1 (patch-mail_app_Makefile.in) = da39a3ee5e6b4b0d3255bfef95601890afd80709
SHA1 (patch-mailnews_base_search_src_nsMsgSearchTerm.cpp) = d70faf66d802de613caa6a12cc36d9021caab41d
-SHA1 (patch-mozilla_browser_app_profile_firefox.js) = 96822c46f740ce31eab668ce989897a1ce34a420
SHA1 (patch-mozilla_browser_branding_unofficial_locales_en-US_brand.dtd) = 174e1766565f576c79019a05c81f010a3ceaee2f
-SHA1 (patch-mozilla_build_moz.configure_old.configure) = b6ca035008afdff217cb81c0046fae442aa0ae9a
+SHA1 (patch-mozilla_build_moz.configure_old.configure) = da39a3ee5e6b4b0d3255bfef95601890afd80709
SHA1 (patch-mozilla_dom_base_nsAttrName.h) = 3ddbe33950d93e06e41a43de3395a1794a66e61a
-SHA1 (patch-mozilla_dom_media_CubebUtils.cpp) = d3267e5b2ee9a87ba79c77636ecefeb86bfadf1c
+SHA1 (patch-mozilla_dom_media_CubebUtils.cpp) = 8949ad37cbde3ab2471d1771282809a254d3ec86
+SHA1 (patch-mozilla_gfx_layers_client_ClientPaintedLayer.cpp) = 5ed6afee07c97782e30d4dd7a37465230fb553fb
SHA1 (patch-mozilla_ipc_chromium_src_base_lock__impl__posix.cc) = 985f4548d15a54f39e7d805c507131b3c6b67532
SHA1 (patch-mozilla_ipc_chromium_src_base_message__pump__libevent.cc) = 00240cfb510cf71259640fd4aa428621f0eb75ba
SHA1 (patch-mozilla_ipc_chromium_src_base_platform__thread__posix.cc) = 5abcee4d027dad6f29ac6ea7e002f0af47bbce3a
-SHA1 (patch-mozilla_ipc_glue_CrossProcessSemaphore.h) = 1fba3d966c5e0088cc5d9796a7fd74cb3245ffcc
-SHA1 (patch-mozilla_ipc_glue_CrossProcessSemaphore__posix.cpp) = 9799baf4be22e8e6bf6ec9b8e947f6fb870c1e19
SHA1 (patch-mozilla_ipc_glue_GeckoChildProcessHost.cpp) = 7ab1c1701344adab8d7ee0332476a864fa2446bb
SHA1 (patch-mozilla_js_src_gc_Memory.cpp) = 0850c9d57794c037ee5ab6b3d52319f4ec34c72c
SHA1 (patch-mozilla_js_src_threading_posix_Thread.cpp) = a22611b1329d38c1a56988be2f84aba71c431506
@@ -30,7 +28,7 @@
SHA1 (patch-mozilla_old-configure.in) = 5c711b031a2acee9ab4cf803769179de4fff0ea7
SHA1 (patch-mozilla_servo_components_style_build__gecko.rs) = 473e823fa0cd819dfee1040d360eda543d5557f0
SHA1 (patch-mozilla_toolkit_components_terminator_nsTerminator.cpp) = 0d975e4b7e3d2a8550c16a9a87c2f7011917cddd
-SHA1 (patch-mozilla_toolkit_library_moz.build) = 51d4b94077a12b136ddc4bd6093336de98f3219e
+SHA1 (patch-mozilla_toolkit_library_moz.build) = b1e5ccc55527f1839afc4b1c757767445ed33e50
SHA1 (patch-mozilla_toolkit_moz.configure) = 1798a74b329ad0f58d98872e1cbc51cb829ac746
SHA1 (patch-mozilla_toolkit_mozapps_installer_packager.mk) = c2bb55684f2071708c487504ac6cfc9325e462d6
SHA1 (patch-mozilla_toolkit_xre_glxtest.cpp) = 547ca37aac32c77d617cd7a2b5dafc4c18c2bbc9
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/patches/patch-mail_app_Makefile.in
--- a/www/seamonkey/patches/patch-mail_app_Makefile.in Tue Jun 16 09:04:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-mail_app_Makefile.in,v 1.11 2020/05/06 14:34:53 ryoon Exp $
-
---- mail/app/Makefile.in.orig 2020-02-17 23:36:19.000000000 +0000
-+++ mail/app/Makefile.in
-@@ -13,6 +13,10 @@ DEFINES += \
-
- # Build a binary bootstrapping with XRE_main
-
-+ifeq ($(OS_ARCH),NetBSD)
-+LIBS += -lossaudio
-+endif
-+
- ifndef MOZ_WINCONSOLE
- ifdef MOZ_DEBUG
- MOZ_WINCONSOLE = 1
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/patches/patch-mozilla_browser_app_profile_firefox.js
--- a/www/seamonkey/patches/patch-mozilla_browser_app_profile_firefox.js Tue Jun 16 09:04:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-mozilla_browser_app_profile_firefox.js,v 1.3 2020/05/06 14:34:53 ryoon Exp $
-
---- mozilla/browser/app/profile/firefox.js.orig 2020-04-01 11:01:50.000000000 +0000
-+++ mozilla/browser/app/profile/firefox.js
-@@ -1710,6 +1710,10 @@ pref("extensions.formautofill.available"
- pref("extensions.formautofill.available", "detect");
- #endif
- pref("extensions.formautofill.addresses.enabled", true);
-+
-+// Disable multiprocess window support. Workaround for PR 53273.
-+pref("browser.tabs.remote.autostart", false);
-+
- pref("extensions.formautofill.creditCards.enabled", true);
- pref("extensions.formautofill.firstTimeUse", true);
- pref("extensions.formautofill.heuristics.enabled", true);
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/patches/patch-mozilla_build_moz.configure_old.configure
--- a/www/seamonkey/patches/patch-mozilla_build_moz.configure_old.configure Tue Jun 16 09:04:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-mozilla_build_moz.configure_old.configure,v 1.4 2020/05/06 14:34:53 ryoon Exp $
-
---- mozilla/build/moz.configure/old.configure.orig 2020-04-01 11:01:50.000000000 +0000
-+++ mozilla/build/moz.configure/old.configure
-@@ -271,6 +271,7 @@ def old_configure_options(*options):
- '--with-nspr-prefix',
- '--with-nss-exec-prefix',
- '--with-nss-prefix',
-+ '--with-oss',
- '--with-pthreads',
- '--with-qemu-exe',
- '--with-sixgill',
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/patches/patch-mozilla_dom_media_CubebUtils.cpp
--- a/www/seamonkey/patches/patch-mozilla_dom_media_CubebUtils.cpp Tue Jun 16 09:04:38 2020 +0000
+++ b/www/seamonkey/patches/patch-mozilla_dom_media_CubebUtils.cpp Tue Jun 16 09:09:02 2020 +0000
@@ -1,14 +1,12 @@
-$NetBSD: patch-mozilla_dom_media_CubebUtils.cpp,v 1.1 2020/05/06 14:34:53 ryoon Exp $
+$NetBSD: patch-mozilla_dom_media_CubebUtils.cpp,v 1.2 2020/06/16 09:09:02 nia Exp $
--- mozilla/dom/media/CubebUtils.cpp.orig 2020-04-01 11:01:50.000000000 +0000
+++ mozilla/dom/media/CubebUtils.cpp
-@@ -95,7 +95,8 @@ const char* AUDIOSTREAM_BACKEND_ID_STR[]
+@@ -93,6 +93,7 @@ const char* AUDIOSTREAM_BACKEND_ID_STR[]
+ "winmm",
+ "directsound",
"sndio",
++ "sun",
"opensl",
"audiotrack",
-- "kai"
-+ "kai",
-+ "oss",
- };
- /* Index for failures to create an audio stream the first time. */
- const int CUBEB_BACKEND_INIT_FAILURE_FIRST =
+ "kai"
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/patches/patch-mozilla_gfx_layers_client_ClientPaintedLayer.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/seamonkey/patches/patch-mozilla_gfx_layers_client_ClientPaintedLayer.cpp Tue Jun 16 09:09:02 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-mozilla_gfx_layers_client_ClientPaintedLayer.cpp,v 1.1 2020/06/16 09:09:02 nia Exp $
+
+NetBSD has the same limitation on CrossProcessSemaphore
+(non-functioning in NetBSD<9, leaky due to Firefox destroying
+semaphores created across processes in NetBSD>=9)
+
+--- mozilla/gfx/layers/client/ClientPaintedLayer.cpp.orig 2020-04-01 11:01:50.000000000 +0000
++++ mozilla/gfx/layers/client/ClientPaintedLayer.cpp
+@@ -310,7 +310,7 @@ ClientLayerManager::CreatePaintedLayerWi
+ NS_ASSERTION(InConstruction(), "Only allowed in construction phase");
+ // The non-tiling ContentClient requires CrossProcessSemaphore which
+ // isn't implemented for OSX.
+-#ifdef XP_MACOSX
++#if defined(XP_MACOSX) || defined(__NetBSD__)
+ if (true) {
+ #else
+ if (gfxPrefs::LayersTilesEnabled()) {
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/patches/patch-mozilla_ipc_glue_CrossProcessSemaphore.h
--- a/www/seamonkey/patches/patch-mozilla_ipc_glue_CrossProcessSemaphore.h Tue Jun 16 09:04:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-mozilla_ipc_glue_CrossProcessSemaphore.h,v 1.1 2020/05/06 14:34:53 ryoon Exp $
-
---- mozilla/ipc/glue/CrossProcessSemaphore.h.orig 2020-02-17 23:37:52.000000000 +0000
-+++ mozilla/ipc/glue/CrossProcessSemaphore.h
-@@ -91,7 +91,13 @@ private:
- HANDLE mSemaphore;
- #elif !defined(OS_MACOSX)
- RefPtr<mozilla::ipc::SharedMemoryBasic> mSharedBuffer;
-+#if defined(__NetBSD__)
-+ pthread_mutex_t* mMutex;
-+ pthread_cond_t* mNotZero;
-+ uint32_t* mValue;
-+#else
- sem_t* mSemaphore;
-+#endif
- mozilla::Atomic<int32_t>* mRefCount;
- #endif
- };
diff -r 5a2625c39688 -r b2129f9be995 www/seamonkey/patches/patch-mozilla_ipc_glue_CrossProcessSemaphore__posix.cpp
--- a/www/seamonkey/patches/patch-mozilla_ipc_glue_CrossProcessSemaphore__posix.cpp Tue Jun 16 09:04:38 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-$NetBSD: patch-mozilla_ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2020/05/06 14:34:53 ryoon Exp $
-
---- mozilla/ipc/glue/CrossProcessSemaphore_posix.cpp.orig 2020-02-17 23:37:52.000000000 +0000
-+++ mozilla/ipc/glue/CrossProcessSemaphore_posix.cpp
-@@ -9,6 +9,11 @@
- #include "nsDebug.h"
- #include "nsISupportsImpl.h"
- #include <errno.h>
-+#if defined(__NetBSD__)
-+#include <iostream>
-+#include <unistd.h>
-+#include <limits>
-+#endif
-
- static const uint64_t kNsPerMs = 1000000;
- static const uint64_t kNsPerSec = 1000000000;
-@@ -17,7 +22,13 @@ namespace {
-
-
- struct SemaphoreData {
-+#if defined(__NetBSD__)
-+ pthread_mutex_t mMutex;
-+ pthread_cond_t mNotZero;
-+ uint32_t mValue;
-+#else
- sem_t mSemaphore;
-+#endif
- mozilla::Atomic<int32_t> mRefCount;
- uint32_t mInitialValue;
- };
-@@ -44,13 +55,27 @@ CrossProcessSemaphore::Create(const char
- return nullptr;
- }
-
-+#if defined(__NetBSD__)
-+ data->mValue = aInitialValue;
-+ if (pthread_mutex_init(&data->mMutex, NULL) ||
-+ pthread_cond_init(&data->mNotZero, NULL) ) {
-+ return nullptr;
-+ }
-+#else
- if (sem_init(&data->mSemaphore, 1, aInitialValue)) {
- return nullptr;
- }
-+#endif
-
- CrossProcessSemaphore* sem = new CrossProcessSemaphore;
- sem->mSharedBuffer = sharedBuffer;
-+#if defined(__NetBSD__)
-+ sem->mMutex = &data->mMutex;
-+ sem->mNotZero = &data->mNotZero;
-+ sem->mValue = &data->mValue;
-+#else
- sem->mSemaphore = &data->mSemaphore;
-+#endif
- sem->mRefCount = &data->mRefCount;
- *sem->mRefCount = 1;
-
-@@ -84,24 +109,44 @@ CrossProcessSemaphore::Create(CrossProce
-
- int32_t oldCount = data->mRefCount++;
- if (oldCount == 0) {
-+#if defined(__NetBSD__)
-+ if (pthread_mutex_init(&data->mMutex, NULL) ||
-+ pthread_cond_init(&data->mNotZero, NULL) ) {
-+ data->mRefCount--;
-+ return nullptr;
-+ }
-+#else
- // The other side has already let go of their CrossProcessSemaphore, so now
- // mSemaphore is garbage. We need to re-initialize it.
- if (sem_init(&data->mSemaphore, 1, data->mInitialValue)) {
- data->mRefCount--;
- return nullptr;
- }
-+#endif
- }
-
- CrossProcessSemaphore* sem = new CrossProcessSemaphore;
- sem->mSharedBuffer = sharedBuffer;
-+#if defined(__NetBSD__)
-+ sem->mMutex = &data->mMutex;
-+ sem->mNotZero = &data->mNotZero;
-+ sem->mValue = &data->mValue;
-+#else
- sem->mSemaphore = &data->mSemaphore;
-+#endif
- sem->mRefCount = &data->mRefCount;
- return sem;
- }
-
-
- CrossProcessSemaphore::CrossProcessSemaphore()
-+#if defined(__NetBSD__)
-+ : mMutex (nullptr)
-+ , mNotZero (nullptr)
-+ , mValue (nullptr)
-+#else
- : mSemaphore(nullptr)
-+#endif
- , mRefCount(nullptr)
- {
- MOZ_COUNT_CTOR(CrossProcessSemaphore);
-@@ -113,17 +158,58 @@ CrossProcessSemaphore::~CrossProcessSema
-
- if (oldCount == 0) {
- // Nothing can be done if the destroy fails so ignore return code.
-+#if defined(__NetBSD__)
-+ (void)pthread_cond_destroy(mNotZero);
-+ (void)pthread_mutex_destroy(mMutex);
-+#else
- Unused << sem_destroy(mSemaphore);
-+#endif
- }
-
- MOZ_COUNT_DTOR(CrossProcessSemaphore);
- }
-
-+#if defined(__NetBSD__)
-+static struct timespec
-+makeAbsTime(const Maybe<TimeDuration>& aWaitTime) {
Home |
Main Index |
Thread Index |
Old Index