Mon Jul 25 13:57:01 2022 UTC ()
firefox: --disable-necko-wifi is mandated with --disable-dbus

At least on platforms where the geolocation API is implemented (i.e. Linux)


(tnn)
diff -r1.69 -r1.70 pkgsrc/www/firefox/options.mk
cvs diff -r1.69 -r1.70 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2022/07/24 16:33:09 1.69
+++ pkgsrc/www/firefox/options.mk 2022/07/25 13:57:01 1.70
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.69 2022/07/24 16:33:09 rjs Exp $ 1# $NetBSD: options.mk,v 1.70 2022/07/25 13:57:01 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= dbus 7PKG_SUPPORTED_OPTIONS+= dbus
8PKG_SUPPORTED_OPTIONS+= alsa pulseaudio sunaudio jack 8PKG_SUPPORTED_OPTIONS+= alsa pulseaudio sunaudio jack
9 9
10PKG_SUGGESTED_OPTIONS+= dbus 10PKG_SUGGESTED_OPTIONS+= dbus
11 11
12.if ${OPSYS} == "Linux" 12.if ${OPSYS} == "Linux"
13PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc webrtc 13PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc webrtc
14.endif 14.endif
@@ -53,26 +53,27 @@ CONFIGURE_ARGS+= --enable-install-strip @@ -53,26 +53,27 @@ CONFIGURE_ARGS+= --enable-install-strip
53CONFIGURE_ARGS+= --disable-debug 53CONFIGURE_ARGS+= --disable-debug
54.endif 54.endif
55 55
56.if !empty(PKG_OPTIONS:Mpulseaudio) 56.if !empty(PKG_OPTIONS:Mpulseaudio)
57AUDIO_BACKENDS+= pulseaudio 57AUDIO_BACKENDS+= pulseaudio
58.include "../../audio/pulseaudio/buildlink3.mk" 58.include "../../audio/pulseaudio/buildlink3.mk"
59.endif 59.endif
60 60
61.if !empty(PKG_OPTIONS:Mdbus) 61.if !empty(PKG_OPTIONS:Mdbus)
62.include "../../sysutils/dbus-glib/buildlink3.mk" 62.include "../../sysutils/dbus-glib/buildlink3.mk"
63CONFIGURE_ARGS+= --enable-dbus 63CONFIGURE_ARGS+= --enable-dbus
64.else 64.else
65CONFIGURE_ARGS+= --disable-dbus 65CONFIGURE_ARGS+= --disable-dbus
 66CONFIGURE_ARGS+= --disable-necko-wifi
66.endif 67.endif
67 68
68.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 69.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
69CONFIGURE_ARGS+= --enable-official-branding 70CONFIGURE_ARGS+= --enable-official-branding
70LICENSE= mozilla-trademark-license 71LICENSE= mozilla-trademark-license
71RESTRICTED= Trademark holder prohibits distribution of modified versions. 72RESTRICTED= Trademark holder prohibits distribution of modified versions.
72NO_BIN_ON_CDROM= ${RESTRICTED} 73NO_BIN_ON_CDROM= ${RESTRICTED}
73NO_BIN_ON_FTP= ${RESTRICTED} 74NO_BIN_ON_FTP= ${RESTRICTED}
74.else 75.else
75CONFIGURE_ARGS+= --with-branding=browser/branding/unofficial 76CONFIGURE_ARGS+= --with-branding=browser/branding/unofficial
76.endif 77.endif
77 78
78.if !empty(PKG_OPTIONS:Msunaudio) 79.if !empty(PKG_OPTIONS:Msunaudio)