cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/mozilla/mozilla.port.mk: assorted tweaks for firefox 90

Browse Source 
- bump dependency to nss 3.68/nspr 4.32, those will be required for
  91ESR
- define MOZILLA_MAJOR_VERSION and only add the Gtk+2 dependency for
gecko < 90, as upstream finally dropped the dependency (#1377445)
- shuffle WANTLIB around
This commit is contained in:
landry 2021-07-13 15:24:00 +00:00
parent 9ddfa8b937
commit 936672405d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/mozilla/mozilla.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: mozilla.port.mk,v 1.139 2021/06/01 13:14:06 landry Exp $
# $OpenBSD: mozilla.port.mk,v 1.140 2021/07/13 15:24:00 landry Exp $
# ppc: firefox-esr/thunderbird xpcshell segfaults during startup compilation
# ppc: seamonkey/firefox - failure to link for atomic ops on 64 bits
@ -27,6 +27,7 @@ MAINTAINER ?= Landry Breuil <landry@openbsd.org>
MOZILLA_DIST ?= ${MOZILLA_PROJECT}
MOZILLA_DIST_VERSION ?= ${MOZILLA_VERSION:C/rc.//}
MOZILLA_MAJOR_VERSION =${MOZILLA_VERSION:C/\..*//}
.if ${MOZILLA_VERSION:M*rc?}
MASTER_SITES ?= https://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_DIST}/candidates/${MOZILLA_DIST_VERSION}-candidates/build${MOZILLA_VERSION:C/.*(.)/\1/}/source/
@ -61,13 +62,13 @@ MODMOZ_BUILD_DEPENDS = devel/autoconf/2.13 \
archivers/zip>=2.3
.if !defined(MOZILLA_USE_BUNDLED_NSS)
MODMOZ_LIB_DEPENDS += security/nss>=3.64
MODMOZ_LIB_DEPENDS += security/nss>=3.68
MODMOZ_WANTLIB += nss3 nssutil3 smime3 ssl3
CONFIGURE_ARGS += --with-system-nss
.endif
.if !defined(MOZILLA_USE_BUNDLED_NSPR)
MODMOZ_LIB_DEPENDS += devel/nspr>=4.30
MODMOZ_LIB_DEPENDS += devel/nspr>=4.32
MODMOZ_WANTLIB += nspr4 plc4 plds4
CONFIGURE_ARGS += --with-system-nspr
.endif
@ -93,7 +94,7 @@ MODMOZ_BUILD_DEPENDS += lang/rust
# stylo build needs LLVM
MODMOZ_BUILD_DEPENDS += devel/llvm
MODMOZ_WANTLIB += X11 Xext Xrender Xt atk-1.0 c cairo \
MODMOZ_WANTLIB += X11 Xcomposite Xdamage Xext Xfixes Xrender Xt atk-1.0 c cairo \
fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
gobject-2.0 gthread-2.0 m \
pango-1.0 pangocairo-1.0 pangoft2-1.0 \
@ -130,8 +131,10 @@ CONFIGURE_ARGS += --enable-default-toolkit=cairo-gtk3
MODMOZ_LIB_DEPENDS += x11/gtk+3
MODMOZ_WANTLIB += cairo-gobject gdk-3 gtk-3
# for NPAPI support (see #1377445 for the dependency removal)
.if ${MOZILLA_MAJOR_VERSION} < 90
MODMOZ_LIB_DEPENDS += x11/gtk+2
MODMOZ_WANTLIB += Xcomposite Xdamage Xfixes gdk-x11-2.0 gtk-x11-2.0
MODMOZ_WANTLIB += gdk-x11-2.0 gtk-x11-2.0
.endif
PORTHOME = ${WRKSRC}