svn commit: r505827 - in head: Mk www/firefox
Jan Beich
jbeich at FreeBSD.org
Thu Jul 4 11:39:51 UTC 2019
Author: jbeich
Date: Thu Jul 4 11:39:49 2019
New Revision: 505827
URL: https://svnweb.freebsd.org/changeset/ports/505827
Log:
gecko: drop GTK2 and RUST options after r505740 and r505753
Modified:
head/Mk/bsd.gecko.mk (contents, props changed)
head/www/firefox/Makefile.options (contents, props changed)
Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk Thu Jul 4 11:18:42 2019 (r505826)
+++ head/Mk/bsd.gecko.mk Thu Jul 4 11:39:49 2019 (r505827)
@@ -64,7 +64,7 @@ Gecko_Pre_Include= bsd.gecko.mk
# CONFIGURE_ARGS. The default is omni.
#
# MOZ_TOOLKIT A variable for the --enable-default-toolkit= in
-# CONFIGURE_ARGS. The default is cairo-gtk2.
+# CONFIGURE_ARGS. The default is cairo-gtk3.
#
# PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can be
# set to a generic mozconfig included with the port
@@ -81,10 +81,11 @@ MOZILLA_VER?= ${PORTVERSION}
MOZILLA_BIN?= ${PORTNAME}-bin
MOZILLA_EXEC_NAME?=${MOZILLA}
MOZ_RPATH?= ${MOZILLA}
-USES+= compiler:c++17-lang cpe gl gmake iconv localbase perl5 pkgconfig \
+USES+= compiler:c++17-lang cpe gl gmake gnome iconv localbase perl5 pkgconfig \
python:2.7,build desktop-file-utils
CPE_VENDOR?=mozilla
USE_GL= gl
+USE_GNOME= cairo gdkpixbuf2 gtk20 gtk30
USE_PERL5= build
USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrender xt
HAS_CONFIGURE= yes
@@ -92,6 +93,8 @@ CONFIGURE_OUTSOURCE= yes
BUNDLE_LIBS= yes
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.34:lang/${RUST_DEFAULT}
+
.if ${MOZILLA_VER:R:R} >= 56
BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
MOZ_EXPORT+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
@@ -244,20 +247,10 @@ MOZ_OPTIONS+= --with-system-zlib \
MOZ_EXPORT+= MOZ_GOOGLE_LOCATION_SERVICE_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8
MOZ_EXPORT+= MOZ_GOOGLE_SAFEBROWSING_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8
-.if ${PORT_OPTIONS:MGTK2}
-MOZ_TOOLKIT= cairo-gtk2
-.elif ${PORT_OPTIONS:MWAYLAND}
+.if ${PORT_OPTIONS:MWAYLAND}
MOZ_TOOLKIT= cairo-gtk3-wayland
.endif
-USES+= gnome
-.if ${MOZ_TOOLKIT:Mcairo-gtk3*}
-BUILD_DEPENDS+= gtk3>=3.14.6:x11-toolkits/gtk30
-USE_GNOME+= gdkpixbuf2 gtk20 gtk30
-.else # gtk2, cairo-gtk2
-USE_GNOME+= gdkpixbuf2 gtk20
-.endif
-
.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
CFLAGS+= -O3
MOZ_EXPORT+= MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}"
@@ -345,15 +338,6 @@ post-patch-SNDIO-on:
${ECHO_CMD} "OS_LIBS += ['sndio']" >> \
${MOZSRC}/media/webrtc/signaling/test/common.build; \
fi
-.endif
-
-.if ${PORT_OPTIONS:MRUST} || ${MOZILLA_VER:R:R} >= 54
-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.34:lang/${RUST_DEFAULT}
-. if ${MOZILLA_VER:R:R} < 54
-MOZ_OPTIONS+= --enable-rust
-. endif
-.else
-MOZ_OPTIONS+= --disable-rust
.endif
.if ${PORT_OPTIONS:MDEBUG}
Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options Thu Jul 4 11:18:42 2019 (r505826)
+++ head/www/firefox/Makefile.options Thu Jul 4 11:39:49 2019 (r505827)
@@ -15,4 +15,3 @@ JACK_IMPLIES= ALSA
CANBERRA_DESC?= Sound theme alerts
LIBPROXY_DESC?= Proxy support via libproxy
LIGHTNING_DESC?= Calendar extension
-RUST_DESC?= Build with components written in Rust language
More information about the svn-ports-head
mailing list