Sat Jan 1 16:49:10 2022 UTC ()
Pullup ticket #6556 - requested by leot
www/webkit-gtk: add missing dependency

Revisions pulled up:
- www/webkit-gtk/Makefile                                       1.218
- www/webkit-gtk/buildlink3.mk                                  1.86

---
   Module Name:    pkgsrc
   Committed By:   leot
   Date:           Wed Dec 29 08:59:16 UTC 2021

   Modified Files:
           pkgsrc/www/webkit-gtk: Makefile buildlink3.mk

   Log Message:
   webkit-gtk: Add a dependency to gst-plugins1-good

   webkit-gtk now needs "autoaudiosink" plugin part of gst-plugins1-good
   otherwise it aborts.

   Bump PKGREVISION.


(bsiegert)
diff -r1.217 -r1.217.2.1 pkgsrc/www/webkit-gtk/Makefile
diff -r1.85 -r1.85.2.1 pkgsrc/www/webkit-gtk/buildlink3.mk
cvs diff -r1.217 -r1.217.2.1 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2021/12/20 12:26:16 1.217
+++ pkgsrc/www/webkit-gtk/Makefile 2022/01/01 16:49:10 1.217.2.1
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.217 2021/12/20 12:26:16 leot Exp $ 1# $NetBSD: Makefile,v 1.217.2.1 2022/01/01 16:49:10 bsiegert Exp $
2 2
3DISTNAME= webkitgtk-2.34.3 3DISTNAME= webkitgtk-2.34.3
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
 5PKGREVISION= 1
