pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: nia
Date: Sun Jan 5 17:55:22 UTC 2020
Modified Files:
pkgsrc/www/firefox: Makefile PLIST options.mk
pkgsrc/www/firefox68: Makefile options.mk
pkgsrc/www/webkit-gtk: Makefile options.mk
pkgsrc/x11/gtk3: Makefile options.mk
Log Message:
*: Enable Wayland where supported in GTK and Firefox.
Bump PKGREVISIONs
To generate a diff of this commit:
cvs rdiff -u -r1.403 -r1.404 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.149 -r1.150 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.51 -r1.52 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox68/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/firefox68/options.mk
cvs rdiff -u -r1.176 -r1.177 pkgsrc/www/webkit-gtk/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/webkit-gtk/options.mk
cvs rdiff -u -r1.138 -r1.139 pkgsrc/x11/gtk3/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/gtk3/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/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.403 pkgsrc/www/firefox/Makefile:1.404
--- pkgsrc/www/firefox/Makefile:1.403 Tue Dec 3 14:21:20 2019
+++ pkgsrc/www/firefox/Makefile Sun Jan 5 17:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.403 2019/12/03 14:21:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.404 2020/01/05 17:55:22 nia Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 71.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.149 pkgsrc/www/firefox/PLIST:1.150
--- pkgsrc/www/firefox/PLIST:1.149 Tue Dec 3 14:21:20 2019
+++ pkgsrc/www/firefox/PLIST Sun Jan 5 17:55:22 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.149 2019/12/03 14:21:20 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.150 2020/01/05 17:55:22 nia Exp $
bin/firefox
lib/firefox/actors/AudioPlaybackChild.jsm
lib/firefox/actors/AudioPlaybackParent.jsm
@@ -5106,6 +5106,7 @@ ${PLIST.ffvpx}lib/firefox/libmozavcodec.
${PLIST.ffvpx}lib/firefox/libmozavutil.so
lib/firefox/libmozgtk.so
lib/firefox/libmozsqlite3.so
+${PLIST.wayland}lib/firefox68/libmozwayland.so
lib/firefox/libxul.so
lib/firefox/localization/en-US/crashreporter/aboutcrashes.ftl
lib/firefox/localization/en-US/security/certificates/certManager.ftl
Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.51 pkgsrc/www/firefox/options.mk:1.52
--- pkgsrc/www/firefox/options.mk:1.51 Tue Dec 3 14:21:20 2019
+++ pkgsrc/www/firefox/options.mk Sun Jan 5 17:55:22 2020
@@ -1,12 +1,17 @@
-# $NetBSD: options.mk,v 1.51 2019/12/03 14:21:20 ryoon Exp $
+# $NetBSD: options.mk,v 1.52 2020/01/05 17:55:22 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
+PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus wayland
PLIST_VARS+= gnome 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
.else
@@ -85,3 +90,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
Index: pkgsrc/www/firefox68/Makefile
diff -u pkgsrc/www/firefox68/Makefile:1.5 pkgsrc/www/firefox68/Makefile:1.6
--- pkgsrc/www/firefox68/Makefile:1.5 Sun Dec 8 20:09:41 2019
+++ pkgsrc/www/firefox68/Makefile Sun Jan 5 17:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/12/08 20:09:41 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/01/05 17:55:22 nia Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 68.3
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR= .0esr
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/}
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/www/firefox68/options.mk
diff -u pkgsrc/www/firefox68/options.mk:1.4 pkgsrc/www/firefox68/options.mk:1.5
--- pkgsrc/www/firefox68/options.mk:1.4 Sun Dec 22 16:07:48 2019
+++ pkgsrc/www/firefox68/options.mk Sun Jan 5 17:55:22 2020
@@ -1,13 +1,17 @@
-# $NetBSD: options.mk,v 1.4 2019/12/22 16:07:48 nia Exp $
+# $NetBSD: options.mk,v 1.5 2020/01/05 17:55:22 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 oss pulseaudio dbus
-PKG_SUPPORTED_OPTIONS+= wayland
+PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus wayland
PLIST_VARS+= gnome 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
.else
Index: pkgsrc/www/webkit-gtk/Makefile
diff -u pkgsrc/www/webkit-gtk/Makefile:1.176 pkgsrc/www/webkit-gtk/Makefile:1.177
--- pkgsrc/www/webkit-gtk/Makefile:1.176 Sun Dec 15 15:38:59 2019
+++ pkgsrc/www/webkit-gtk/Makefile Sun Jan 5 17:55:21 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.176 2019/12/15 15:38:59 taca Exp $
+# $NetBSD: Makefile,v 1.177 2020/01/05 17:55:21 nia Exp $
DISTNAME= webkitgtk-2.26.2
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= https://www.webkitgtk.org/releases/
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/www/webkit-gtk/options.mk
diff -u pkgsrc/www/webkit-gtk/options.mk:1.19 pkgsrc/www/webkit-gtk/options.mk:1.20
--- pkgsrc/www/webkit-gtk/options.mk:1.19 Sat Oct 5 14:59:47 2019
+++ pkgsrc/www/webkit-gtk/options.mk Sun Jan 5 17:55:21 2020
@@ -1,13 +1,17 @@
-# $NetBSD: options.mk,v 1.19 2019/10/05 14:59:47 nia Exp $
+# $NetBSD: options.mk,v 1.20 2020/01/05 17:55:21 nia Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.webkit-gtk
PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit wayland
PKG_SUGGESTED_OPTIONS= enchant introspection opengl
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+= wayland
+.endif
PLIST_VARS= introspection
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
#
# Platforms that support the webkit-jit option
Index: pkgsrc/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.138 pkgsrc/x11/gtk3/Makefile:1.139
--- pkgsrc/x11/gtk3/Makefile:1.138 Tue Dec 31 12:21:00 2019
+++ pkgsrc/x11/gtk3/Makefile Sun Jan 5 17:55:22 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.138 2019/12/31 12:21:00 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2020/01/05 17:55:22 nia Exp $
DISTNAME= gtk+-3.24.13
PKGNAME= ${DISTNAME:S/gtk/gtk3/}
+PKGREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.15 pkgsrc/x11/gtk3/options.mk:1.16
--- pkgsrc/x11/gtk3/options.mk:1.15 Tue Aug 20 13:55:05 2019
+++ pkgsrc/x11/gtk3/options.mk Sun Jan 5 17:55:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/08/20 13:55:05 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2020/01/05 17:55:22 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3
PKG_SUPPORTED_OPTIONS+= gtk3-atk-bridge cups debug
@@ -6,6 +6,10 @@ PKG_SUPPORTED_OPTIONS+= wayland x11
.if exists(/System/Library/Frameworks/Quartz.framework)
PKG_SUPPORTED_OPTIONS+= quartz
.endif
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+= wayland
+.endif
PKG_SUGGESTED_OPTIONS= gtk3-atk-bridge x11
.include "../../mk/bsd.options.mk"
Home |
Main Index |
Thread Index |
Old Index