Fixed build issues

2 files changed, 21 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e18d896f740c..a6a5c6b97c11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = basilisk
 	pkgdesc = A XUL-based web-browser demonstrating the Unified XUL Platform (UXP)
 	pkgver = 2023.03.27
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.basilisk-browser.org/
 	arch = x86_64
 	license = MPL
@@ -26,8 +26,12 @@ pkgbase = basilisk
 	source = https://repo.palemoon.org/Basilisk-Dev/Basilisk/archive/v2023.03.27.tar.gz
 	source = https://repo.palemoon.org/MoonchildProductions/UXP/archive/RB_20230320.tar.gz
 	source = https://repo.palemoon.org/mcp-graveyard/Pale-Moon/raw/commit/54aeb54828aba7ab47d6ec4a2ee432589efa2b4f/palemoon/branding/unofficial/browser.desktop
+	source = https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2177.patch
+	source = https://repo.palemoon.org/Basilisk-Dev/Basilisk/pulls/50.patch
 	sha256sums = 44397775d894655459d9157f8cb255d4a66269c8d5ccf0f4d7b5bc1eec6c3a3a
 	sha256sums = 70ee4270c1dbcb0413204491493e55d475b505574f1053d444c2f4c167ef613b
 	sha256sums = 9ffbaa46c277e3c9addc2ce61b17e8eccffd3860706ca75d4fd70eeaa6f5e380
+	sha256sums = 1b779cef12b4171d19b0f5e8a3cc89729c051575bf81c238c67933091751dedd
+	sha256sums = 1f0762eea1fe56ed0dd0d0a748908c50a4f7a3c2d58d9f1544e856cea4bf1df0
 
 pkgname = basilisk
diff --git a/PKGBUILD b/PKGBUILD
index 6de758ee9881..1779ee29da95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=basilisk
 pkgver=2023.03.27
 platform=RB_20230320
-pkgrel=1
+pkgrel=2
 pkgdesc="A XUL-based web-browser demonstrating the Unified XUL Platform (UXP)"
 arch=('x86_64')
 url="https://www.basilisk-browser.org/"
@@ -15,10 +15,14 @@ makedepends=('unzip' 'zip' 'python2' 'python2-dbus' 'yasm' 'mesa' 'autoconf2.13'
 options=('!emptydirs')
 source=("https://repo.palemoon.org/Basilisk-Dev/Basilisk/archive/v${pkgver}.tar.gz"
         "https://repo.palemoon.org/MoonchildProductions/UXP/archive/${platform}.tar.gz"
-        "https://repo.palemoon.org/mcp-graveyard/Pale-Moon/raw/commit/54aeb54828aba7ab47d6ec4a2ee432589efa2b4f/palemoon/branding/unofficial/browser.desktop")
+        "https://repo.palemoon.org/mcp-graveyard/Pale-Moon/raw/commit/54aeb54828aba7ab47d6ec4a2ee432589efa2b4f/palemoon/branding/unofficial/browser.desktop"
+        "https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2177.patch"
+        "https://repo.palemoon.org/Basilisk-Dev/Basilisk/pulls/50.patch")
 sha256sums=('44397775d894655459d9157f8cb255d4a66269c8d5ccf0f4d7b5bc1eec6c3a3a'
             '70ee4270c1dbcb0413204491493e55d475b505574f1053d444c2f4c167ef613b'
-            '9ffbaa46c277e3c9addc2ce61b17e8eccffd3860706ca75d4fd70eeaa6f5e380')
+            '9ffbaa46c277e3c9addc2ce61b17e8eccffd3860706ca75d4fd70eeaa6f5e380'
+            '1b779cef12b4171d19b0f5e8a3cc89729c051575bf81c238c67933091751dedd'
+            '1f0762eea1fe56ed0dd0d0a748908c50a4f7a3c2d58d9f1544e856cea4bf1df0')
 
 prepare() {
   cd "$srcdir/$pkgname"
@@ -95,6 +99,15 @@ ac_add_options --disable-maintenance-service
 #mk_add_options MOZ_MAKE_FLAGS="-j4"
 #mk_add_options PYTHON=/usr/bin/python2
 EOF
+
+  # Fix packaging by removing the defunct private browsing components. #50
+  # https://repo.palemoon.org/Basilisk-Dev/Basilisk/pulls/50/files
+  patch -Np1 -i ../50.patch
+
+  # Issue #2175 - Fix build bustage in WebRTC. #2177
+  # https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2177
+  cd platform
+  patch -Np1 -i ../../2177.patch
 }
 
 build() {