From 5134cded9787b1513957a0703bab55ba5848a4f4 Mon Sep 17 00:00:00 2001 From: Rod Myers Date: Tue, 29 Jan 2019 20:39:07 -0500 Subject: [PATCH 1/2] Update trident-master.json to see if palemoon builds log file file stated; =================================================== ====> Two or more enabled options conflict with each other =====> Option SNDIO conflicts with ALSA PULSEAUDIO (select only one) *** Error code 1 --- trident-master.json | 1 + 1 file changed, 1 insertion(+) diff --git a/trident-master.json b/trident-master.json index 443147a..6fe39ee 100644 --- a/trident-master.json +++ b/trident-master.json @@ -314,6 +314,7 @@ "www_firefox-esr_SET=PULSEAUDIO", "www_iridium_UNSET=SNDIO PULSEAUDIO", "www_iridium_SET=ALSA", + "www_palemoon_UNSET="ALSA PULSEAUDIO", "www_node_SET=BUNDLED_SSL", "www_node4_SET=BUNDLED_SSL", "www_node6_SET=BUNDLED_SSL", From 8cbf9968f711c01a93ec4b63c5fd98a9090dbd3b Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 4 Feb 2019 08:44:56 -0500 Subject: [PATCH 2/2] Update trident-master.json Fix a syntax error in a PR: one too many quotes. --- trident-master.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trident-master.json b/trident-master.json index 6fe39ee..e6e9739 100644 --- a/trident-master.json +++ b/trident-master.json @@ -314,7 +314,7 @@ "www_firefox-esr_SET=PULSEAUDIO", "www_iridium_UNSET=SNDIO PULSEAUDIO", "www_iridium_SET=ALSA", - "www_palemoon_UNSET="ALSA PULSEAUDIO", + "www_palemoon_UNSET=ALSA PULSEAUDIO", "www_node_SET=BUNDLED_SSL", "www_node4_SET=BUNDLED_SSL", "www_node6_SET=BUNDLED_SSL",