Fri Oct 13 09:42:27 2023 UTC ()
Pullup ticket #6810 - requested by gutteridge
www/webkit-gtk: aarch64 build fix

Revisions pulled up:
- www/webkit-gtk/Makefile                                       1.249

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Thu Oct  5 05:57:20 UTC 2023

   Modified Files:
            pkgsrc/www/webkit-gtk: Makefile

   Log Message:
   webkit-gtk: fix inadvertent aarch64 lossage from r. 1.247

   A block that was a no-op was removed, but the inclusion of bsd.prefs.mk
   should still be applied because of a different block added in a later
   revision.


(bsiegert)
diff -r1.248 -r1.248.2.1 pkgsrc/www/webkit-gtk/Makefile
cvs diff -r1.248 -r1.248.2.1 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2023/08/14 05:25:31 1.248
+++ pkgsrc/www/webkit-gtk/Makefile 2023/10/13 09:42:27 1.248.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.248 2023/08/14 05:25:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.248.2.1 2023/10/13 09:42:27 bsiegert Exp $
2 2
3DISTNAME= webkitgtk-2.36.8 3DISTNAME= webkitgtk-2.36.8
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://www.webkitgtk.org/releases/ 7MASTER_SITES= https://www.webkitgtk.org/releases/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.webkitgtk.org/ 11HOMEPAGE= https://www.webkitgtk.org/
12COMMENT= GTK port of the WebKit browser engine 12COMMENT= GTK port of the WebKit browser engine
13LICENSE= 2-clause-bsd AND gnu-lgpl-v2 13LICENSE= 2-clause-bsd AND gnu-lgpl-v2
14 14
@@ -35,26 +35,27 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release @@ -35,26 +35,27 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
35CMAKE_ARGS+= -DPORT=GTK 35CMAKE_ARGS+= -DPORT=GTK
36CMAKE_ARGS+= -DENABLE_X11_TARGET=ON 36CMAKE_ARGS+= -DENABLE_X11_TARGET=ON
37CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON 37CMAKE_ARGS+= -DENABLE_MINIBROWSER=ON
38CMAKE_ARGS+= -DENABLE_GAMEPAD=OFF 38CMAKE_ARGS+= -DENABLE_GAMEPAD=OFF
39CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF 39CMAKE_ARGS+= -DENABLE_GEOLOCATION=OFF
40CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON 40CMAKE_ARGS+= -DENABLE_INTROSPECTION=ON
41CMAKE_ARGS+= -DENABLE_JOURNALD_LOG=OFF 41CMAKE_ARGS+= -DENABLE_JOURNALD_LOG=OFF
42CMAKE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF 42CMAKE_ARGS+= -DENABLE_BUBBLEWRAP_SANDBOX=OFF
43CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF 43CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF
44CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF 44CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
45CMAKE_ARGS+= -DUSE_OPENJPEG=OFF 45CMAKE_ARGS+= -DUSE_OPENJPEG=OFF
46CMAKE_ARGS+= -DUSE_SOUP2=ON 46CMAKE_ARGS+= -DUSE_SOUP2=ON
47 47
 48.include "../../mk/bsd.prefs.mk"
48.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) 49.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
49CMAKE_ARGS+= -DAVOID_INT128=ON 50CMAKE_ARGS+= -DAVOID_INT128=ON
50.endif 51.endif
51 52
52REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl 53REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl
53REPLACE_PERL+= Source/JavaScriptCore/create_hash_table 54REPLACE_PERL+= Source/JavaScriptCore/create_hash_table
54REPLACE_PERL+= Source/WebCore/Scripts/*.pl 55REPLACE_PERL+= Source/WebCore/Scripts/*.pl
55REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pl 56REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pl
56REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pm 57REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pm
57REPLACE_PERL+= Source/WebCore/css/*.pl 58REPLACE_PERL+= Source/WebCore/css/*.pl
58REPLACE_PERL+= Source/WebCore/dom/*.pl 59REPLACE_PERL+= Source/WebCore/dom/*.pl
59REPLACE_PERL+= Source/WebCore/make-hash-tools.pl 60REPLACE_PERL+= Source/WebCore/make-hash-tools.pl
60REPLACE_PERL+= Source/WebInspectorUI/Scripts/*.pl 61REPLACE_PERL+= Source/WebInspectorUI/Scripts/*.pl