5CATEGORIES= www 6CATEGORIES= www
6MASTER_SITES= https://www.webkitgtk.org/releases/ 7MASTER_SITES= https://www.webkitgtk.org/releases/
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.webkitgtk.org/ 11HOMEPAGE= https://www.webkitgtk.org/
11COMMENT= GTK port of the WebKit browser engine 12COMMENT= GTK port of the WebKit browser engine
12LICENSE= 2-clause-bsd AND gnu-lgpl-v2 13LICENSE= 2-clause-bsd AND gnu-lgpl-v2
13 14
14# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 15# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
15NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 16NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
16 17
17TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools 18TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
@@ -137,26 +138,27 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.3 @@ -137,26 +138,27 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.3
137.include "../../fonts/harfbuzz-icu/buildlink3.mk" 138.include "../../fonts/harfbuzz-icu/buildlink3.mk"
138.include "../../fonts/woff2/buildlink3.mk" 139.include "../../fonts/woff2/buildlink3.mk"
139.include "../../graphics/cairo-gobject/buildlink3.mk" 140.include "../../graphics/cairo-gobject/buildlink3.mk"
140.include "../../graphics/freetype2/buildlink3.mk" 141.include "../../graphics/freetype2/buildlink3.mk"
141.include "../../graphics/libwebp/buildlink3.mk" 142.include "../../graphics/libwebp/buildlink3.mk"
142.include "../../mk/jpeg.buildlink3.mk" 143.include "../../mk/jpeg.buildlink3.mk"
143.include "../../graphics/lcms2/buildlink3.mk" 144.include "../../graphics/lcms2/buildlink3.mk"
144BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08 145BUILDLINK_API_DEPENDS.png+= png>=1.5.1beta08
145.include "../../graphics/png/buildlink3.mk" 146.include "../../graphics/png/buildlink3.mk"
146BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3 147BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.0.3
147.include "../../multimedia/gstreamer1/buildlink3.mk" 148.include "../../multimedia/gstreamer1/buildlink3.mk"
148BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3 149BUILDLINK_API_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.0.3
149.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 150.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 151.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
150BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3 152BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3
151.include "../../net/libsoup/buildlink3.mk" 153.include "../../net/libsoup/buildlink3.mk"
152.include "../../security/libsecret/buildlink3.mk" 154.include "../../security/libsecret/buildlink3.mk"
153.include "../../security/libtasn1/buildlink3.mk" 155.include "../../security/libtasn1/buildlink3.mk"
154.include "../../sysutils/libnotify/buildlink3.mk" 156.include "../../sysutils/libnotify/buildlink3.mk"
155.include "../../textproc/icu/buildlink3.mk" 157.include "../../textproc/icu/buildlink3.mk"
156.include "../../textproc/libxslt/buildlink3.mk" 158.include "../../textproc/libxslt/buildlink3.mk"
157.include "../../x11/gtk3/buildlink3.mk" 159.include "../../x11/gtk3/buildlink3.mk"
158.include "../../x11/libXdamage/buildlink3.mk" 160.include "../../x11/libXdamage/buildlink3.mk"
159.include "../../x11/libXt/buildlink3.mk" 161.include "../../x11/libXt/buildlink3.mk"
160.include "../../mk/pthread.buildlink3.mk" 162.include "../../mk/pthread.buildlink3.mk"
161.include "../../mk/atomic64.mk" 163.include "../../mk/atomic64.mk"
162.include "../../mk/bsd.pkg.mk" 164.include "../../mk/bsd.pkg.mk"
cvs diff -r1.85 -r1.85.2.1 pkgsrc/www/webkit-gtk/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/buildlink3.mk 2021/12/08 16:02:48 1.85
+++ pkgsrc/www/webkit-gtk/buildlink3.mk 2022/01/01 16:49:10 1.85.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.85 2021/12/08 16:02:48 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.85.2.1 2022/01/01 16:49:10 bsiegert Exp $
2 2
3BUILDLINK_TREE+= webkit-gtk 3BUILDLINK_TREE+= webkit-gtk
4 4
5.if !defined(WEBKIT_GTK_BUILDLINK3_MK) 5.if !defined(WEBKIT_GTK_BUILDLINK3_MK)
6WEBKIT_GTK_BUILDLINK3_MK:= 6WEBKIT_GTK_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.8 8BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.8
9BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=2.34.2 9BUILDLINK_ABI_DEPENDS.webkit-gtk?= webkit-gtk>=2.34.2
10BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk 10BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk
11 11
12# This is necessary to match the package requirement. 12# This is necessary to match the package requirement.
13GCC_REQD+= 7.3 13GCC_REQD+= 7.3
14 14
@@ -18,23 +18,24 @@ pkgbase := webkit-gtk @@ -18,23 +18,24 @@ pkgbase := webkit-gtk
18.if !empty(PKG_BUILD_OPTIONS.webkit-gtk:Menchant) 18.if !empty(PKG_BUILD_OPTIONS.webkit-gtk:Menchant)
19.include "../../textproc/enchant2/buildlink3.mk" 19.include "../../textproc/enchant2/buildlink3.mk"
20.endif 20.endif
21 21
22.include "../../databases/sqlite3/buildlink3.mk" 22.include "../../databases/sqlite3/buildlink3.mk"
23.include "../../devel/gperf/buildlink3.mk" 23.include "../../devel/gperf/buildlink3.mk"
24.include "../../graphics/freetype2/buildlink3.mk" 24.include "../../graphics/freetype2/buildlink3.mk"
25.include "../../mk/jpeg.buildlink3.mk" 25.include "../../mk/jpeg.buildlink3.mk"
26.include "../../graphics/lcms2/buildlink3.mk" 26.include "../../graphics/lcms2/buildlink3.mk"
27.include "../../graphics/png/buildlink3.mk" 27.include "../../graphics/png/buildlink3.mk"
28.include "../../graphics/libwebp/buildlink3.mk" 28.include "../../graphics/libwebp/buildlink3.mk"
29.include "../../multimedia/gstreamer1/buildlink3.mk" 29.include "../../multimedia/gstreamer1/buildlink3.mk"
30.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 30.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 31.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
31.include "../../net/libsoup/buildlink3.mk" 32.include "../../net/libsoup/buildlink3.mk"
32.include "../../security/libsecret/buildlink3.mk" 33.include "../../security/libsecret/buildlink3.mk"
33.include "../../textproc/icu/buildlink3.mk" 34.include "../../textproc/icu/buildlink3.mk"
34.include "../../textproc/libxslt/buildlink3.mk" 35.include "../../textproc/libxslt/buildlink3.mk"
35.include "../../x11/gtk3/buildlink3.mk" 36.include "../../x11/gtk3/buildlink3.mk"
36.include "../../x11/libXdamage/buildlink3.mk" 37.include "../../x11/libXdamage/buildlink3.mk"
37.include "../../x11/libXt/buildlink3.mk" 38.include "../../x11/libXt/buildlink3.mk"
38.endif # WEBKIT_GTK_BUILDLINK3_MK 39.endif # WEBKIT_GTK_BUILDLINK3_MK
39 40
40BUILDLINK_TREE+= -webkit-gtk 41BUILDLINK_TREE+= -webkit-gtk