diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/control.in | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 7284ebdc..5cc65fd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +zenity (3.41.0-3) UNRELEASED; urgency=medium + + * debian/control.in: WebKit builds fine again on sh4 + re-add that architecture to the build-dependencies + + -- Laurent Bigonville <bigon@debian.org> Mon, 01 Nov 2021 01:31:58 +0100 + zenity (3.41.0-2) unstable; urgency=medium * Don't try to build webkitgtk feature where webkitgtk isn't available diff --git a/debian/control b/debian/control index 27c08153..aaf46a7a 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13), libglib2.0-dev, libgtk-3-dev (>= 3.16.0), libnotify-dev (>= 0.6.1), - libwebkit2gtk-4.0-dev (>= 2.8.1) [!ia64 !kfreebsd-any !sh4], + libwebkit2gtk-4.0-dev (>= 2.8.1) [!ia64 !kfreebsd-any], meson (>= 0.53.0) Rules-Requires-Root: no Standards-Version: 4.6.0 diff --git a/debian/control.in b/debian/control.in index af261d0c..8bd9337a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13), libglib2.0-dev, libgtk-3-dev (>= 3.16.0), libnotify-dev (>= 0.6.1), - libwebkit2gtk-4.0-dev (>= 2.8.1) [!ia64 !kfreebsd-any !sh4], + libwebkit2gtk-4.0-dev (>= 2.8.1) [!ia64 !kfreebsd-any], meson (>= 0.53.0) Rules-Requires-Root: no Standards-Version: 4.6.0 diff --git a/debian/rules b/debian/rules index 6a5f09ce..280e586a 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -ifeq (,$(filter $(DEB_HOST_ARCH), ia64 kfreebsd-amd64 kfreebsd-i386 sh4)) +ifeq (,$(filter $(DEB_HOST_ARCH), ia64 kfreebsd-amd64 kfreebsd-i386)) ENABLE_WEBKIT = -Dwebkitgtk=true endif |