From 945fb90b2724c4d23730b9a65dc4327eaaf39df7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 19 Jun 2023 14:52:41 +0100 Subject: Disable WebKit integration (--html option) This adds several "heavy" dependencies, notably WebKit itself, but also video and spellchecking among others, which are undesired for a simple interactive dialog. The WebKit feature is disabled by default upstream, and several major distributions (including at least the Fedora/Red Hat family, Arch and openSUSE) don't enable it in their packaging, so portable software cannot rely on this option being available. According to codesearch.debian.net, none of the packages with a dependency on zenity use the --html option. The beginning of the Debian 13 cycle seems is a good time to make this sort of potentially disruptive change; most likely nobody will notice this feature going away, but if we get bug reports, we can consider other options such as having a zenity-minimal package without HTML support, or having a zenity-full package with it. Closes: #777608, #942362 --- debian/control | 1 - debian/control.in | 1 - debian/rules | 9 +++------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index fe29d7df..ee9b3353 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Build-Depends: debhelper-compat (= 13), libglib2.0-dev, libgtk-3-dev (>= 3.16.0), libnotify-dev (>= 0.6.1), - libwebkit2gtk-4.1-dev (>= 2.8.1) [!hurd-i386 !ia64 !kfreebsd-any !sh4], meson (>= 0.53.0) Rules-Requires-Root: no Standards-Version: 4.6.2 diff --git a/debian/control.in b/debian/control.in index f920ca7b..4f38c549 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,6 @@ Build-Depends: debhelper-compat (= 13), libglib2.0-dev, libgtk-3-dev (>= 3.16.0), libnotify-dev (>= 0.6.1), - libwebkit2gtk-4.1-dev (>= 2.8.1) [!hurd-i386 !ia64 !kfreebsd-any !sh4], meson (>= 0.53.0) Rules-Requires-Root: no Standards-Version: 4.6.2 diff --git a/debian/rules b/debian/rules index 9f4dfd23..00f22caa 100755 --- a/debian/rules +++ b/debian/rules @@ -3,14 +3,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -ifeq (,$(filter $(DEB_HOST_ARCH), hurd-i386 ia64 kfreebsd-amd64 kfreebsd-i386 sh4)) - ENABLE_WEBKIT = -Dwebkitgtk=true -endif - %: dh $@ override_dh_auto_configure: dh_auto_configure -- \ - $(ENABLE_WEBKIT) \ - -Dlibnotify=true + -Dlibnotify=true \ + -Dwebkitgtk=false \ + ${NULL} -- cgit