CVS commit: pkgsrc/www/firefox115

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon Jan  8 17:39:44 UTC 2024

Modified Files:
        pkgsrc/www/firefox115: Makefile
        pkgsrc/www/firefox115/files: replace-moz.build.awk

Log Message:
firefox115: Re-enable screen/tab capture

Sync replace-moz.build.awk with firefox{102,} so that X11 desktop
capture works.

(Re)Fix PR pkg/56955.

(While here define PKGREVISION only once.)

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/firefox115/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox115/files/replace-moz.build.awk

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

Modified files:

Index: pkgsrc/www/firefox115/Makefile
diff -u pkgsrc/www/firefox115/Makefile:1.11 pkgsrc/www/firefox115/Makefile:1.12
--- pkgsrc/www/firefox115/Makefile:1.11 Fri Dec 29 17:29:14 2023
+++ pkgsrc/www/firefox115/Makefile      Mon Jan  8 17:39:44 2024
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2023/12/29 17:29:14 he Exp $
+# $NetBSD: Makefile,v 1.12 2024/01/08 17:39:44 leot Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION=           1
 MOZ_BRANCH=            115.5
 MOZ_BRANCH_MINOR=      .0esr
-PKGREVISION=           1
+PKGREVISION=           2
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox115-/}

Index: pkgsrc/www/firefox115/files/replace-moz.build.awk
diff -u pkgsrc/www/firefox115/files/replace-moz.build.awk:1.1 pkgsrc/www/firefox115/files/replace-moz.build.awk:1.2
--- pkgsrc/www/firefox115/files/replace-moz.build.awk:1.1       Mon Sep 11 12:33:25 2023
+++ pkgsrc/www/firefox115/files/replace-moz.build.awk   Mon Jan  8 17:39:44 2024
@@ -33,6 +33,22 @@
        print $0;
        next;
 }
+/^if CONFIG\[\"CPU_ARCH\"\] == \"aarch64\" and CONFIG\[\"MOZ_X11\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/{
+       flag = 0;
+       sub(/^if CONFIG\[\"CPU_ARCH\"\] == \"aarch64\" and CONFIG\[\"MOZ_X11\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if CONFIG\[\"CPU_ARCH\"\] == \"aarch64\" and 
CONFIG\[\"MOZ_X11\"\] == \"1\" and (CONFIG[\"OS_TARGET\"] == \"Linux\" or CONFIG[\"OS_TARGET\"] == \"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] == \"FreeBSD\"):");
+}
+/^if CONFIG\[\"CPU_ARCH\"\] == \"arm\" and CONFIG\[\"MOZ_X11\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/{
+       flag = 0;
+       sub(/^if CONFIG\[\"CPU_ARCH\"\] == \"arm\" and CONFIG\[\"MOZ_X11\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if CONFIG\[\"CPU_ARCH\"\] == \"arm\" and CONFIG\[\"MOZ_X11\"\] == 
\"1\" and (CONFIG[\"OS_TARGET\"] == \"Linux\" or CONFIG[\"OS_TARGET\"] == \"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] == \"FreeBSD\"):");
+}
+/^if CONFIG\[\"CPU_ARCH\"\] == \"x86\" and CONFIG\[\"MOZ_X11\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/{
+       flag = 0;
+       sub(/^if CONFIG\[\"CPU_ARCH\"\] == \"x86\" and CONFIG\[\"MOZ_X11\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if CONFIG\[\"CPU_ARCH\"\] == \"x86\" and CONFIG\[\"MOZ_X11\"\] == 
\"1\" and (CONFIG[\"OS_TARGET\"] == \"Linux\" or CONFIG[\"OS_TARGET\"] == \"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] == \"FreeBSD\"):");
+}
+/^if CONFIG\[\"CPU_ARCH\"\] == \"x86_64\" and CONFIG\[\"MOZ_X11\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/{
+       flag = 0;
+       sub(/^if CONFIG\[\"CPU_ARCH\"\] == \"x86_64\" and CONFIG\[\"MOZ_X11\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if CONFIG\[\"CPU_ARCH\"\] == \"x86_64\" and CONFIG\[\"MOZ_X11\"\] 
== \"1\" and (CONFIG[\"OS_TARGET\"] == \"Linux\" or CONFIG[\"OS_TARGET\"] == \"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] == \"FreeBSD\"):");
+}
 {
        if (flag != 1) {
                sub(/^    DEFINES\[\"WEBRTC_LINUX\"\] = True/, "    if CONFIG\[\"OS_TARGET\"\] == \"Linux\":\n        DEFINES\[\"WEBRTC_LINUX\"\] = True\n    else:\n        DEFINES\[\"WEBRTC_BSD\"\] 
= True");