CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun 29 11:53:09 UTC 2020

Modified Files:
        pkgsrc/mail/thunderbird: options.mk
        pkgsrc/www/firefox: mozilla-common.mk options.mk
        pkgsrc/www/firefox68: mozilla-common.mk options.mk

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

thanks jperkin for the hint.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/thunderbird/options.mk
cvs rdiff -u -r1.171 -r1.172 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/firefox68/mozilla-common.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/firefox68/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/thunderbird/options.mk
diff -u pkgsrc/mail/thunderbird/options.mk:1.22 pkgsrc/mail/thunderbird/options.mk:1.23
--- pkgsrc/mail/thunderbird/options.mk:1.22     Mon Jun 15 15:44:22 2020
+++ pkgsrc/mail/thunderbird/options.mk  Mon Jun 29 11:53:09 2020
@@ -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 @@ NO_BIN_ON_FTP=                ${RESTRICTED}
 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

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.171 pkgsrc/www/firefox/mozilla-common.mk:1.172
--- pkgsrc/www/firefox/mozilla-common.mk:1.171  Wed Jun 17 17:54:26 2020
+++ pkgsrc/www/firefox/mozilla-common.mk        Mon Jun 29 11:53:09 2020
@@ -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 @@ BUILDLINK_API_DEPENDS.pixman+= pixman>=0
 .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"

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.54 pkgsrc/www/firefox/options.mk:1.55
--- pkgsrc/www/firefox/options.mk:1.54  Thu Feb 27 15:53:33 2020
+++ pkgsrc/www/firefox/options.mk       Mon Jun 29 11:53:09 2020
@@ -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 @@ 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

Index: pkgsrc/www/firefox68/mozilla-common.mk
diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.12 pkgsrc/www/firefox68/mozilla-common.mk:1.13
--- pkgsrc/www/firefox68/mozilla-common.mk:1.12 Wed Jun 17 17:57:25 2020
+++ pkgsrc/www/firefox68/mozilla-common.mk      Mon Jun 29 11:53:09 2020
@@ -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
 .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"

Index: pkgsrc/www/firefox68/options.mk
diff -u pkgsrc/www/firefox68/options.mk:1.8 pkgsrc/www/firefox68/options.mk:1.9
--- pkgsrc/www/firefox68/options.mk:1.8 Thu Mar 12 19:39:35 2020
+++ pkgsrc/www/firefox68/options.mk     Mon Jun 29 11:53:09 2020
@@ -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