CVS commit: pkgsrc/www/firefox68

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Dec 22 14:33:58 UTC 2019

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

Log Message:
www/firefox68: Resolve pkg-build-options/not-bl3 issue

firefox68 tries to use pkg-build-options to find out if gtk3 was (or
will be) built with wayland, as that affects the PLIST.  The current
code works for some and causes failures for others, including failures
of thunderbird.  pkg-build-options insists on only being called from
bl3, but the use in Makefile (to manage PLIST changes) seems sensible.

This commit removes the use of pkg-build-options, resolving the build
issues on netbsd-8, and adds a default-off wayland option to firefox68
that merely adjusts the PLIST, so that people building firefox68 with
a wayland-enabled gtk3 have an easier time.

I don't believe that any default-option binary packages will change,
so no PKGREVISION++.

A proper fix is deferred until after the branch.  This could involve
allowing pkg-build-options to be used in Makefile* instead of only
bl3, or adding wayland detection and setting some variable to gtk3's
bl3.

As discussed on pkgsrc-users and offlist with nia@.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox68/mozilla-common.mk
cvs rdiff -u -r1.2 -r1.3 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/www/firefox68/mozilla-common.mk
diff -u pkgsrc/www/firefox68/mozilla-common.mk:1.5 pkgsrc/www/firefox68/mozilla-common.mk:1.6
--- pkgsrc/www/firefox68/mozilla-common.mk:1.5  Sun Dec  8 20:09:41 2019
+++ pkgsrc/www/firefox68/mozilla-common.mk      Sun Dec 22 14:33:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.5 2019/12/08 20:09:41 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.6 2019/12/22 14:33:58 gdt Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -165,13 +165,6 @@ PLIST.tremor=      yes
 PLIST.vorbis=  yes
 .endif
 
-.include "../../mk/pkg-build-options.mk"
-
-PLIST_VARS+=   wayland
-.if !empty(PKG_BUILD_OPTIONS.gtk3:Mwayland)
-PLIST.wayland= yes
-.endif
-
 # See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and
 # installed as a shared library on these platforms.
 .if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android

Index: pkgsrc/www/firefox68/options.mk
diff -u pkgsrc/www/firefox68/options.mk:1.2 pkgsrc/www/firefox68/options.mk:1.3
--- pkgsrc/www/firefox68/options.mk:1.2 Mon Nov  4 22:09:55 2019
+++ pkgsrc/www/firefox68/options.mk     Sun Dec 22 14:33:58 2019
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.2 2019/11/04 22:09:55 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2019/12/22 14:33:58 gdt 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 oss pulseaudio dbus
+#PKG_SUPPORTED_OPTIONS+= wayland
 PLIST_VARS+=           gnome jemalloc debug
 
 .if ${OPSYS} == "Linux"
@@ -100,3 +101,9 @@ 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