[pkgsrc/trunk]: pkgsrc Detect if gtk3 was built with Wayland properly in Mozi...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df2c061795a9
branches:  trunk
changeset: 434951:df2c061795a9
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jun 29 11:53:09 2020 +0000

description:
Detect if gtk3 was built with Wayland properly in Mozilla packages.

thanks jperkin for the hint.

diffstat:

 mail/thunderbird/options.mk     |  15 ++-------------
 www/firefox/mozilla-common.mk   |   6 +++++-
 www/firefox/options.mk          |  15 ++-------------
 www/firefox68/mozilla-common.mk |   6 +++++-
 www/firefox68/options.mk        |  15 ++-------------
 5 files changed, 16 insertions(+), 41 deletions(-)

diffs (137 lines):

diff -r 399c01512c3c -r df2c061795a9 mail/thunderbird/options.mk
--- a/mail/thunderbird/options.mk       Mon Jun 29 11:50:26 2020 +0000
+++ b/mail/thunderbird/options.mk       Mon Jun 29 11:53:09 2020 +0000
@@ -1,19 +1,14 @@
-# $NetBSD: options.mk,v 1.22 2020/06/15 15:44:22 nia Exp $
+# $NetBSD: options.mk,v 1.23 2020/06/29 11:53:09 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.thunderbird
 
 PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc \
                        official-mozilla-branding pulseaudio \
-                       mozilla-lightning wayland
+                       mozilla-lightning
 PKG_SUGGESTED_OPTIONS+=        mozilla-lightning
 
 PLIST_VARS+=           branding nobranding debug jemalloc
 
-.include "../../devel/wayland/platform.mk"
-.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
-PKG_SUGGESTED_OPTIONS+=        wayland
-.endif
-
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        alsa pulseaudio mozilla-jemalloc dbus
 .else
@@ -80,9 +75,3 @@
 CONFIGURE_ARGS+=       --disable-official-branding
 PLIST.nobranding=      yes
 .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
diff -r 399c01512c3c -r df2c061795a9 www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk     Mon Jun 29 11:50:26 2020 +0000
+++ b/www/firefox/mozilla-common.mk     Mon Jun 29 11:53:09 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.171 2020/06/17 17:54:26 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.172 2020/06/29 11:53:09 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -269,4 +269,8 @@
 .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 -r 399c01512c3c -r df2c061795a9 www/firefox/options.mk
--- a/www/firefox/options.mk    Mon Jun 29 11:50:26 2020 +0000
+++ b/www/firefox/options.mk    Mon Jun 29 11:53:09 2020 +0000
@@ -1,17 +1,12 @@
-# $NetBSD: options.mk,v 1.54 2020/02/27 15:53:33 nia Exp $
+# $NetBSD: options.mk,v 1.55 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
@@ -92,9 +87,3 @@
 .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
diff -r 399c01512c3c -r df2c061795a9 www/firefox68/mozilla-common.mk
--- a/www/firefox68/mozilla-common.mk   Mon Jun 29 11:50:26 2020 +0000
+++ b/www/firefox68/mozilla-common.mk   Mon Jun 29 11:53:09 2020 +0000
@@ -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 @@
 .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 -r 399c01512c3c -r df2c061795a9 www/firefox68/options.mk
--- a/www/firefox68/options.mk  Mon Jun 29 11:50:26 2020 +0000
+++ b/www/firefox68/options.mk  Mon Jun 29 11:53:09 2020 +0000
@@ -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 @@
 .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