diff options
| author | nia <nia@pkgsrc.org> | 2020-06-29 11:53:09 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-06-29 11:53:09 +0000 |
| commit | 0f2b0d496bbe8d0d595b261347081cc65dc5688c (patch) | |
| tree | a2c318698a3b7bcff0409d79f861b89d7a5bd8f5 /www/firefox68 | |
| parent | dc6221c220cb4b47b5ee013af27ee943d2300f3d (diff) | |
| download | pkgsrc-0f2b0d496bbe8d0d595b261347081cc65dc5688c.tar.gz | |
Detect if gtk3 was built with Wayland properly in Mozilla packages.
thanks jperkin for the hint.
Diffstat (limited to 'www/firefox68')
| -rw-r--r-- | www/firefox68/mozilla-common.mk | 6 | ||||
| -rw-r--r-- | www/firefox68/options.mk | 15 |
2 files changed, 7 insertions, 14 deletions
diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk index 04cab28a194..0bbfb2950f8 100644 --- a/www/firefox68/mozilla-common.mk +++ b/www/firefox68/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.12 2020/06/17 17:57:25 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.13 2020/06/29 11:53:09 nia Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -235,4 +235,8 @@ BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 .include "../../x11/pixman/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" +PLIST_VARS+= wayland +.if ${PKG_BUILD_OPTIONS.gtk3:Mx11} +PLIST.wayland= yes +.endif .include "../../lang/python/pyversion.mk" diff --git a/www/firefox68/options.mk b/www/firefox68/options.mk index e0b09db6226..1e410cfb275 100644 --- a/www/firefox68/options.mk +++ b/www/firefox68/options.mk @@ -1,17 +1,12 @@ -# $NetBSD: options.mk,v 1.8 2020/03/12 19:39:35 nia Exp $ +# $NetBSD: options.mk,v 1.9 2020/06/29 11:53:09 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox PKG_SUPPORTED_OPTIONS= official-mozilla-branding PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc -PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus wayland +PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus PLIST_VARS+= jemalloc debug -.include "../../devel/wayland/platform.mk" -.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes" -PKG_SUGGESTED_OPTIONS+= wayland -.endif - .if ${OPSYS} == "Linux" PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc .else @@ -102,9 +97,3 @@ PLIST.webrtc= yes .else CONFIGURE_ARGS+= --disable-webrtc .endif - -PLIST_VARS+= wayland -.if !empty(PKG_OPTIONS:Mwayland) -# \todo Instead of using an option, determine if gtk3 was built with wayland. -PLIST.wayland= yes -.endif |