CVS commit: pkgsrc/www/firefox

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/firefox
From: "Maya Rashish" <maya%netbsd.org@localhost>
Date: Mon, 4 May 2020 21:29:08 +0000

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon May  4 21:29:08 UTC 2020

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo
        pkgsrc/www/firefox/patches: patch-ipc_glue_CrossProcessSemaphore.h
            patch-ipc_glue_CrossProcessSemaphore__posix.cpp

Log Message:
firefox: disable multiprocess firefox on netbsd 9.0 release too
(needs a kernel patch)

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.423 -r1.424 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.391 -r1.392 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore.h
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.423 pkgsrc/www/firefox/Makefile:1.424
--- pkgsrc/www/firefox/Makefile:1.423   Sun May  3 18:45:30 2020
+++ pkgsrc/www/firefox/Makefile Mon May  4 21:29:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.423 2020/05/03 18:45:30 maya Exp $
+# $NetBSD: Makefile,v 1.424 2020/05/04 21:29:08 maya Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            75.0
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
@@ -100,7 +100,7 @@ pre-configure:
        cd ${WRKSRC}/${OBJDIR} && touch old-configure.vars
        # Do not fetch Rust Cargo file via network during build
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-8.*-*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-8.*-*) || !empty(MACHINE_PLATFORM:MNetBSD-9.0*)
 .PHONY: disable-multiprocess
 disable-multiprocess:
        ${STEP_MSG} "Broken process-shared mutexes, disabling multiprocess windows..."

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.391 pkgsrc/www/firefox/distinfo:1.392
--- pkgsrc/www/firefox/distinfo:1.391   Sun May  3 18:45:30 2020
+++ pkgsrc/www/firefox/distinfo Mon May  4 21:29:08 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.391 2020/05/03 18:45:30 maya Exp $
+$NetBSD: distinfo,v 1.392 2020/05/04 21:29:08 maya Exp $
 
 SHA1 (firefox-75.0.source.tar.xz) = df7904c16d525eb791728d655258b7d1fe064db9
 RMD160 (firefox-75.0.source.tar.xz) = e75ffcf93adab1198a93b42a6d2f8722be3745ce
@@ -19,8 +19,8 @@ SHA1 (patch-image_imgFrame.h) = f4235704
 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = d84d9b4d416e049423120dcbf9199644ce1c93ab
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
-SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 295bfe10c8ba15cfbecf083e791a2d5bc53ea462
-SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = bf26ef59cc0e200a5d4e7f1d7415666acbf0bbac
+SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 102e8a164584c6d73a5ca2bd4ad1050586082410
+SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 9635992da0fbae262a02a0eafce7e2445c44c22b
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
 SHA1 (patch-js_src_jsfriendapi.h) = fce9627bb1c45addccec105a0f38f0a3aac3f9b3
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba

Index: pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore.h
diff -u pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore.h:1.3 pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore.h:1.4
--- pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore.h:1.3       Sun May  3 18:45:30 2020
+++ pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore.h   Mon May  4 21:29:08 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_glue_CrossProcessSemaphore.h,v 1.3 2020/05/03 18:45:30 maya Exp $
+$NetBSD: patch-ipc_glue_CrossProcessSemaphore.h,v 1.4 2020/05/04 21:29:08 maya Exp $
 
 --- ipc/glue/CrossProcessSemaphore.h.orig      2018-10-18 20:06:06.000000000 +0000
 +++ ipc/glue/CrossProcessSemaphore.h
@@ -17,7 +17,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    HANDLE mSemaphore;
  #elif !defined(OS_MACOSX)
    RefPtr<mozilla::ipc::SharedMemoryBasic> mSharedBuffer;
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +  pthread_mutex_t* mMutex;
 +  pthread_cond_t* mNotZero;
 +  uint32_t* mValue;

Index: pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
diff -u pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.6 pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.7
--- pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.6      Sun May  3 18:45:30 2020
+++ pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp  Mon May  4 21:29:08 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.6 2020/05/03 18:45:30 maya Exp $
+$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.7 2020/05/04 21:29:08 maya Exp $
 
 --- ipc/glue/CrossProcessSemaphore_posix.cpp.orig      2019-01-18 00:20:30.000000000 +0000
 +++ ipc/glue/CrossProcessSemaphore_posix.cpp
@@ -19,7 +19,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
  namespace {
  
  struct SemaphoreData {
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +  pthread_mutex_t mMutex;
 +  pthread_cond_t mNotZero;
 +  uint32_t mValue;
@@ -33,7 +33,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
      return nullptr;
    }
  
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +  data->mValue = aInitialValue;
 +  if (pthread_mutex_init(&data->mMutex, NULL) ||
 +      pthread_cond_init(&data->mNotZero, NULL) ) {
@@ -47,7 +47,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
  
    CrossProcessSemaphore* sem = new CrossProcessSemaphore;
    sem->mSharedBuffer = sharedBuffer;
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +  sem->mMutex = &data->mMutex;
 +  sem->mNotZero = &data->mNotZero;
 +  sem->mValue = &data->mValue;
@@ -61,7 +61,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
  
    int32_t oldCount = data->mRefCount++;
    if (oldCount == 0) {
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +    if (pthread_mutex_init(&data->mMutex, NULL) ||
 +        pthread_cond_init(&data->mNotZero, NULL) ) {
 +      data->mRefCount--;
@@ -79,7 +79,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
  
    CrossProcessSemaphore* sem = new CrossProcessSemaphore;
    sem->mSharedBuffer = sharedBuffer;
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +  sem->mMutex = &data->mMutex;
 +  sem->mNotZero = &data->mNotZero;
 +  sem->mValue = &data->mValue;
@@ -92,7 +92,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
  
  CrossProcessSemaphore::CrossProcessSemaphore()
 -    : mSemaphore(nullptr), mRefCount(nullptr) {
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +  : mMutex (nullptr)
 +  , mNotZero (nullptr)
 +  , mValue (nullptr)
@@ -107,7 +107,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
  
    if (oldCount == 0) {
      // Nothing can be done if the destroy fails so ignore return code.
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +    (void)pthread_cond_destroy(mNotZero);
 +    (void)pthread_mutex_destroy(mMutex);
 +#else
@@ -118,7 +118,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    MOZ_COUNT_DTOR(CrossProcessSemaphore);
  }
  
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +static struct timespec
 +makeAbsTime(const Maybe<TimeDuration>& aWaitTime) {
 +  struct timespec ts;
@@ -140,7 +140,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
    MOZ_ASSERT(*mRefCount > 0,
               "Attempting to wait on a semaphore with zero ref count");
    int ret;
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +  struct timespec ts = makeAbsTime(aWaitTime);
 +
 +  ret = pthread_mutex_lock(mMutex);
@@ -172,7 +172,7 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
  void CrossProcessSemaphore::Signal() {
    MOZ_ASSERT(*mRefCount > 0,
               "Attempting to signal a semaphore with zero ref count");
-+#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000000)
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 900000001)
 +  int ret;
 +  ret = pthread_mutex_lock(mMutex);
 +  if (ret == 0) {

Prev by Date: CVS commit: pkgsrc/lang/openjdk11
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/openjdk11
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index