CVS commit: pkgsrc/www/otter-browser

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 25 21:07:19 UTC 2025

Modified Files:
        pkgsrc/www/otter-browser: Makefile
Added Files:
        pkgsrc/www/otter-browser: options.mk

Log Message:
www/otter-browser: Restore qtwebkit as an option.

For now it is selected by default on 32-bit platforms, based on my
fuzzy memory of hearsay reports that qtwebengine doesn't support
them; feel free to adjust this according to reality.

Tested on netbsd-9/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/www/otter-browser/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/otter-browser/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/otter-browser/Makefile
diff -u pkgsrc/www/otter-browser/Makefile:1.69 pkgsrc/www/otter-browser/Makefile:1.70
--- pkgsrc/www/otter-browser/Makefile:1.69      Thu Nov 14 22:22:09 2024
+++ pkgsrc/www/otter-browser/Makefile   Sat Jan 25 21:07:19 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2024/11/14 22:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2025/01/25 21:07:19 riastradh Exp $
 
 DISTNAME=      otter-browser-1.0.03
-PKGREVISION=   17
+PKGREVISION=   18
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OtterBrowser/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -13,8 +13,7 @@ LICENSE=      gnu-gpl-v3
 
 USE_LANGUAGES= c c++
 
-CMAKE_CONFIGURE_ARGS+= -DENABLE_QTWEBENGINE=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_QTWEBKIT=OFF
+.include "options.mk"
 
 NOT_PAX_MPROTECT_SAFE+=        bin/otter-browser
 
@@ -32,6 +31,5 @@ SUBST_SED.fix-paths=          -e 's,"/usr/local,
 .include "../../x11/qt5-qtlocation/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtwebchannel/buildlink3.mk"
-.include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/www/otter-browser/options.mk
diff -u /dev/null pkgsrc/www/otter-browser/options.mk:1.1
--- /dev/null   Sat Jan 25 21:07:19 2025
+++ pkgsrc/www/otter-browser/options.mk Sat Jan 25 21:07:19 2025
@@ -0,0 +1,32 @@
+#      $NetBSD: options.mk,v 1.1 2025/01/25 21:07:19 riastradh Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.otter-browser
+PKG_OPTIONS_REQUIRED_GROUPS=   webkit
+PKG_OPTIONS_GROUP.webkit=      qtwebkit qtwebengine
+
+.include "../../mk/bsd.prefs.mk"
+
+.for p in ${LP64PLATFORMS}
+.  if ${MACHINE_PLATFORM:M$p}
+PKG_SUGGESTED_OPTIONS+=                qtwebengine
+.  endif
+.endfor
+.if empty(PKG_SUGGESTED_OPTIONS:Mqtwebengine)
+PKG_SUGGESTED_OPTIONS+=                qtwebkit
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if ${PKG_OPTIONS:Mqtwebengine}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QTWEBENGINE=ON
+.  include "../../x11/qt5-qtwebengine/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QTWEBENGINE=OFF
+.endif
+
+.if ${PKG_OPTIONS:Mqtwebkit}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QTWEBKIT=ON
+.  include "../../x11/qt5-qtwebkit/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+= -DENABLE_QTWEBKIT=OFF
+.endif