Fix OpenGL dependancy clash on Ubuntu/Bionic

mozilla-mobile · Mar 15, 2022 · 6a45c82 · 6a45c82
1 parent f229781
commit 6a45c82
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/linux/debian/control.qt6 b/linux/debian/control.qt6
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 9.20160709),
                golang (>=2:1.13~) | golang-1.13,
                cargo,
                python3-yaml,
-               libglvnd-dev (>= 1.3.0~) | libglvnd-core-dev (<< 1.3.0~),
+               libglx-dev (>= 1.3.0~) | libglvnd-dev (<< 1.3.0~),
+               libopengl-dev (>= 1.3.0~) | libglvnd-dev (<< 1.3.0~),
                libqt6charts6-dev (>=6.2.0~),
                libqt6core5compat6-dev (>=6.2.0~),
                libqt6networkauth6-dev (>=6.2.0~),

diff --git a/linux/debian/rules.beineri b/linux/debian/rules.beineri
@@ -9,7 +9,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_VERSION ?= $(shell dpkg-parsechangelog -SVersion)
 
 GOLANG_NATIVE_VERSION := $(shell dpkg-query --showformat='${Version}' --show golang 2>/dev/null || echo 0)
-ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 1.13 && echo ok))
+ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 2:1.13 && echo ok))
 	export GODIR := /usr/lib/go-1.13
 	export PATH := $(GODIR)/bin:$(PATH)
 endif

diff --git a/linux/debian/rules.qt5 b/linux/debian/rules.qt5
@@ -6,7 +6,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_VERSION ?= $(shell dpkg-parsechangelog -SVersion)
 
 GOLANG_NATIVE_VERSION := $(shell dpkg-query --showformat='${Version}' --show golang 2>/dev/null || echo 0)
-ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 1.13 && echo ok))
+ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 2:1.13 && echo ok))
 	export GODIR := /usr/lib/go-1.13
 	export PATH := $(GODIR)/bin:$(PATH)
 endif

diff --git a/linux/debian/rules.qt6 b/linux/debian/rules.qt6
@@ -6,7 +6,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_VERSION ?= $(shell dpkg-parsechangelog -SVersion)
 
 GOLANG_NATIVE_VERSION := $(shell dpkg-query --showformat='${Version}' --show golang 2>/dev/null || echo 0)
-ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 1.13 && echo ok))
+ifneq (ok,$(dpkg --compare-versions $(GOLANG_NATIVE_VERSION) ge 2:1.13 && echo ok))
 	export GODIR := /usr/lib/go-1.13
 	export PATH := $(GODIR)/bin:$(PATH)
 endif