diff options
| author | Simon McVittie <smcv@debian.org> | 2022-08-31 10:58:12 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2022-08-31 10:58:12 +0100 |
| commit | 7df652c47480eeccd5fe78d3af89ab6b5789b3aa (patch) | |
| tree | 10c2766327314f76dbe8fbf0271d8ba5dc2b7702 | |
| parent | 514e2f1bf79907c118cabec562da96a48dbe066c (diff) | |
Disable gjs plugin on armel
gjs itself is likely to be removed from armel in the near future
(see #1018076).
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/control.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/debian/control b/debian/control index fa136335..2b7648c1 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: at-spi2-core <!nocheck>, dh-sequence-gnome, itstool, libxml2-dev (>= 2.4.0), - libgjs-dev (>= 1.64.0) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64], + libgjs-dev (>= 1.64.0) [amd64 arm64 armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64], libglib2.0-dev (>= 2.64.0), libgtk-3-dev (>= 3.24.0), libwebkit2gtk-4.0-dev (>= 2.28.0) [!ia64 !kfreebsd-any], diff --git a/debian/control.in b/debian/control.in index b4e30afd..96dc5e7b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -10,7 +10,7 @@ Build-Depends: at-spi2-core <!nocheck>, dh-sequence-gnome, itstool, libxml2-dev (>= 2.4.0), - libgjs-dev (>= 1.64.0) [amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64], + libgjs-dev (>= 1.64.0) [amd64 arm64 armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64], libglib2.0-dev (>= 2.64.0), libgtk-3-dev (>= 3.24.0), libwebkit2gtk-4.0-dev (>= 2.28.0) [!ia64 !kfreebsd-any], diff --git a/debian/rules b/debian/rules index 392408e2..c179dbeb 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ endif ifneq (,$(filter $(DEB_HOST_ARCH), ia64 kfreebsd-amd64 kfreebsd-i386)) ENABLE_WEBKIT = -Dwebkit2gtk=disabled endif -ifeq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64)) +ifeq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64)) ENABLE_GJS = -Dgjs=disabled endif @@ -31,7 +31,7 @@ TEST_COMMAND = dh_auto_test -- --wrap="dbus-run-session -- xvfb-run -a" \ override_dh_auto_test: # Tests are failing without gjs support, see https://gitlab.gnome.org/GNOME/glade/-/issues/495 -ifeq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64)) +ifeq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el mipsel ppc64el s390x powerpc ppc64 riscv64)) $(TEST_COMMAND) || true else $(TEST_COMMAND) |