diff options
Diffstat (limited to 'waterfox')
| -rw-r--r-- | waterfox/debian/README.debian | 5 | ||||
| -rw-r--r-- | waterfox/debian/changelog | 1 | ||||
| -rw-r--r-- | waterfox/debian/control | 7 | ||||
| -rw-r--r-- | waterfox/debian/patches/45130a237874aaa96bdf23ee107b0be0e0a2afab.patch | 25 | ||||
| -rw-r--r-- | waterfox/debian/patches/series | 1 |
5 files changed, 35 insertions, 4 deletions
diff --git a/waterfox/debian/README.debian b/waterfox/debian/README.debian index e69de29..ae660ab 100644 --- a/waterfox/debian/README.debian +++ b/waterfox/debian/README.debian @@ -0,0 +1,5 @@ +waterfox (2020.01-1+devuan) obs; urgency=medium + + - Cherry-picked a patch from upstream so the application can actually compile: 45130a237874aaa96bdf23ee107b0be0e0a2afab.patch + + -- B Stack <bgstack15@gmail.com> Tue, 28 Jan 2020 07:58:33 -0500 diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index b5f02a9..0807cae 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,4 +1,5 @@ waterfox (2020.01-1+devuan) obs; urgency=medium + - From blog release notes - Classic branch * Very important security patches diff --git a/waterfox/debian/control b/waterfox/debian/control index f9736d9..041161c 100644 --- a/waterfox/debian/control +++ b/waterfox/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, - cargo (>= 0.25), + cargo (>= 0.35), ccache, clang-6.0, dpkg-dev (>= 1.16.1.1~), @@ -24,7 +24,6 @@ Build-Depends: debhelper (>= 12), libjpeg-dev, libjsoncpp-dev, libnotify-dev, - libpulse-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, @@ -37,7 +36,7 @@ Build-Depends: debhelper (>= 12), python2.7, python-minimal (>= 2.6.6-13~), python-ply, - rustc (>= 1.24), + rustc (>= 1.34), unzip, xauth, xfonts-base, @@ -54,7 +53,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: waterfox-kde Replaces: waterfox-kde Provides: www-browser, gnome-www-browser, waterfox-classic -Suggests: fonts-lyx, libasound2, pulseaudio +Suggests: fonts-lyx, libasound2 Description: Free, open and private browser Waterfox focuses on giving users choice while also helping make the world a better place. Watefox is partners with Ecosia, a search engine that plants trees diff --git a/waterfox/debian/patches/45130a237874aaa96bdf23ee107b0be0e0a2afab.patch b/waterfox/debian/patches/45130a237874aaa96bdf23ee107b0be0e0a2afab.patch new file mode 100644 index 0000000..47bf71b --- /dev/null +++ b/waterfox/debian/patches/45130a237874aaa96bdf23ee107b0be0e0a2afab.patch @@ -0,0 +1,25 @@ +Source: https://github.com/MrAlex94/Waterfox/commit/45130a237874aaa96bdf23ee107b0be0e0a2afab?diff=unified#diff-9517c6ca41ff7c9627f13ff83c2f7dce +Date: 2020-01-30 09:22:35 -0500 +diff -x '*.swp' -x '*.orig' -x '*.diff' -x '*debhelper*' -Naur 1/js/xpconnect/src/XPCVariant.cpp 2/js/xpconnect/src/XPCVariant.cpp +--- 1/js/xpconnect/src/XPCVariant.cpp 2020-01-09 15:53:52.000000000 -0500 ++++ 2/js/xpconnect/src/XPCVariant.cpp 2020-01-30 09:14:14.645389196 -0500 +@@ -180,7 +180,7 @@ + type = tDbl; + } else if (val.isBoolean()) { + type = tBool; +- } else if (val.isUndefined() || val.isSymbol() || val.isBigInt()) { ++ } else if (val.isUndefined() || val.isSymbol()) { + state = tVar; + break; + } else if (val.isNull()) { +@@ -275,8 +275,8 @@ + mData.SetFromBool(val.toBoolean()); + return true; + } +- // We can't represent symbol or BigInt on C++ side, so pretend it is void. +- if (val.isUndefined() || val.isSymbol() || val.isBigInt()) { ++ // We can't represent symbol on C++ side, so pretend it is void. ++ if (val.isUndefined() || val.isSymbol()) { + mData.SetToVoid(); + return true; + } diff --git a/waterfox/debian/patches/series b/waterfox/debian/patches/series index cb8ded3..9c29521 100644 --- a/waterfox/debian/patches/series +++ b/waterfox/debian/patches/series @@ -2,3 +2,4 @@ #waterfox-install-dir.patch -p1 dont-statically-link-libstdc++.patch -p1 bgstack15.patch -p1 +45130a237874aaa96bdf23ee107b0be0e0a2afab.patch -p1 |