summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--xpconnect-disable-Werror.patch8
3 files changed, 2 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ee52e96ebae3..46d8e661fcf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,10 +23,8 @@ pkgbase = basilisk
options = !emptydirs
source = https://github.com/MoonchildProductions/UXP/archive/v2019.06.08.tar.gz
source = https://github.com/MoonchildProductions/UXP/commit/9ded0778ee548fd8837bb35bdb5617cae0a791d1.patch
- source = xpconnect-disable-Werror.patch
sha256sums = ff0c6e093fbab2ecd86fc36d2e4ee9d95d2645e3906c7450ba4876b3bbff3e44
sha256sums = 159d14773306b7e07dc3480c4ad4694e52406fb71b15e3ef53a9096749d9dd42
- sha256sums = eadadb6bbd3a223c51f2e709e623146a367b898861c62df1291bcfe01c897485
pkgname = basilisk
diff --git a/PKGBUILD b/PKGBUILD
index 1b1644e3df7b..b2d88f5b559e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,9 @@ depends=('gtk2' 'libxt' 'mime-types' 'alsa-lib' 'ffmpeg' 'ttf-font')
makedepends=('unzip' 'zip' 'gcc8' 'python2' 'yasm' 'mesa' 'autoconf2.13')
options=('!emptydirs')
source=("https://github.com/MoonchildProductions/UXP/archive/v$pkgver.tar.gz"
- "https://github.com/MoonchildProductions/UXP/commit/9ded0778ee548fd8837bb35bdb5617cae0a791d1.patch"
- "xpconnect-disable-Werror.patch")
+ "https://github.com/MoonchildProductions/UXP/commit/9ded0778ee548fd8837bb35bdb5617cae0a791d1.patch")
sha256sums=('ff0c6e093fbab2ecd86fc36d2e4ee9d95d2645e3906c7450ba4876b3bbff3e44'
- '159d14773306b7e07dc3480c4ad4694e52406fb71b15e3ef53a9096749d9dd42'
- 'eadadb6bbd3a223c51f2e709e623146a367b898861c62df1291bcfe01c897485')
+ '159d14773306b7e07dc3480c4ad4694e52406fb71b15e3ef53a9096749d9dd42')
prepare() {
cd "$srcdir/UXP-$pkgver"
diff --git a/xpconnect-disable-Werror.patch b/xpconnect-disable-Werror.patch
deleted file mode 100644
index 71da7c14fee3..000000000000
--- a/xpconnect-disable-Werror.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/js/xpconnect/src/moz.build
-+++ b/js/xpconnect/src/moz.build
-@@ -67,4 +67,4 @@ LOCAL_INCLUDES += [
- ]
-
- if CONFIG['GNU_CXX']:
-- CXXFLAGS += ['-Wno-shadow', '-Werror=format']
-+ CXXFLAGS += ['-Wno-shadow']