svn commit: r551682 - in branches/2020Q4: mail/thunderbird mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox/files

[Jan Beich]

Author: jbeich
Date: Thu Oct  8 00:38:52 2020
New Revision: 551682
URL: https://svnweb.freebsd.org/changeset/ports/551682

Log:
  MFH: r551677
  
  gecko: update OSS patches
  
  Changes:	https://github.com/kinetiknz/cubeb/compare/b594641...cc85508
  Approved by:	ports-secteam blanket

Modified:
  branches/2020Q4/mail/thunderbird/Makefile
  branches/2020Q4/mail/thunderbird/files/patch-cubeb-oss
  branches/2020Q4/www/firefox-esr/Makefile
  branches/2020Q4/www/firefox-esr/files/patch-cubeb-oss
  branches/2020Q4/www/firefox/Makefile
  branches/2020Q4/www/firefox/files/patch-cubeb-oss
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/mail/thunderbird/Makefile
==============================================================================
--- branches/2020Q4/mail/thunderbird/Makefile	Thu Oct  8 00:38:50 2020	(r551681)
+++ branches/2020Q4/mail/thunderbird/Makefile	Thu Oct  8 00:38:52 2020	(r551682)
@@ -3,6 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	78.3.2
+PORTREVISION=	1
 CATEGORIES=	mail news net-im
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source

Modified: branches/2020Q4/mail/thunderbird/files/patch-cubeb-oss
==============================================================================
--- branches/2020Q4/mail/thunderbird/files/patch-cubeb-oss	Thu Oct  8 00:38:50 2020	(r551681)
+++ branches/2020Q4/mail/thunderbird/files/patch-cubeb-oss	Thu Oct  8 00:38:52 2020	(r551682)
@@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600
  #endif
 --- /dev/null
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,1245 @@
+@@ -0,0 +1,1242 @@
 +/*
 + * Copyright © 2019-2020 Nia Alarie <nia at NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300 at gmail.com>
@@ -1009,9 +1009,6 @@ https://github.com/kinetiknz/cubeb/pull/600
 +      pthread_mutex_unlock(&s->mtx);
 +      break;
 +    }
-+    pthread_mutex_unlock(&s->mtx);
-+
-+    pthread_mutex_lock(&s->mtx);
 +    pthread_cond_wait(&s->doorbell_cv, &s->mtx);
 +    pthread_mutex_unlock(&s->mtx);
 +  } while (1);

Modified: branches/2020Q4/www/firefox-esr/Makefile
==============================================================================
--- branches/2020Q4/www/firefox-esr/Makefile	Thu Oct  8 00:38:50 2020	(r551681)
+++ branches/2020Q4/www/firefox-esr/Makefile	Thu Oct  8 00:38:52 2020	(r551682)
@@ -3,6 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	78.3.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \

Modified: branches/2020Q4/www/firefox-esr/files/patch-cubeb-oss
==============================================================================
--- branches/2020Q4/www/firefox-esr/files/patch-cubeb-oss	Thu Oct  8 00:38:50 2020	(r551681)
+++ branches/2020Q4/www/firefox-esr/files/patch-cubeb-oss	Thu Oct  8 00:38:52 2020	(r551682)
@@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600
  #endif
 --- /dev/null
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,1245 @@
+@@ -0,0 +1,1242 @@
 +/*
 + * Copyright © 2019-2020 Nia Alarie <nia at NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300 at gmail.com>
@@ -1009,9 +1009,6 @@ https://github.com/kinetiknz/cubeb/pull/600
 +      pthread_mutex_unlock(&s->mtx);
 +      break;
 +    }
-+    pthread_mutex_unlock(&s->mtx);
-+
-+    pthread_mutex_lock(&s->mtx);
 +    pthread_cond_wait(&s->doorbell_cv, &s->mtx);
 +    pthread_mutex_unlock(&s->mtx);
 +  } while (1);

Modified: branches/2020Q4/www/firefox/Makefile
==============================================================================
--- branches/2020Q4/www/firefox/Makefile	Thu Oct  8 00:38:50 2020	(r551681)
+++ branches/2020Q4/www/firefox/Makefile	Thu Oct  8 00:38:52 2020	(r551682)
@@ -3,6 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	81.0.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \

Modified: branches/2020Q4/www/firefox/files/patch-cubeb-oss
==============================================================================
--- branches/2020Q4/www/firefox/files/patch-cubeb-oss	Thu Oct  8 00:38:50 2020	(r551681)
+++ branches/2020Q4/www/firefox/files/patch-cubeb-oss	Thu Oct  8 00:38:52 2020	(r551682)
@@ -61,7 +61,7 @@ https://github.com/kinetiknz/cubeb/pull/600
  #endif
 --- /dev/null
 +++ media/libcubeb/src/cubeb_oss.c
-@@ -0,0 +1,1245 @@
+@@ -0,0 +1,1242 @@
 +/*
 + * Copyright © 2019-2020 Nia Alarie <nia at NetBSD.org>
 + * Copyright © 2020 Ka Ho Ng <khng300 at gmail.com>
@@ -1009,9 +1009,6 @@ https://github.com/kinetiknz/cubeb/pull/600
 +      pthread_mutex_unlock(&s->mtx);
 +      break;
 +    }
-+    pthread_mutex_unlock(&s->mtx);
-+
-+    pthread_mutex_lock(&s->mtx);
 +    pthread_cond_wait(&s->doorbell_cv, &s->mtx);
 +    pthread_mutex_unlock(&s->mtx);
 +  } while (1);