diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-04-01 12:46:39 -0400 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-04-01 12:46:39 -0400 |
| commit | 60c23cb53e12429c055899a2215586a864a13132 (patch) | |
| tree | 7c682719833e019e685948316347febb8bd21264 | |
| parent | debian/control.in: WebKit builds fine again on sh4 re-add that architecture t... (diff) | |
| download | zenity-60c23cb53e12429c055899a2215586a864a13132.tar.gz zenity-60c23cb53e12429c055899a2215586a864a13132.tar.bz2 zenity-60c23cb53e12429c055899a2215586a864a13132.zip | |
Revert "debian/control.in: WebKit builds fine again on sh4 re-add that architecture to the build-dependencies"
This reverts commit 59b52777ebc37b7df2b6fc96b3790bf173c6336b.
webkit2gtk 2.36 isn't building on sh4 yet
| -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, 3 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 5cc65fd4..7284ebdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -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 aaf46a7a..27c08153 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], + libwebkit2gtk-4.0-dev (>= 2.8.1) [!ia64 !kfreebsd-any !sh4], meson (>= 0.53.0) Rules-Requires-Root: no Standards-Version: 4.6.0 diff --git a/debian/control.in b/debian/control.in index 8bd9337a..af261d0c 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], + libwebkit2gtk-4.0-dev (>= 2.8.1) [!ia64 !kfreebsd-any !sh4], meson (>= 0.53.0) Rules-Requires-Root: no Standards-Version: 4.6.0 diff --git a/debian/rules b/debian/rules index 280e586a..6a5f09ce 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)) +ifeq (,$(filter $(DEB_HOST_ARCH), ia64 kfreebsd-amd64 kfreebsd-i386 sh4)) ENABLE_WEBKIT = -Dwebkitgtk=true endif |