CVS commit: pkgsrc/www/arcticfox

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 21 21:42:07 UTC 2024

Modified Files:
        pkgsrc/www/arcticfox: Makefile PLIST

Log Message:
arcticfox: Sync default options with upstream's build scripts

In particular this disables the (new default) gtk3 interface, which is
still buggy.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/www/arcticfox/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/arcticfox/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/arcticfox/Makefile
diff -u pkgsrc/www/arcticfox/Makefile:1.44 pkgsrc/www/arcticfox/Makefile:1.45
--- pkgsrc/www/arcticfox/Makefile:1.44  Thu Mar 21 15:11:51 2024
+++ pkgsrc/www/arcticfox/Makefile       Thu Mar 21 21:42:07 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2024/03/21 15:11:51 nia Exp $
+# $NetBSD: Makefile,v 1.45 2024/03/21 21:42:07 nia Exp $
 
 DISTNAME=      arcticfox-43.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rmottola/}
 GITHUB_PROJECT=        Arctic-Fox
@@ -41,13 +41,12 @@ CONFIGURE_ARGS+=    --enable-release
 CONFIGURE_ARGS+=       --enable-strip
 CONFIGURE_ARGS+=       --with-branding=browser/branding/arcticfox
 
+# gtk3 now supported and default, but gtk2 less buggy
+CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk2
+
 # Necessary for PaX safety on NetBSD.
 CONFIGURE_ARGS+=       --disable-precompiled-startupcache
 
-CONFIGURE_ARGS+=       --enable-system-cairo
-CONFIGURE_ARGS+=       --enable-system-pixman
-CONFIGURE_ARGS+=       --enable-system-hunspell
-CONFIGURE_ARGS+=       --enable-system-ffi
 CONFIGURE_ARGS+=       --with-system-bz2
 # Needs libjpeg-turbo.
 # CONFIGURE_ARGS+=     --with-system-jpeg
@@ -58,6 +57,10 @@ CONFIGURE_ARGS+=     --with-system-libvpx
 CONFIGURE_ARGS+=       --with-system-nss
 CONFIGURE_ARGS+=       --with-system-nspr
 CONFIGURE_ARGS+=       --with-system-zlib
+CONFIGURE_ARGS+=       --enable-system-cairo
+CONFIGURE_ARGS+=       --enable-system-hunspell
+CONFIGURE_ARGS+=       --enable-system-ffi
+CONFIGURE_ARGS+=       --enable-system-pixman
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
 # Without this NetBSD/sparc64 starts, but crashes on some sites
@@ -124,7 +127,6 @@ post-install:
 BUILDLINK_API_DEPENDS.libevent+=       libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
@@ -137,7 +139,6 @@ BUILDLINK_API_DEPENDS.libevent+=    libeven
 .include "../../textproc/hunspell/buildlink3.mk"
 #.include "../../textproc/icu/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 #.include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/www/arcticfox/PLIST
diff -u pkgsrc/www/arcticfox/PLIST:1.10 pkgsrc/www/arcticfox/PLIST:1.11
--- pkgsrc/www/arcticfox/PLIST:1.10     Thu Mar 21 12:47:19 2024
+++ pkgsrc/www/arcticfox/PLIST  Thu Mar 21 21:42:07 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2024/03/21 12:47:19 nia Exp $
+@comment $NetBSD: PLIST,v 1.11 2024/03/21 21:42:07 nia Exp $
 bin/arcticfox
 lib/${PKGNAME}/application.ini
 lib/${PKGNAME}/arcticfox
@@ -17,11 +17,9 @@ lib/${PKGNAME}/defaults/pref/channel-pre
 lib/${PKGNAME}/dependentlibs.list
 lib/${PKGNAME}/dictionaries/en-US.aff
 lib/${PKGNAME}/dictionaries/en-US.dic
-lib/${PKGNAME}/gtk2/libmozgtk.so
 lib/${PKGNAME}/liblgpllibs.so
 lib/${PKGNAME}/libmozavcodec.so
 lib/${PKGNAME}/libmozavutil.so
-lib/${PKGNAME}/libmozgtk.so
 lib/${PKGNAME}/libmozsqlite3.so
 lib/${PKGNAME}/libxul.so
 lib/${PKGNAME}/omni.ja