summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-06-05 11:51:50 -0400
committerB Stack <bgstack15@gmail.com>2020-06-05 11:51:50 -0400
commit7d6d9e925d240ac6e4f800c889d5f4f4f5c7f35b (patch)
tree4f7091e3f94ab782ca1a5ebf4b0b40e5211afa05
parentwf 2020.06 dpkg rc1 (diff)
downloadstackrpms-7d6d9e925d240ac6e4f800c889d5f4f4f5c7f35b.tar.gz
stackrpms-7d6d9e925d240ac6e4f800c889d5f4f4f5c7f35b.tar.bz2
stackrpms-7d6d9e925d240ac6e4f800c889d5f4f4f5c7f35b.zip
wf: dpkg change build deps for obs
Package clang-6.0 has been removed from Debian unstable so use a whole set of options, ripped from hawkeye https://github.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage/blob/master/waterfox-classic-kpe/control
-rw-r--r--waterfox/README.md1
-rw-r--r--waterfox/debian/control6
2 files changed, 4 insertions, 3 deletions
diff --git a/waterfox/README.md b/waterfox/README.md
index 642c136..11400d5 100644
--- a/waterfox/README.md
+++ b/waterfox/README.md
@@ -17,6 +17,7 @@ All | 2020.01-classic
# Additional info
* 2020-03-19 [https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md](https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md) is where the rpm scriptlet `_legacy_common_support 1` comes from, for telling gcc 10 to use `-fcommon`
+* [https://github.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage](https://github.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage)
# Differences from upstream
## rpm
diff --git a/waterfox/debian/control b/waterfox/debian/control
index 6cc48b7..d272dd3 100644
--- a/waterfox/debian/control
+++ b/waterfox/debian/control
@@ -9,11 +9,11 @@ Build-Depends: debhelper (>= 12),
binutils-avr,
cargo (>= 0.35),
ccache,
- clang-6.0,
+ clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7,
dpkg-dev (>= 1.16.1.1~),
libasound2-dev,
libbz2-dev,
- libclang-6.0-dev,
+ libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev,
libdbus-glib-1-dev,
libevent-dev (>= 1.4.1),
libfontconfig-dev,
@@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 12),
libx11-dev,
libx11-xcb-dev,
libxt-dev,
- llvm-6.0-dev,
+ llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev,
locales,
lsb-release,
python2.7,
bgstack15