From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 24 02:29:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 17E24952 for ; Sat, 24 Nov 2012 02:29:37 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 941CB8FC0C for ; Sat, 24 Nov 2012 02:29:35 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id qAO2TS65077800 for ; Sat, 24 Nov 2012 02:29:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id qAO2TNid077086 for freebsd-gecko@freebsd.org; Sat, 24 Nov 2012 02:29:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 24 Nov 2012 02:29:23 GMT Message-Id: <201211240229.qAO2TNid077086@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1100 - in trunk: Mk www/firefox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2012 02:29:37 -0000 Author: jbeich Date: Sat Nov 24 02:29:23 2012 New Revision: 1100 Log: revert r856, it causes too much confusion for kde users Suggested by: flo Modified: trunk/Mk/bsd.gecko.mk trunk/www/firefox/Makefile.options Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Mon Nov 19 21:01:48 2012 (r1099) +++ trunk/Mk/bsd.gecko.mk Sat Nov 24 02:29:23 2012 (r1100) @@ -663,12 +663,10 @@ LIBS+= -Wl,--as-needed,-lcxxrt,--no-as-needed .endif -.if ${PORT_OPTIONS:MQT4} -MOZ_TOOLKIT= cairo-qt -USE_MOZILLA+= -cairo # ports/169343 -.endif - .if ${MOZ_TOOLKIT:Mcairo-qt} +# don't use - transparent backgrounds (bug 521582), +USE_MOZILLA+= -cairo # ports/169343 +USE_DISPLAY=yes # install USE_GNOME+= pango USE_QT4+= moc_build gui network opengl MOZ_OPTIONS+= --with-qtdir= # pkg-config Modified: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Mon Nov 19 21:01:48 2012 (r1099) +++ trunk/www/firefox/Makefile.options Sat Nov 24 02:29:23 2012 (r1100) @@ -2,18 +2,14 @@ OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY \ LOGGING OPTIMIZED_CFLAGS -OPTIONS_DEFAULT+= DBUS GTK2 LOGGING OSS +OPTIONS_DEFAULT+= DBUS LOGGING OSS OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO -OPTIONS_SINGLE+= TOOLKIT -OPTIONS_SINGLE_TOOLKIT= GTK2 QT4 - ENIGMAIL_DESC?= Enigmail extension GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk GNOMEUI_DESC?= libgnomeui support module LIBPROXY_DESC?= Proxy support via libproxy LIGHTNING_DESC?= Calendar extension LOGGING_DESC?= Additional log messages -QT4_DESC?= Qt GUI (EXPERIMENTAL, bug 521582)