From owner-freebsd-gecko@FreeBSD.ORG Sun Jun 10 06:29:24 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C8F9106566B for ; Sun, 10 Jun 2012 06:29:24 +0000 (UTC) (envelope-from denkpadje@gmail.com) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id B4C298FC08 for ; Sun, 10 Jun 2012 06:29:23 +0000 (UTC) Received: by vbmv11 with SMTP id v11so2080880vbm.13 for ; Sat, 09 Jun 2012 23:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=T8kpKTAkXrHpVJDCVYwnm6zgWCIe6J0uh7q48t0p4Dg=; b=HJppXqbNFsEfs57iI3c3oi6kbT3g6Rt90g0eci0s2NNCCh0WLial5YVcFYAVTOsgIb PPNfYD7brFpDGRSE/OX/DYRkaODqhZEMiGiEeuPYAkfTCHprartX9PAb8+tDQzqssBt4 PCz1Ac8WuBoR4zs19W+qWfAgUfUpJZ6TkPpND5o/AVwlhvT9BIcJ6dAFxh+LbBOJZHC9 GXCOR1qmkt5wkg+5TzhcL4nsMw3DHWb12UaQQn4TYK1awW42OpE+jhwchPlMewI+UNcQ 3VFTUOV0L/XNkW9xtFfC6ROwKvDkWVwnNVQ8Oq73dq0W7ZpGNBFRZb0Wov1FSShTuxgf dtKA== MIME-Version: 1.0 Received: by 10.220.240.147 with SMTP id la19mr10021705vcb.47.1339309757623; Sat, 09 Jun 2012 23:29:17 -0700 (PDT) Received: by 10.220.148.195 with HTTP; Sat, 9 Jun 2012 23:29:17 -0700 (PDT) Date: Sun, 10 Jun 2012 08:29:17 +0200 Message-ID: From: Denk Padje To: gecko@FreeBSD.org X-Mailman-Approved-At: Sun, 10 Jun 2012 11:27:03 +0000 Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: FreeBSD Port: libxul-1.9.2.28_1 has vulnerabilities X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jun 2012 06:29:24 -0000 Hi gecko, Could you please update libxul to latest version? Current version has multiple vulnerabilities and I need it for gnash. Thanks. onox From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 11 11:07:22 2012 Return-Path: Delivered-To: freebsd-gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEC351065686 for ; Mon, 11 Jun 2012 11:07:22 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9FAC28FC23 for ; Mon, 11 Jun 2012 11:07:22 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5BB7M9o053290 for ; Mon, 11 Jun 2012 11:07:22 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5BB7MZO053288 for freebsd-gecko@FreeBSD.org; Mon, 11 Jun 2012 11:07:22 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 11 Jun 2012 11:07:22 GMT Message-Id: <201206111107.q5BB7MZO053288@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: freebsd-gecko@FreeBSD.org Cc: Subject: Current problem reports assigned to freebsd-gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2012 11:07:22 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/168574 gecko every time mozilla ports update disables xpi's 1 problem total. From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 11 11:07:46 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2DEF2106567C for ; Mon, 11 Jun 2012 11:07:46 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F25068FC0A for ; Mon, 11 Jun 2012 11:07:45 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5BB7jb2053601 for ; Mon, 11 Jun 2012 11:07:45 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5BB7j0H053599 for gecko@FreeBSD.org; Mon, 11 Jun 2012 11:07:45 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 11 Jun 2012 11:07:45 GMT Message-Id: <201206111107.q5BB7j0H053599@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: gnats set sender to owner-bugmaster@FreeBSD.org using -f From: FreeBSD bugmaster To: gecko@FreeBSD.org Cc: Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2012 11:07:46 -0000 Note: to view an individual PR, use: http://www.freebsd.org/cgi/query-pr.cgi?pr=(number). The following is a listing of current problems submitted by FreeBSD users. These represent problem reports covering all versions including experimental development code and obsolete releases. S Tracker Resp. Description -------------------------------------------------------------------------------- o ports/168898 gecko mail/thunderbird: nsDirPrefs.cpp:378:9: error: case va o ports/168793 gecko www/firefox: /usr/ports/www/firefox/work/mozilla-relea o ports/168718 gecko www/firefox: core dumping or refuse to compile o ports/168637 gecko www/libxul: nsStackWalk.cpp: In function 'nsresult NS_ o ports/168465 gecko www/firefox: HTML5 audio and video doesn't work in FF1 o ports/168369 gecko [PATCH] cannot build www/libxul 1.9.2.28 o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc o ports/167431 gecko www/firefox fails to build if nspr version is < 4.9 o ports/167397 gecko mail/thunderbird-i18n Version 12.0 and freebsd 9.0: ca o ports/167298 gecko mail/thunderbird-i18n and www/firefox-i18n fail to fet f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164919 gecko www/seamonkey fails to build on pre-SSE2 processor o ports/164905 gecko www/seamonkey fails to build with clang [patch] o ports/164687 gecko www/firefox: build fails on check-sync-dirs.py - parti o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/164013 gecko www/firefox: Firefox-9 Icons & xpi-addons from ports o ports/163454 gecko [patch] www/firefox-beta: unbreak with libc++ o ports/162939 gecko www/firefox crashes with Zotero add-on o ports/162075 gecko www/firefox >= 7.0.1_2 bug with respect to pentadactyl o ports/161421 gecko [patch] www/firefox: use libevent2 o ports/160933 gecko Bad port interactions between Mozilla projects o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local o ports/160351 gecko www/libxul installs incorrect mozilla-nss.pc o ports/159831 gecko www/firefox is broken o ports/156335 gecko www/firefox: Repeatable firefox-4.0_1,1 crash f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/150631 gecko www/firefox 3.6.9 does not build if you have previousl o ports/146231 gecko [feature request] [patch] www/firefox: use port libs o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 29 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 11 20:55:41 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 1527F106566B for ; Mon, 11 Jun 2012 20:55:41 +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 A50F88FC12 for ; Mon, 11 Jun 2012 20:55:40 +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 q5BKtdao018655 for ; Mon, 11 Jun 2012 20:55:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5BKtYx4016946 for freebsd-gecko@freebsd.org; Mon, 11 Jun 2012 20:55:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 11 Jun 2012 20:55:34 GMT Message-Id: <201206112055.q5BKtYx4016946@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r747 - in branches/experimental: Mk www/firefox www/firefox-beta www/firefox-esr www/firefox-nightly www/firefox36 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 11 Jun 2012 20:55:41 -0000 Author: jbeich Date: Mon Jun 11 20:55:34 2012 New Revision: 747 Log: reduce redundancy in CFLAGS Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:54:57 2012 (r746) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:55:34 2012 (r747) @@ -676,12 +676,10 @@ PERL=${PERL} .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -MOZ_OPTIONS+= --enable-optimize=${WITH_OPTIMIZE} -CFLAGS:= ${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS} -WITH_OPTIMIZE?= -O2 +CONFIGURE_ENV+= MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}" +MOZ_OPTIONS+= --enable-optimize .else MOZ_OPTIONS+= --disable-optimize -CFLAGS:= ${CFLAGS} ${EXTRA_CFLAGS} .endif .if ${PORT_OPTIONS:MDBUS} Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Mon Jun 11 20:54:57 2012 (r746) +++ branches/experimental/www/firefox-beta/Makefile Mon Jun 11 20:55:34 2012 (r747) @@ -36,7 +36,6 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O2 HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Mon Jun 11 20:54:57 2012 (r746) +++ branches/experimental/www/firefox-esr/Makefile Mon Jun 11 20:55:34 2012 (r747) @@ -37,7 +37,6 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O2 HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Mon Jun 11 20:54:57 2012 (r746) +++ branches/experimental/www/firefox-nightly/Makefile Mon Jun 11 20:55:34 2012 (r747) @@ -41,7 +41,6 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O2 HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Mon Jun 11 20:54:57 2012 (r746) +++ branches/experimental/www/firefox/Makefile Mon Jun 11 20:55:34 2012 (r747) @@ -36,7 +36,6 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O2 HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Mon Jun 11 20:54:57 2012 (r746) +++ branches/experimental/www/firefox36/Makefile Mon Jun 11 20:55:34 2012 (r747) @@ -34,7 +34,6 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O2 HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 11 20:56:06 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F399D106566B for ; Mon, 11 Jun 2012 20:56:05 +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 7FB208FC08 for ; Mon, 11 Jun 2012 20:56:05 +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 q5BKu4s0020403 for ; Mon, 11 Jun 2012 20:56:04 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5BKtx3L019841 for freebsd-gecko@freebsd.org; Mon, 11 Jun 2012 20:55:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 11 Jun 2012 20:55:59 GMT Message-Id: <201206112055.q5BKtx3L019841@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r748 - in branches/experimental: Mk www/kompozer X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 11 Jun 2012 20:56:06 -0000 Author: jbeich Date: Mon Jun 11 20:55:59 2012 New Revision: 748 Log: enable system hunspell, excluding kompozer Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/kompozer/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:55:34 2012 (r747) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:55:59 2012 (r748) @@ -574,7 +574,7 @@ .endfor # Standard depends -_ALL_DEPENDS= cairo dbm event ffi jpeg nspr nss png sqlite vpx zip +_ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo @@ -588,6 +588,9 @@ ffi_LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi ffi_MOZ_OPTIONS= --enable-system-ffi +hunspell_LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell +hunspell_MOZ_OPTIONS= --enable-system-hunspell + jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Mon Jun 11 20:55:34 2012 (r747) +++ branches/experimental/www/kompozer/Makefile Mon Jun 11 20:55:59 2012 (r748) @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/mozilla MAKEFILE= client.mk ALL_TARGET= build_all -USE_MOZILLA= -event -ffi -sqlite -vpx +USE_MOZILLA= -event -ffi -hunspell -sqlite -vpx USE_GECKO_OPTIONS=-dbus MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 11 20:56:21 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB8F71065672 for ; Mon, 11 Jun 2012 20:56:21 +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 3BCC48FC14 for ; Mon, 11 Jun 2012 20:56:21 +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 q5BKuKFw021556 for ; Mon, 11 Jun 2012 20:56:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5BKuFdK021366 for freebsd-gecko@freebsd.org; Mon, 11 Jun 2012 20:56:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 11 Jun 2012 20:56:15 GMT Message-Id: <201206112056.q5BKuFdK021366@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r749 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 11 Jun 2012 20:56:21 -0000 Author: jbeich Date: Mon Jun 11 20:56:15 2012 New Revision: 749 Log: - add more extraction excludes - use modern paths: firefox* and libxul use mozilla-{esr*,release,central-} as WRKSRC - disable nss exclude to not have to remove patches Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:55:59 2012 (r748) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:56:15 2012 (r749) @@ -547,7 +547,7 @@ EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ --exclude */package/* \ - --exclude mozilla/gc/boehm + --exclude mozilla*/gc/boehm MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin @@ -578,40 +578,44 @@ cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo -cairo_EXTRACT_AFTER_ARGS= --exclude mozilla/gfx/cairo +cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo -dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm +dbm_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm event_LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE} +event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent ffi_LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi ffi_MOZ_OPTIONS= --enable-system-ffi +ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi hunspell_LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell hunspell_MOZ_OPTIONS= --enable-system-hunspell jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} -jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg +jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libjpeg nspr_LIB_DEPENDS= nspr4:${PORTSDIR}/devel/nspr nspr_MOZ_OPTIONS= --with-system-nspr nss_LIB_DEPENDS= nss3:${PORTSDIR}/security/nss -nss_EXTRACT_AFTER_ARGS= --exclude mozilla/security/nss nss_MOZ_OPTIONS= --with-system-nss +#nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/nss nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} +png_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libpng sqlite_LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 sqlite_MOZ_OPTIONS= --enable-system-sqlite vpx_LIB_DEPENDS= vpx:${PORTSDIR}/multimedia/libvpx vpx_MOZ_OPTIONS= --with-system-libvpx=${LOCALBASE} +vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx zip_DEPENDS= zip:${PORTSDIR}/archivers/zip From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 11 21:08:30 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 B1C19106564A for ; Mon, 11 Jun 2012 21:08:30 +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 3781B8FC17 for ; Mon, 11 Jun 2012 21:08:30 +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 q5BKt3YK097267 for ; Mon, 11 Jun 2012 20:55:03 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5BKsvMc095821 for freebsd-gecko@freebsd.org; Mon, 11 Jun 2012 20:54:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 11 Jun 2012 20:54:57 GMT Message-Id: <201206112054.q5BKsvMc095821@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r746 - in branches/experimental/www/firefox-nightly: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 11 Jun 2012 21:08:30 -0000 Author: jbeich Date: Mon Jun 11 20:54:57 2012 New Revision: 746 Log: - update Nightly - switch to system nss Modified: branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/distinfo branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in branches/experimental/www/firefox-nightly/files/patch-config_config.mk branches/experimental/www/firefox-nightly/files/patch-configure.in branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/Makefile Mon Jun 11 20:54:57 2012 (r746) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge # -# $FreeBSD: ports/www/firefox/Makefile,v 1.269 2012/06/06 07:55:46 beat Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.271 2012/06/07 06:46:12 beat Exp $ # PORTNAME= firefox @@ -18,6 +18,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ + nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ @@ -30,7 +31,7 @@ USE_PYTHON_BUILD=yes USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -vpx MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} @@ -58,7 +59,7 @@ OPTIONS_DEFINE= PGO PGO_DESC= Enable Profile-Guided Optimization -HGREV= 96037:7e4c2abb9fc9 +HGREV= 96339:b76ec573a6f0 .include Modified: branches/experimental/www/firefox-nightly/distinfo ============================================================================== --- branches/experimental/www/firefox-nightly/distinfo Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/distinfo Mon Jun 11 20:54:57 2012 (r746) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/7e4c2abb9fc9.tar.bz2) = 5f7e8662ca72b9d71737d23dd50371c6d8beac952cab40ad6c068470f4b3407f -SIZE (firefox-nightly/7e4c2abb9fc9.tar.bz2) = 81757412 +SHA256 (firefox-nightly/b76ec573a6f0.tar.bz2) = d174687137545e6063db16a514650c683b7c6eafccdebeb0dc40dd5fb530a5bc +SIZE (firefox-nightly/b76ec573a6f0.tar.bz2) = 82265804 Modified: branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in Mon Jun 11 20:54:57 2012 (r746) @@ -22,3 +22,22 @@ #else @BINPATH@/mozsqlt3@DLL_SUFFIX@ #endif +@@ -581,16 +585,18 @@ + ; NSS libraries are signed in the staging directory, + ; meaning their .chk files are created there directly. + ; ++#ifndef MOZ_NATIVE_NSS + @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@ + #ifndef NSS_DISABLE_DBM + @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@ + #endif + @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ ++#endif + @BINPATH@/chrome/pippki@JAREXT@ + @BINPATH@/chrome/pippki.manifest + @BINPATH@/components/pipboot.xpt Modified: branches/experimental/www/firefox-nightly/files/patch-config_config.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-config_config.mk Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/files/patch-config_config.mk Mon Jun 11 20:54:57 2012 (r746) @@ -1,10 +1,10 @@ --- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 +++ config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I%%LOCALBASE%%/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ +@@ -376,6 +376,7 @@ INCLUDES = \ + -I$(DIST)/include \ + $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \ $(OS_INCLUDES) \ - $(NULL) ++ -I%%LOCALBASE%%/include \ + $(NULL) + + include $(topsrcdir)/config/static-checking-config.mk Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-configure.in Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/files/patch-configure.in Mon Jun 11 20:54:57 2012 (r746) @@ -28,6 +28,17 @@ dnl system libevent Support dnl ======================================================== +@@ -4263,6 +4270,10 @@ else + fi + fi + ++if test -n "$MOZ_NATIVE_NSS"; then ++ AC_DEFINE(MOZ_NATIVE_NSS) ++fi ++ + dnl ====================== + dnl Detect yasm + dnl ====================== @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Modified: branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Mon Jun 11 20:54:57 2012 (r746) @@ -1,10 +1,10 @@ --- js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 +++ js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I%%LOCALBASE%%/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ +@@ -376,6 +376,7 @@ INCLUDES = \ + -I$(DIST)/include \ + $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \ $(OS_INCLUDES) \ - $(NULL) ++ -I%%LOCALBAS%%/include \ + $(NULL) + + include $(topsrcdir)/config/static-checking-config.mk From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 12 18:43:09 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 DD0B5106566C for ; Tue, 12 Jun 2012 18:43:09 +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 7A7438FC0A for ; Tue, 12 Jun 2012 18:43:09 +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 q5CIh8KX054184 for ; Tue, 12 Jun 2012 18:43:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5CIh3rW051946 for freebsd-gecko@freebsd.org; Tue, 12 Jun 2012 18:43:03 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 12 Jun 2012 18:43:03 GMT Message-Id: <201206121843.q5CIh3rW051946@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r750 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-beta www/firefox-esr www/firefox-nightly www/firefox36 www/libxul www/seamonkey www/seamonkey-beta X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 12 Jun 2012 18:43:10 -0000 Author: jbeich Date: Tue Jun 12 18:43:03 2012 New Revision: 750 Log: unbreak building out of source tree, e.g. CONFIGURE_SCRIPT= ../configure MOZ_OBJDIR= ${WRKSRC}/obj-portbld CONFIGURE_WRKSRC= ${MOZ_OBJDIR} BUILD_WRKSRC= ${MOZ_OBJDIR} INSTALL_WRKSRC= ${MOZ_OBJDIR} pre-configure: ${MKDIR} ${MOZ_OBJDIR} Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/Mk/bsd.gecko.mk Tue Jun 12 18:43:03 2012 (r750) @@ -860,7 +860,7 @@ .if !defined(NOGECKO_PLIST) @${RM} -rf ${FAKEDIR} ${PLIST} ${PLISTD} ${PLISTF} @${TOUCH} -f ${PLIST} ${PLISTD} ${PLISTF} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ + @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} prefix=${FAKEDIR} ${INSTALL_TARGET} .if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none" ${MV} ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA} Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -22,7 +22,7 @@ CONFLICTS_BUILD= spidermonkey-* -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= thunderbird-10.* USE_MOZILLA= -nss -dbm -vpx Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -22,7 +22,7 @@ CONFLICTS_BUILD= spidermonkey-* -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env LATEST_LINK= thunderbird-esr USE_GECKO= gecko CONFLICTS= thunderbird-1[1-9].* Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/mail/thunderbird/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -22,7 +22,7 @@ CONFLICTS_BUILD= spidermonkey-* -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= thunderbird-10.* USE_MOZILLA= -nss -dbm -vpx Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/mail/thunderbird3/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -18,7 +18,7 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr DEPRECATED= will be unsupported by when Thunderbird 12 is release, migrate to mail/thunderbird now -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env LATEST_LINK= thunderbird3 USE_GECKO= gecko USE_MOZILLA= -nss -dbm -event -ffi -vpx Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/www/firefox-beta/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -24,7 +24,7 @@ CONFLICTS_BUILD= spidermonkey-* -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/www/firefox-esr/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -24,7 +24,7 @@ CONFLICTS_BUILD= spidermonkey-* -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env LATEST_LINK= firefox-esr USE_GECKO= gecko CONFLICTS= firefox-1[1-9].* Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/www/firefox-nightly/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -27,7 +27,7 @@ CONFLICTS_BUILD= spidermonkey-* -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=yes USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/www/firefox/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -24,7 +24,7 @@ CONFLICTS_BUILD= spidermonkey-* -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/www/firefox36/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr DEPRECATED= will be unsupported by when Firefox 12 is release, migrate to www/firefox now -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env LATEST_LINK= firefox36 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/www/libxul/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/mozilla-release CONFLICTS= mozilla-[0-9]* -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env WANT_GNOME= yes WANT_PERL= yes ALL_TARGET= default Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/www/seamonkey-beta/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -19,7 +19,7 @@ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_BZIP2= yes USE_GMAKE= yes Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Jun 11 20:56:15 2012 (r749) +++ branches/experimental/www/seamonkey/Makefile Tue Jun 12 18:43:03 2012 (r750) @@ -19,7 +19,7 @@ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_BZIP2= yes USE_GMAKE= yes From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 12 22:29:30 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D41A1106564A; Tue, 12 Jun 2012 22:29:30 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2D49E8FC19; Tue, 12 Jun 2012 22:29:30 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5CMTUCJ089000; Tue, 12 Jun 2012 22:29:30 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5CMTUxw088996; Tue, 12 Jun 2012 22:29:30 GMT (envelope-from edwin) Date: Tue, 12 Jun 2012 22:29:30 GMT Message-Id: <201206122229.q5CMTUxw088996@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/168978: mail/thunderbird: /base/nsStackWalk.cpp:1196:29: error: use of undeclared identifier '_Unwind_Backtrace' _Unwind_Reason_Code t = _Unwind_Backtrace(unwind_callback, &info); X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jun 2012 22:29:31 -0000 Synopsis: mail/thunderbird: /base/nsStackWalk.cpp:1196:29: error: use of undeclared identifier '_Unwind_Backtrace' _Unwind_Reason_Code t = _Unwind_Backtrace(unwind_callback, &info); Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Tue Jun 12 22:29:29 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=168978 From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 13 00:42:28 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1ED741065670 for ; Wed, 13 Jun 2012 00:42:28 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from hammer.pct.niksun.com (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D6BD48FC0A for ; Wed, 13 Jun 2012 00:42:27 +0000 (UTC) Message-ID: <4FD7E1F3.1010304@FreeBSD.org> Date: Tue, 12 Jun 2012 20:42:27 -0400 From: Jung-uk Kim User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:13.0) Gecko/20120612 Thunderbird/13.0 MIME-Version: 1.0 To: gecko@FreeBSD.org X-Enigmail-Version: 1.4.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: Subject: [PATCH] Build Thunderbird 13 with Clang X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2012 00:42:28 -0000 I was annoyed by GCC46 dependency, so I fixed TB13 build with Clang. :-) http://people.freebsd.org/~jkim/thunderbird13-clang.diff patch-bugzilla-711895 - Port of Bug 711895 to Thunderbird. https://bugzilla.mozilla.org/show_bug.cgi?id=711895 http://hg.mozilla.org/mozilla-central/rev/f64f62213f61 patch-bugzilla-724700 - Upstream patch for Bug 724700. https://bugzilla.mozilla.org/show_bug.cgi?id=724700 http://hg.mozilla.org/comm-central/rev/a292638503b6 patch-bugzilla-734080 - Upstream patch for Bug 734080. https://bugzilla.mozilla.org/show_bug.cgi?id=734080 http://hg.mozilla.org/comm-central/rev/247aa759c1ce http://hg.mozilla.org/comm-central/rev/134579274546 patch-configure.in - Remove unnecessary hunks and reduce patch size. - (Minimal) Port of Bug 727145 to Thunderbird. https://bugzilla.mozilla.org/show_bug.cgi?id=727145 https://hg.mozilla.org/mozilla-central/rev/2046a1f46d40 patch-mailnews-addrbook-src-nsDirPrefs.cpp patch-mailnews-compose-src-nsSmtpProtocol.cpp - Work around "case value evaluates to N, which cannot be narrowed to type foo" errors. Cheers, Jung-uk Kim From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 13 19:24:38 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 6D6F6106570C for ; Wed, 13 Jun 2012 19:24:38 +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 D30098FC12 for ; Wed, 13 Jun 2012 19:24:37 +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 q5DJOV18086821 for ; Wed, 13 Jun 2012 19:24:31 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5DJOQIG086272 for freebsd-gecko@freebsd.org; Wed, 13 Jun 2012 19:24:26 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 13 Jun 2012 19:24:26 GMT Message-Id: <201206131924.q5DJOQIG086272@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r751 - in branches/experimental/www/seamonkey-beta: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 13 Jun 2012 19:24:38 -0000 Author: jbeich Date: Wed Jun 13 19:24:25 2012 New Revision: 751 Log: move ycbcr patch to correct location Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in - copied unchanged from r750, branches/experimental/www/seamonkey-beta/patch-mozilla-gfx-ycbcr-Makefile.in Deleted: branches/experimental/www/seamonkey-beta/patch-mozilla-gfx-ycbcr-Makefile.in Copied: branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in (from r750, branches/experimental/www/seamonkey-beta/patch-mozilla-gfx-ycbcr-Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-gfx-ycbcr-Makefile.in Wed Jun 13 19:24:25 2012 (r751, copy of r750, branches/experimental/www/seamonkey-beta/patch-mozilla-gfx-ycbcr-Makefile.in) @@ -0,0 +1,21 @@ +--- mozilla/gfx/ycbcr/Makefile.in~ ++++ mozilla/gfx/ycbcr/Makefile.in +@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux) + CPPSRCS += yuv_row_posix.cpp \ + $(NULL) + else ++ifeq ($(OS_ARCH),FreeBSD) ++CPPSRCS += yuv_row_posix.cpp \ ++ $(NULL) ++else + ifeq ($(OS_ARCH),SunOS) + CPPSRCS += yuv_row_posix.cpp \ + $(NULL) +@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \ + $(NULL) + endif # Darwin + endif # SunOS ++endif # FreeBSD + endif # linux + endif # windows + \ No newline at end of file Deleted: branches/experimental/www/seamonkey-beta/patch-mozilla-gfx-ycbcr-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/patch-mozilla-gfx-ycbcr-Makefile.in Wed Jun 13 19:24:25 2012 (r750) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,21 +0,0 @@ ---- mozilla/gfx/ycbcr/Makefile.in~ -+++ mozilla/gfx/ycbcr/Makefile.in -@@ -58,6 +58,10 @@ ifeq ($(OS_ARCH),Linux) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) - else -+ifeq ($(OS_ARCH),FreeBSD) -+CPPSRCS += yuv_row_posix.cpp \ -+ $(NULL) -+else - ifeq ($(OS_ARCH),SunOS) - CPPSRCS += yuv_row_posix.cpp \ - $(NULL) -@@ -70,6 +74,7 @@ CPPSRCS += yuv_row_other.cpp \ - $(NULL) - endif # Darwin - endif # SunOS -+endif # FreeBSD - endif # linux - endif # windows - \ No newline at end of file From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 13 19:24:55 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A0462106568F for ; Wed, 13 Jun 2012 19:24:55 +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 287E88FC18 for ; Wed, 13 Jun 2012 19:24:54 +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 q5DJOsYK088343 for ; Wed, 13 Jun 2012 19:24:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5DJOn12087979 for freebsd-gecko@freebsd.org; Wed, 13 Jun 2012 19:24:49 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 13 Jun 2012 19:24:49 GMT Message-Id: <201206131924.q5DJOn12087979@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r752 - branches/experimental/www/firefox-nightly/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 13 Jun 2012 19:24:55 -0000 Author: jbeich Date: Wed Jun 13 19:24:48 2012 New Revision: 752 Log: typo Modified: branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Modified: branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Wed Jun 13 19:24:25 2012 (r751) +++ branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Wed Jun 13 19:24:48 2012 (r752) @@ -4,7 +4,7 @@ -I$(DIST)/include \ $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \ $(OS_INCLUDES) \ -+ -I%%LOCALBAS%%/include \ ++ -I%%LOCALBASE%%/include \ $(NULL) include $(topsrcdir)/config/static-checking-config.mk From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 13 19:40:46 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BB84106566C for ; Wed, 13 Jun 2012 19:40:46 +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 A75C18FC0A for ; Wed, 13 Jun 2012 19:40:45 +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 q5DJeijR022005 for ; Wed, 13 Jun 2012 19:40:44 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5DJedZx019948 for freebsd-gecko@freebsd.org; Wed, 13 Jun 2012 19:40:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 13 Jun 2012 19:40:39 GMT Message-Id: <201206131940.q5DJedZx019948@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r753 - in branches/experimental: mail/thunderbird-beta/files mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-beta/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/firefox36/files www/libxul/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 13 Jun 2012 19:40:46 -0000 Author: jbeich Date: Wed Jun 13 19:40:39 2012 New Revision: 753 Log: remove unused clang-specific patch, it's never tested Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h branches/experimental/mail/thunderbird/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h branches/experimental/www/firefox-beta/files/patch-media-libsydneyaudio-include-sydney_audio.h branches/experimental/www/firefox-esr/files/patch-media-libsydneyaudio-include-sydney_audio.h branches/experimental/www/firefox-nightly/files/patch-media-libsydneyaudio-include-sydney_audio.h branches/experimental/www/firefox/files/patch-media-libsydneyaudio-include-sydney_audio.h branches/experimental/www/firefox36/files/patch-media-libsydneyaudio-include-sydney_audio.h branches/experimental/www/libxul/files/patch-media-libsydneyaudio-include-sydney_audio.h Deleted: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ mozilla/media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ mozilla/media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ mozilla/media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/mail/thunderbird3/files/patch-mozilla-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ mozilla/media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/www/firefox-beta/files/patch-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/www/firefox-esr/files/patch-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/www/firefox-nightly/files/patch-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/www/firefox/files/patch-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/www/firefox/files/patch-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/www/firefox36/files/patch-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/www/firefox36/files/patch-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else Deleted: branches/experimental/www/libxul/files/patch-media-libsydneyaudio-include-sydney_audio.h ============================================================================== --- branches/experimental/www/libxul/files/patch-media-libsydneyaudio-include-sydney_audio.h Wed Jun 13 19:40:39 2012 (r752) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 13 23:42:21 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C75D106564A for ; Wed, 13 Jun 2012 23:42:21 +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 A90AA8FC1D for ; Wed, 13 Jun 2012 23:42:20 +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 q5DNgJpE097070 for ; Wed, 13 Jun 2012 23:42:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5DNgEpR096391 for freebsd-gecko@freebsd.org; Wed, 13 Jun 2012 23:42:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 13 Jun 2012 23:42:14 GMT Message-Id: <201206132342.q5DNgEpR096391@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r754 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 13 Jun 2012 23:42:21 -0000 Author: jbeich Date: Wed Jun 13 23:42:13 2012 New Revision: 754 Log: --with-gssapi obsolete since 2005/08/19 (bug#280792) Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Jun 13 19:40:39 2012 (r753) +++ branches/experimental/Mk/bsd.gecko.mk Wed Jun 13 23:42:13 2012 (r754) @@ -528,7 +528,6 @@ PLISTF?= ${WRKDIR}/plist_files MASTER_DIR?= ${.CURDIR}/../../www/seamonkey -KRB5_HOME?= /usr MOZ_PIS_DIR?= lib/${MOZILLA}/init.d ESD_LIB?= libesd.so.2 @@ -661,7 +660,6 @@ .endif # others MOZ_OPTIONS+= --with-system-zlib=/usr \ - --with-gssapi=${KRB5_HOME} \ --disable-auto-deps \ --disable-debug-symbols \ --enable-chrome-format=jar \ @@ -737,7 +735,6 @@ -e 's|@LOCALBASE@|${LOCALBASE}|g' \ -e 's|@FAKEDIR@|${FAKEDIR}|g' \ -e 's|@PERL@|${PERL5}|g' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|g' \ -e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g' \ -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%CFLAGS%%|${CFLAGS}|g' \ @@ -746,7 +743,6 @@ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ -e 's|%%FAKEDIR%%|${FAKEDIR}|g' \ -e 's|%%PERL%%|${PERL5}|g' \ - -e 's|%%KRB5_HOME%%|${KRB5_HOME}|g' \ -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|g' \ -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 13 23:43:13 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 97E351065670 for ; Wed, 13 Jun 2012 23:43:13 +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 3476E8FC0A for ; Wed, 13 Jun 2012 23:43:13 +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 q5DNhC0e099737 for ; Wed, 13 Jun 2012 23:43:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5DNh7RT098084 for freebsd-gecko@freebsd.org; Wed, 13 Jun 2012 23:43:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 13 Jun 2012 23:43:07 GMT Message-Id: <201206132343.q5DNh7RT098084@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r755 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-esr mail/thunderbird3 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 13 Jun 2012 23:43:13 -0000 Author: jbeich Date: Wed Jun 13 23:43:06 2012 New Revision: 755 Log: --enable-image-decoders obsolete since 2010/08/22 (bug#513681) Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Jun 13 23:42:13 2012 (r754) +++ branches/experimental/Mk/bsd.gecko.mk Wed Jun 13 23:43:06 2012 (r755) @@ -489,8 +489,6 @@ # # MOZ_EXTENSIONS A list of extensions to build # -# MOZ_GRAPHICS A list of image decoders to build -# # MOZ_PROTOCOLS A list of protocols to build (http, ftp, etc.) # # PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can be @@ -648,11 +646,6 @@ .else MOZ_OPTIONS+= --enable-extensions=${MOZ_EXTENSIONS} .endif -.if !defined(MOZ_GRAPHICS) -MOZ_OPTIONS+= --enable-image-decoders=default -.else -MOZ_OPTIONS+= --enable-image-decoders=${MOZ_GRAPHICS} -.endif .if !defined(MOZ_PROTOCOLS) MOZ_OPTIONS+= --enable-necko-protocols=default .else Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Wed Jun 13 23:42:13 2012 (r754) +++ branches/experimental/mail/thunderbird-beta/Makefile Wed Jun 13 23:43:06 2012 (r755) @@ -39,7 +39,6 @@ USE_GL= gl MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket -MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Wed Jun 13 23:42:13 2012 (r754) +++ branches/experimental/mail/thunderbird-esr/Makefile Wed Jun 13 23:43:06 2012 (r755) @@ -40,7 +40,6 @@ USE_GL= gl MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket -MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Wed Jun 13 23:42:13 2012 (r754) +++ branches/experimental/mail/thunderbird/Makefile Wed Jun 13 23:43:06 2012 (r755) @@ -39,7 +39,6 @@ USE_GL= gl MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket -MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Wed Jun 13 23:42:13 2012 (r754) +++ branches/experimental/mail/thunderbird3/Makefile Wed Jun 13 23:43:06 2012 (r755) @@ -34,13 +34,13 @@ USE_GMAKE= yes MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data -MOZ_GRAPHICS= default,-xbm MOZILLA_SUFX= 3 MOZILLA= ${PORTNAME}${MOZILLA_SUFX} MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ --enable-application=mail --enable-official-branding \ + --enable-image-decoders=default,-xbm \ --disable-updater --disable-necko-wifi MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 14 06:10:06 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B3AA106564A for ; Thu, 14 Jun 2012 06:10:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id DF7DB8FC14 for ; Thu, 14 Jun 2012 06:10:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5E6A5lh036717 for ; Thu, 14 Jun 2012 06:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5E6A5vu036711; Thu, 14 Jun 2012 06:10:05 GMT (envelope-from gnats) Date: Thu, 14 Jun 2012 06:10:05 GMT Message-Id: <201206140610.q5E6A5vu036711@freefall.freebsd.org> To: gecko@FreeBSD.org From: "O. Hartmann" Cc: Subject: ports/168978: mail/thunderbird: /base/nsStackWalk.cpp:1196:29: error: use of undeclared identifier '_Unwind_Backtrace' _Unwind_Reason_Code t = _Unwind_Backtrace(unwind_callback, &info); X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "O. Hartmann" List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2012 06:10:06 -0000 The following reply was made to PR ports/168978; it has been noted by GNATS. From: "O. Hartmann" To: bug-followup@FreeBSD.org, ohartman@zedat.fu-berlin.de Cc: Subject: ports/168978: mail/thunderbird: /base/nsStackWalk.cpp:1196:29: error: use of undeclared identifier '_Unwind_Backtrace' _Unwind_Reason_Code t = _Unwind_Backtrace(unwind_callback, &info); Date: Thu, 14 Jun 2012 08:07:02 +0200 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig8A624B3E9455C7C192A1D505 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Deleting port devel/libunwind by force and subsequently trying to recompile/update port www/firefox ends up in the following error message. In /etc/src.conf, I use WITH_LIBCPLUSPLUS=3D YES [...] clang++ -o nsDirPrefs.o -c -I../../../mozilla/dist/stl_wrappers -I../../../mozilla/dist/system_wrappers -include =2E./../../mozilla/config/gcc_hidden.h -DMOZ_LDAP_XPCOM -DMOZ_GLUE_IN_PROGRAM -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES -DMOZ_THUNDERBIRD=3D1 -DOSTYPE=3D\"FreeBSD10\" -DOSARCH=3DFreeBSD -I. -I. -I../../../mozilla/dist/include -I../../../mozilla/dist/include/nsprpub -I/usr/local/include/nspr -I/usr/ports/mail/thunderbird/work/comm-release/mozilla/dist/include/nss -fPIC -I/usr/local/include -fno-rtti -fno-exceptions -Wall -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wcast-align -Wno-invalid-offsetof -Wno-variadic-macros -Werror=3Dreturn-type -pipe -O3 -fno-strict-aliasing= -march=3Dnative -fno-strict-aliasing -std=3Dgnu++0x -pipe -DNDEBUG -DTRIMMED -fno-omit-frame-pointer -I/usr/local/include -DMOZILLA_CLIENT -include ../../../comm-config.h nsDirPrefs.cpp nsDirPrefs.cpp:119:1: warning: delete called on 'DirPrefObserver' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dt= or] NS_IMPL_ISUPPORTS2(DirPrefObserver, nsISupportsWeakReference, nsIObserver= ) ^ =2E./../../mozilla/dist/include/nsISupportsImpl.h:1182:3: note: expanded from macro 'NS_IMPL_ISUPPORTS2' NS_IMPL_RELEASE(_class) \ ^ =2E./../../mozilla/dist/include/nsISupportsImpl.h:471:40: note: expanded from macro 'NS_IMPL_RELEASE' NS_IMPL_RELEASE_WITH_DESTROY(_class, delete (this)) ^ =2E./../../mozilla/dist/include/nsISupportsImpl.h:451:5: note: expanded from macro 'NS_IMPL_RELEASE_WITH_DESTROY' _destroy; \ ^ nsDirPrefs.cpp:404:9: error: case value evaluates to 2147483649, which cannot be narrowed to type 'PRInt32' (aka 'int') [-Wc++11-narrowing] case DIR_POS_DELETE: ^ nsDirPrefs.cpp:96:44: note: expanded from macro 'DIR_POS_DELETE' #define DIR_POS_DELETE 0x80000001 ^ nsDirPrefs.cpp:378:9: error: case value evaluates to 2147483648, which cannot be narrowed to type 'PRInt32' (aka 'int') [-Wc++11-narrowing] case DIR_POS_APPEND: ^ nsDirPrefs.cpp:95:44: note: expanded from macro 'DIR_POS_APPEND' #define DIR_POS_APPEND 0x80000000 ^ 1 warning and 2 errors generated. gmake[6]: *** [nsDirPrefs.o] Error 1 gmake[6]: Leaving directory `/usr/ports/mail/thunderbird/work/comm-release/mailnews/addrbook/src' gmake[5]: *** [src_libs] Error 2 gmake[5]: Leaving directory `/usr/ports/mail/thunderbird/work/comm-release/mailnews/addrbook' gmake[4]: *** [addrbook_libs] Error 2 gmake[4]: *** Waiting for unfinished jobs.... nsMsgSearchNews.cpp clang++ -o nsMsgSearchNews.o -c -I../../../../mozilla/dist/stl_wrappers -I../../../../mozilla/dist/system_wrappers -include =2E./../../../mozilla/config/gcc_hidden.h -DMOZ_GLUE_IN_PROGRAM -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM -DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET -DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES -DMOZ_THUNDERBIRD=3D1 -DOSTYPE=3D\"FreeBSD10\" -DOSARCH=3DFreeBSD -I. -I. -I../../../../mozilla/dist/include -I../../../../mozilla/dist/include/nsprpub -I/usr/local/include/nspr -I/usr/ports/mail/thunderbird/work/comm-release/mozilla/dist/include/nss -fPIC -I/usr/local/include -fno-rtti -fno-exceptions -Wall -Wpointer-arith -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wcast-align -Wno-invalid-offsetof -Wno-variadic-macros -Werror=3Dreturn-type -pipe -O3 -fno-strict-aliasing= -march=3Dnative -fno-strict-aliasing -std=3Dgnu++0x -pipe -DNDEBUG -DTRIMMED -fno-omit-frame-pointer -I/usr/local/include -DMOZILLA_CLIENT -include ../../../../comm-config.h nsMsgSearchNews.cpp rm -f libmsgsearch_s.a /usr/local/bin/python2.7 ../../../../mozilla/config/pythonpath.py -I../../../../mozilla/config =2E./../../../mozilla/config/expandlibs_gen.py nsMsgFilterService.o nsMsgFilterList.o nsMsgFilter.o nsMsgSearchTerm.o nsMsgBodyHandler.o nsMsgLocalSearch.o nsMsgSearchValue.o nsMsgSearchAdapter.o nsMsgSearchSession.o nsMsgImapSearch.o nsMsgSearchNews.o > libmsgsearch_s.a.desc /usr/ports/mail/thunderbird/work/comm-release/mozilla/config/nsinstall -R -m 644 nsMsgTraitService.js nsMsgTraitService.manifest =2E./../../../mozilla/dist/bin/components /usr/local/bin/python2.7 ../../../../mozilla/config/buildlist.py =2E./../../../mozilla/dist/bin/chrome.manifest "manifest components/nsMsgTraitService.manifest" /usr/ports/mail/thunderbird/work/comm-release/mozilla/config/nsinstall -R Bogofilter.sfd DSPAM.sfd POPFile.sfd SpamAssassin.sfd SpamPal.sfd =2E./../../../mozilla/dist/bin/isp gmake[5]: Leaving directory `/usr/ports/mail/thunderbird/work/comm-release/mailnews/base/search/src' gmake[4]: Leaving directory `/usr/ports/mail/thunderbird/work/comm-release/mailnews' gmake[3]: *** [libs_tier_platform] Error 2 gmake[3]: Leaving directory `/usr/ports/mail/thunderbird/work/comm-release/mozilla' gmake[2]: *** [tier_platform] Error 2 gmake[2]: Leaving directory `/usr/ports/mail/thunderbird/work/comm-release/mozilla' gmake[1]: *** [default] Error 2 gmake[1]: Leaving directory `/usr/ports/mail/thunderbird/work/comm-release/mozilla' gmake: *** [default] Error 2 *** [do-build] Error code 1 Stop in /usr/ports/mail/thunderbird. *** [build] Error code 1 Stop in /usr/ports/mail/thunderbird. =3D=3D=3D>>> make failed for mail/thunderbird =3D=3D=3D>>> Aborting update =3D=3D=3D>>> Update for mail/thunderbird failed =3D=3D=3D>>> Aborting update Terminated [...] --------------enig8A624B3E9455C7C192A1D505 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBAgAGBQJP2X+MAAoJEOgBcD7A/5N8oZwH/jFe1Of8j9V9++tjV/sqc8uT JIj1EUPjHr1pPdZARPj1G6pnV7v5x3tbhMkEXQSw4NcjVkTs3uzVIYtBKIcpvdvt k1fnWpAgWVoJ5nZRxBzNXP6nwPwp6HD0dBgHZ5XnAjCka5f1lriVPAkJObLMY8h1 Di6nmRPZs1njeOKb2JOvRii98k/g2JgEMrRQKTZDg1vBif0NlVUkeWyCwgmJI5AY skhTHUQhdxGlyQoL6JVAjpn0H8Q87iG2KhPb6vWMq139AkrNu03s9wfzTNAg9jYX XSjFkDNnNmIfPTXUx94yZEfFQYSa/AoOvYwSYOwz8uZbCcth3did2rGHmozU2h8= =c/D9 -----END PGP SIGNATURE----- --------------enig8A624B3E9455C7C192A1D505-- From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 14 09:58:24 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 EB87F106566C for ; Thu, 14 Jun 2012 09:58:24 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirg.bris.ac.uk (dirg.bris.ac.uk [137.222.10.102]) by mx1.freebsd.org (Postfix) with ESMTP id A419A8FC08 for ; Thu, 14 Jun 2012 09:58:24 +0000 (UTC) Received: from ncsd.bris.ac.uk ([137.222.10.59] helo=ncs.bris.ac.uk) by dirg.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1Sf6ok-0007Zs-HR; Thu, 14 Jun 2012 10:58:18 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncs.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Sf6ok-0007EZ-Bs; Thu, 14 Jun 2012 10:58:18 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5) with ESMTP id q5E9wIra034745; Thu, 14 Jun 2012 10:58:18 +0100 (BST) (envelope-from mexas@bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5/Submit) id q5E9wHW8034741; Thu, 14 Jun 2012 10:58:17 +0100 (BST) (envelope-from mexas@bris.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bris.ac.uk using -f Date: Thu, 14 Jun 2012 10:58:17 +0100 From: Anton Shterenlikht To: Jan Beich Message-ID: <20120614095817.GA34657@mech-cluster241.men.bris.ac.uk> References: <20120601140008.GA94410@mech-cluster241.men.bris.ac.uk> <1SbnYJ-000AlP-5n@internal.tormail.org> <1ScyQv-000Em6-29@internal.tormail.org> <1SdIH0-000L6m-6C@internal.tormail.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1SdIH0-000L6m-6C@internal.tormail.org> User-Agent: Mutt/1.4.2.3i Cc: freebsd-gecko@freebsd.org Subject: Re: building firefox from mozilla-central X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2012 09:58:25 -0000 On Sat, Jun 09, 2012 at 05:48:10AM -0400, Jan Beich wrote: > >> https://svn.redports.org/aoeui/www/firefox-nightly > >> https://redports.org/~aoeui/20120604152547-92302-27595/firefox-nightly-15.0.95639,1.log > >> > >> Building directly from checked out source is a bit harder unless you > >> apply all the patches, reinplace tweaks and options as used by the port. > > > > Thanks, I'll have a look at the patches. > > It's in freebsd-gecko repository now, ignore redports. I've restored > ia64 patch (per r741) that I accidentally deleted in Nightly. Sorry, I missed this in your previous email. Where is the freebsd-gecko repo? I can't find it. Thanks -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423 From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 14 12:20:05 2012 Return-Path: Delivered-To: gecko@hub.freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9084F1065670 for ; Thu, 14 Jun 2012 12:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 743268FC12 for ; Thu, 14 Jun 2012 12:20:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5ECK5La005439 for ; Thu, 14 Jun 2012 12:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5ECK54o005437; Thu, 14 Jun 2012 12:20:05 GMT (envelope-from gnats) Date: Thu, 14 Jun 2012 12:20:05 GMT Message-Id: <201206141220.q5ECK54o005437@freefall.freebsd.org> To: gecko@FreeBSD.org From: Jan Beich Cc: Subject: Re: ports/168978: mail/thunderbird: /base/nsStackWalk.cpp:1196:29: error: use of undeclared identifier '_Unwind_Backtrace' _Unwind_Reason_Code t = _Unwind_Backtrace(unwind_callback, &info); X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jan Beich List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2012 12:20:05 -0000 The following reply was made to PR ports/168978; it has been noted by GNATS. From: Jan Beich To: "O. Hartmann" Cc: bug-followup@FreeBSD.org Subject: Re: ports/168978: mail/thunderbird: /base/nsStackWalk.cpp:1196:29: error: use of undeclared identifier '_Unwind_Backtrace' _Unwind_Reason_Code t = _Unwind_Backtrace(unwind_callback, &info); Date: Thu, 14 Jun 2012 20:11:18 +0800 "O. Hartmann" writes: > Deleting port devel/libunwind by force and subsequently trying to > recompile/update port www/firefox ends up in the following error > message. In /etc/src.conf, I use > > WITH_LIBCPLUSPLUS= YES It's unused unless you build with -stdlib=libc++. http://wiki.freebsd.org/NewC++Stack > > [...] > clang++ -o nsDirPrefs.o -c -I../../../mozilla/dist/stl_wrappers [...] > nsDirPrefs.cpp:404:9: error: case value evaluates to 2147483649, which > cannot be narrowed to type 'PRInt32' (aka 'int') [-Wc++11-narrowing] > case DIR_POS_DELETE: > ^ > nsDirPrefs.cpp:96:44: note: expanded from macro 'DIR_POS_DELETE' > #define DIR_POS_DELETE 0x80000001 > ^ > nsDirPrefs.cpp:378:9: error: case value evaluates to 2147483648, which > cannot be narrowed to type 'PRInt32' (aka 'int') [-Wc++11-narrowing] > case DIR_POS_APPEND: > ^ > nsDirPrefs.cpp:95:44: note: expanded from macro 'DIR_POS_APPEND' > #define DIR_POS_APPEND 0x80000000 > ^ thunderbird is known to be currently broken with clang. http://lists.freebsd.org/pipermail/freebsd-gecko/2012-June/002273.html From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 14 15:05:15 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 92720106566B for ; Thu, 14 Jun 2012 15:05:15 +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 2B1F58FC0A for ; Thu, 14 Jun 2012 15:05:14 +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 q5EF5D5E071626 for ; Thu, 14 Jun 2012 15:05:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5EF58sS070945 for freebsd-gecko@freebsd.org; Thu, 14 Jun 2012 15:05:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 14 Jun 2012 15:05:08 GMT Message-Id: <201206141505.q5EF58sS070945@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r756 - branches/experimental/www/firefox-nightly/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 14 Jun 2012 15:05:15 -0000 Author: jbeich Date: Thu Jun 14 15:05:08 2012 New Revision: 756 Log: remove build fix for bundled nss, it can replaced by objdir build next time system nss is not new enough Deleted: branches/experimental/www/firefox-nightly/files/patch-revert-bug736066 Deleted: branches/experimental/www/firefox-nightly/files/patch-revert-bug736066 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-revert-bug736066 Thu Jun 14 15:05:08 2012 (r755) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,218 +0,0 @@ -changeset: 92705:5bc899138eb4 -user: Mike Hommey -date: Sat Mar 31 09:25:23 2012 +0200 -summary: Bug 736066 - Build NSS object files more like the rest of the tree, and simplify security/manager/Makefile.in. r=ted - -diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in ---- security/manager/Makefile.in -+++ security/manager/Makefile.in -@@ -184,10 +184,9 @@ - DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 - endif - ABS_topsrcdir := $(call core_abspath,$(topsrcdir)) --# Hack to force NSS build system to use "normal" object directories --DEFAULT_GMAKE_FLAGS += BUILD='$(MOZ_BUILD_ROOT)/security/$$(subst $(shell cd $(topsrcdir); pwd)/security/,,$$(CURDIR))' --DEFAULT_GMAKE_FLAGS += BUILD_TREE='$$(BUILD)' OBJDIR='$$(BUILD)' DEPENDENCIES='$$(BUILD)/.deps' SINGLE_SHLIB_DIR='$$(BUILD)' --DEFAULT_GMAKE_FLAGS += SOURCE_XP_DIR=$(ABS_DIST) -+ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT)) -+DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT) -+endif - ifndef MOZ_DEBUG - DEFAULT_GMAKE_FLAGS += BUILD_OPT=1 OPT_CODE_SIZE=1 - endif -@@ -287,6 +286,10 @@ - DEFAULT_GMAKE_FLAGS += DARWIN_DYLIB_VERSIONS="-compatibility_version 1 -current_version 1 $(LDFLAGS)" - endif - -+SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile -+ -+include $(topsrcdir)/config/rules.mk -+ - ifdef MOZ_NSS_PATCH - # If we're applying a patch, we'll copy the NSS source to the objdir - # and build it from there. -@@ -308,81 +311,118 @@ - NSS_SRCDIR = $(topsrcdir) - endif - --NSS_DIRS = --ifndef NSS_DISABLE_DBM --NSS_DIRS += dbm --endif --NSS_DIRS += \ -- nss/lib \ -- nss/cmd/lib \ -- nss/cmd/shlibsign \ -- $(NULL) -- --ifdef ENABLE_TESTS --NSS_DIRS += \ -- nss/cmd/certutil \ -- nss/cmd/pk12util \ -- nss/cmd/modutil \ -- $(NULL) -+dependclean export packages chrome:: -+ $(MAKE) -C boot $@ -+ $(MAKE) -C ssl $@ -+ $(MAKE) -C locales $@ -+ifdef MOZ_XUL -+ $(MAKE) -C pki $@ - endif - --ifndef MOZ_NATIVE_NSS --define build_rules - libs:: -- $$(NSSMAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS) -- --clean clobber clobber_all realclean distclean depend:: -- $$(NSSMAKE) -C $$(NSS_SRCDIR)/security/$(1) $$(DEFAULT_GMAKE_FLAGS) clean --endef --$(foreach dir,$(NSS_DIRS),$(eval $(call build_rules,$(dir)))) -- --NSS_LIBS = \ -- $(LOADABLE_ROOT_MODULE) \ -- $(SOFTOKEN3_LIB) \ -- $(NSSDBM3_LIB) \ -- $(NSS3_LIB) \ -- $(NSSUTIL3_LIB) \ -- $(SSL3_LIB) \ -- $(SMIME3_LIB) \ -- $(FREEBL_LIB) \ -- $(FREEBL_32INT_LIB) \ -- $(FREEBL_32FPU_LIB) \ -- $(FREEBL_32INT64_LIB) \ -- $(FREEBL_64INT_LIB) \ -- $(FREEBL_64FPU_LIB) \ -- $(NULL) -- --define install_rules --libs:: --ifeq ($(OS_ARCH)_$(1), SunOS_$(SOFTOKEN3_LIB)) --# has to use copy mode on Solaris, see #665509 -- $$(NSINSTALL) -t -m 755 $$(DIST)/lib/$(1) $$(DIST)/bin --else -- $$(INSTALL) -m 755 $$(DIST)/lib/$(1) $$(DIST)/bin -+ifndef MOZ_NATIVE_NSS -+ifndef NSS_DISABLE_DBM -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS) - endif -- --install:: -- $$(SYSINSTALL) -m 755 $$(DIST)/lib/$(1) $$(DESTDIR)$$(mozappdir) --endef --$(foreach lib,$(NSS_LIBS),$(eval $(call install_rules,$(lib)))) -- --libs:: -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) -+ifdef ENABLE_TESTS -+# Need certutil binary for mochitest certificates generation -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS) -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS) -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/modutil $(DEFAULT_GMAKE_FLAGS) -+endif -+ifndef ENABLE_TESTS # Just avoid secondary compile -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -+endif -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) -+ $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin -+ifeq ($(OS_ARCH), SunOS) -+# has to use copy mode on Solaris, see #665509 -+ $(NSINSTALL) -t -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -+else -+ $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -+endif -+ifndef NSS_DISABLE_DBM -+ $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin -+endif -+ $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -+ $(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin -+ $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -+ $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin - $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib -+ifdef HAVE_FREEBL_LIBS -+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin -+endif -+ifdef HAVE_FREEBL_LIBS_32 -+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin -+endif -+ifdef HAVE_FREEBL_LIBS_32INT64 -+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin -+endif -+ifdef HAVE_FREEBL_LIBS_64 -+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -+ $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin -+endif -+endif -+ifndef MOZ_NATIVE_NSS - # NSS installs headers to dist/public and we want them in dist/include - $(NSINSTALL) -D $(DIST)/include/nss - (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/include && tar -xf -) -- --endif # MOZ_NATIVE_NSS -- --DIRS = \ -- boot \ -- ssl \ -- locales \ -- $(NULL) -- -+endif -+ $(MAKE) -C boot $@ -+ $(MAKE) -C ssl $@ -+ $(MAKE) -C locales $@ - ifdef MOZ_XUL --DIRS += pki -+ $(MAKE) -C pki $@ - endif - --include $(topsrcdir)/config/rules.mk -+check:: -+ $(MAKE) -C ssl $@ -+ -+install:: -+ifndef MOZ_NATIVE_NSS -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) -+ifdef HAVE_FREEBL_LIBS -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) -+endif -+ifdef HAVE_FREEBL_LIBS_32 -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) -+endif -+ifdef HAVE_FREEBL_LIBS_32INT64 -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) -+endif -+ifdef HAVE_FREEBL_LIBS_64 -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -+ $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) -+endif -+endif -+ $(MAKE) -C boot $@ -+ $(MAKE) -C ssl $@ -+ $(MAKE) -C locales $@ -+ifdef MOZ_XUL -+ $(MAKE) -C pki $@ -+endif -+ -+clean clobber clobber_all realclean distclean depend:: -+ $(MAKE) -C boot $@ -+ $(MAKE) -C ssl $@ -+ $(MAKE) -C locales $@ -+ifdef MOZ_XUL -+ $(MAKE) -C pki $@ -+endif -+ifndef MOZ_NATIVE_NSS -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -+ $(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean -+endif From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 14 15:06:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7C521065674 for ; Thu, 14 Jun 2012 15:06: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 2B1478FC22 for ; Thu, 14 Jun 2012 15:06:36 +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 q5EF6ae1075512 for ; Thu, 14 Jun 2012 15:06:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5EF6VrH073265 for freebsd-gecko@freebsd.org; Thu, 14 Jun 2012 15:06:31 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 14 Jun 2012 15:06:31 GMT Message-Id: <201206141506.q5EF6VrH073265@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r757 - in branches/experimental/www: firefox-beta/files firefox-esr/files firefox-nightly/files firefox/files libxul/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 14 Jun 2012 15:06:37 -0000 Author: jbeich Date: Thu Jun 14 15:06:30 2012 New Revision: 757 Log: use shorter fix, taken from example in http://wiki.freebsd.org/NewC++Stack Added: branches/experimental/www/firefox-beta/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/firefox-nightly/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/firefox/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/libxul/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Deleted: branches/experimental/www/firefox-beta/files/patch-libcxx-revert-bug519601 branches/experimental/www/firefox-esr/files/patch-libcxx-revert-bug519601 branches/experimental/www/firefox-nightly/files/patch-libcxx-revert-bug519601 branches/experimental/www/firefox/files/patch-libcxx-revert-bug519601 branches/experimental/www/libxul/files/patch-libcxx-revert-bug519601 Added: branches/experimental/www/firefox-beta/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-beta/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Thu Jun 14 15:06:30 2012 (r757) @@ -0,0 +1,11 @@ +--- dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Deleted: branches/experimental/www/firefox-beta/files/patch-libcxx-revert-bug519601 ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-libcxx-revert-bug519601 Thu Jun 14 15:06:30 2012 (r756) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,116 +0,0 @@ -changeset: 40752:cc5ace5d6ade -user: Karl Tomlinson and Chris Jones -date: Wed Apr 14 02:04:52 2010 -0500 -summary: Bug 519601: s/netscape/netsc@pe/ for plugin dso paths passed on the command line on linux. r=karlt - -diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp ---- dom/plugins/ipc/PluginMessageUtils.cpp -+++ dom/plugins/ipc/PluginMessageUtils.cpp -@@ -13,8 +13,6 @@ - #include "PluginScriptableObjectParent.h" - #include "PluginScriptableObjectChild.h" - --using std::string; -- - using mozilla::ipc::RPCChannel; - - namespace { -@@ -114,42 +112,6 @@ MediateRace(const RPCChannel::Message& p - } - } - --static string --ReplaceAll(const string& haystack, const string& needle, const string& with) --{ -- string munged = haystack; -- string::size_type i = 0; -- -- while (string::npos != (i = munged.find(needle, i))) { -- munged.replace(i, needle.length(), with); -- i += with.length(); -- } -- -- return munged; --} -- --string --MungePluginDsoPath(const string& path) --{ --#if defined(OS_LINUX) -- // https://bugzilla.mozilla.org/show_bug.cgi?id=519601 -- return ReplaceAll(path, "netscape", "netsc@pe"); --#else -- return path; --#endif --} -- --string --UnmungePluginDsoPath(const string& munged) --{ --#if defined(OS_LINUX) -- return ReplaceAll(munged, "netsc@pe", "netscape"); --#else -- return munged; --#endif --} -- -- - PRLogModuleInfo* gPluginLog = PR_NewLogModule("IPCPlugins"); - - void -diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h ---- dom/plugins/ipc/PluginMessageUtils.h -+++ dom/plugins/ipc/PluginMessageUtils.h -@@ -48,11 +48,6 @@ mozilla::ipc::RPCChannel::RacyRPCPolicy - MediateRace(const mozilla::ipc::RPCChannel::Message& parent, - const mozilla::ipc::RPCChannel::Message& child); - --std::string --MungePluginDsoPath(const std::string& path); --std::string --UnmungePluginDsoPath(const std::string& munged); -- - extern PRLogModuleInfo* gPluginLog; - - const uint32_t kAllowAsyncDrawing = 0x1; -diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp ---- dom/plugins/ipc/PluginProcessChild.cpp -+++ dom/plugins/ipc/PluginProcessChild.cpp -@@ -95,7 +95,7 @@ PluginProcessChild::Init() - std::vector values = CommandLine::ForCurrentProcess()->argv(); - NS_ABORT_IF_FALSE(values.size() >= 2, "not enough args"); - -- pluginFilename = UnmungePluginDsoPath(values[1]); -+ pluginFilename = values[1]; - - #elif defined(OS_WIN) - std::vector values = -diff --git a/dom/plugins/ipc/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp ---- dom/plugins/ipc/PluginProcessParent.cpp -+++ dom/plugins/ipc/PluginProcessParent.cpp -@@ -10,10 +10,6 @@ - #include "base/process_util.h" - - #include "mozilla/ipc/BrowserProcessSubThread.h" --#include "mozilla/plugins/PluginMessageUtils.h" -- --using std::vector; --using std::string; - - using mozilla::ipc::BrowserProcessSubThread; - using mozilla::ipc::GeckoChildProcessHost; -@@ -73,8 +69,12 @@ PluginProcessParent::Launch(PRInt32 time - } - } - -- vector args; -- args.push_back(MungePluginDsoPath(mPluginFilePath)); -+ std::vector args; -+#if defined(XP_WIN) -+ args.push_back("\""+ mPluginFilePath +"\""); -+#else -+ args.push_back(mPluginFilePath); -+#endif - return SyncLaunch(args, timeoutMs, selectedArchitecture); - } - Added: branches/experimental/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Thu Jun 14 15:06:30 2012 (r757) @@ -0,0 +1,11 @@ +--- dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Deleted: branches/experimental/www/firefox-esr/files/patch-libcxx-revert-bug519601 ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-libcxx-revert-bug519601 Thu Jun 14 15:06:30 2012 (r756) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,116 +0,0 @@ -changeset: 40752:cc5ace5d6ade -user: Karl Tomlinson and Chris Jones -date: Wed Apr 14 02:04:52 2010 -0500 -summary: Bug 519601: s/netscape/netsc@pe/ for plugin dso paths passed on the command line on linux. r=karlt - -diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp ---- dom/plugins/ipc/PluginMessageUtils.cpp -+++ dom/plugins/ipc/PluginMessageUtils.cpp -@@ -13,8 +13,6 @@ - #include "PluginScriptableObjectParent.h" - #include "PluginScriptableObjectChild.h" - --using std::string; -- - using mozilla::ipc::RPCChannel; - - namespace { -@@ -114,42 +112,6 @@ MediateRace(const RPCChannel::Message& p - } - } - --static string --ReplaceAll(const string& haystack, const string& needle, const string& with) --{ -- string munged = haystack; -- string::size_type i = 0; -- -- while (string::npos != (i = munged.find(needle, i))) { -- munged.replace(i, needle.length(), with); -- i += with.length(); -- } -- -- return munged; --} -- --string --MungePluginDsoPath(const string& path) --{ --#if defined(OS_LINUX) -- // https://bugzilla.mozilla.org/show_bug.cgi?id=519601 -- return ReplaceAll(path, "netscape", "netsc@pe"); --#else -- return path; --#endif --} -- --string --UnmungePluginDsoPath(const string& munged) --{ --#if defined(OS_LINUX) -- return ReplaceAll(munged, "netsc@pe", "netscape"); --#else -- return munged; --#endif --} -- -- - PRLogModuleInfo* gPluginLog = PR_NewLogModule("IPCPlugins"); - - void -diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h ---- dom/plugins/ipc/PluginMessageUtils.h -+++ dom/plugins/ipc/PluginMessageUtils.h -@@ -48,11 +48,6 @@ mozilla::ipc::RPCChannel::RacyRPCPolicy - MediateRace(const mozilla::ipc::RPCChannel::Message& parent, - const mozilla::ipc::RPCChannel::Message& child); - --std::string --MungePluginDsoPath(const std::string& path); --std::string --UnmungePluginDsoPath(const std::string& munged); -- - extern PRLogModuleInfo* gPluginLog; - - const uint32_t kAllowAsyncDrawing = 0x1; -diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp ---- dom/plugins/ipc/PluginProcessChild.cpp -+++ dom/plugins/ipc/PluginProcessChild.cpp -@@ -95,7 +95,7 @@ PluginProcessChild::Init() - std::vector values = CommandLine::ForCurrentProcess()->argv(); - NS_ABORT_IF_FALSE(values.size() >= 2, "not enough args"); - -- pluginFilename = UnmungePluginDsoPath(values[1]); -+ pluginFilename = values[1]; - - #elif defined(OS_WIN) - std::vector values = -diff --git a/dom/plugins/ipc/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp ---- dom/plugins/ipc/PluginProcessParent.cpp -+++ dom/plugins/ipc/PluginProcessParent.cpp -@@ -10,10 +10,6 @@ - #include "base/process_util.h" - - #include "mozilla/ipc/BrowserProcessSubThread.h" --#include "mozilla/plugins/PluginMessageUtils.h" -- --using std::vector; --using std::string; - - using mozilla::ipc::BrowserProcessSubThread; - using mozilla::ipc::GeckoChildProcessHost; -@@ -73,8 +69,12 @@ PluginProcessParent::Launch(PRInt32 time - } - } - -- vector args; -- args.push_back(MungePluginDsoPath(mPluginFilePath)); -+ std::vector args; -+#if defined(XP_WIN) -+ args.push_back("\""+ mPluginFilePath +"\""); -+#else -+ args.push_back(mPluginFilePath); -+#endif - return SyncLaunch(args, timeoutMs, selectedArchitecture); - } - Added: branches/experimental/www/firefox-nightly/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Thu Jun 14 15:06:30 2012 (r757) @@ -0,0 +1,11 @@ +--- dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Deleted: branches/experimental/www/firefox-nightly/files/patch-libcxx-revert-bug519601 ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-libcxx-revert-bug519601 Thu Jun 14 15:06:30 2012 (r756) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,118 +0,0 @@ -changeset: 40752:cc5ace5d6ade -user: Karl Tomlinson and Chris Jones -date: Wed Apr 14 02:04:52 2010 -0500 -summary: Bug 519601: s/netscape/netsc@pe/ for plugin dso paths passed on the command line on linux. r=karlt - -diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp ---- dom/plugins/ipc/PluginMessageUtils.cpp -+++ dom/plugins/ipc/PluginMessageUtils.cpp -@@ -13,8 +13,6 @@ - #include "PluginScriptableObjectParent.h" - #include "PluginScriptableObjectChild.h" - --using std::string; -- - using mozilla::ipc::RPCChannel; - - namespace { -@@ -82,44 +80,6 @@ MediateRace(const RPCChannel::Message& p - } - } - --#if defined(OS_LINUX) --static string --ReplaceAll(const string& haystack, const string& needle, const string& with) --{ -- string munged = haystack; -- string::size_type i = 0; -- -- while (string::npos != (i = munged.find(needle, i))) { -- munged.replace(i, needle.length(), with); -- i += with.length(); -- } -- -- return munged; --} --#endif -- --string --MungePluginDsoPath(const string& path) --{ --#if defined(OS_LINUX) -- // https://bugzilla.mozilla.org/show_bug.cgi?id=519601 -- return ReplaceAll(path, "netscape", "netsc@pe"); --#else -- return path; --#endif --} -- --string --UnmungePluginDsoPath(const string& munged) --{ --#if defined(OS_LINUX) -- return ReplaceAll(munged, "netsc@pe", "netscape"); --#else -- return munged; --#endif --} -- -- - PRLogModuleInfo* gPluginLog = PR_NewLogModule("IPCPlugins"); - - void -diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h ---- dom/plugins/ipc/PluginMessageUtils.h -+++ dom/plugins/ipc/PluginMessageUtils.h -@@ -48,11 +48,6 @@ mozilla::ipc::RPCChannel::RacyRPCPolicy - MediateRace(const mozilla::ipc::RPCChannel::Message& parent, - const mozilla::ipc::RPCChannel::Message& child); - --std::string --MungePluginDsoPath(const std::string& path); --std::string --UnmungePluginDsoPath(const std::string& munged); -- - extern PRLogModuleInfo* gPluginLog; - - const uint32_t kAllowAsyncDrawing = 0x1; -diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp ---- dom/plugins/ipc/PluginProcessChild.cpp -+++ dom/plugins/ipc/PluginProcessChild.cpp -@@ -95,7 +95,7 @@ PluginProcessChild::Init() - std::vector values = CommandLine::ForCurrentProcess()->argv(); - NS_ABORT_IF_FALSE(values.size() >= 2, "not enough args"); - -- pluginFilename = UnmungePluginDsoPath(values[1]); -+ pluginFilename = values[1]; - - #elif defined(OS_WIN) - std::vector values = -diff --git a/dom/plugins/ipc/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp ---- dom/plugins/ipc/PluginProcessParent.cpp -+++ dom/plugins/ipc/PluginProcessParent.cpp -@@ -10,10 +10,6 @@ - #include "base/process_util.h" - - #include "mozilla/ipc/BrowserProcessSubThread.h" --#include "mozilla/plugins/PluginMessageUtils.h" -- --using std::vector; --using std::string; - - using mozilla::ipc::BrowserProcessSubThread; - using mozilla::ipc::GeckoChildProcessHost; -@@ -73,8 +69,12 @@ PluginProcessParent::Launch(PRInt32 time - } - } - -- vector args; -- args.push_back(MungePluginDsoPath(mPluginFilePath)); -+ std::vector args; -+#if defined(XP_WIN) -+ args.push_back("\""+ mPluginFilePath +"\""); -+#else -+ args.push_back(mPluginFilePath); -+#endif - return SyncLaunch(args, timeoutMs, selectedArchitecture); - } - Added: branches/experimental/www/firefox/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Thu Jun 14 15:06:30 2012 (r757) @@ -0,0 +1,11 @@ +--- dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Deleted: branches/experimental/www/firefox/files/patch-libcxx-revert-bug519601 ============================================================================== --- branches/experimental/www/firefox/files/patch-libcxx-revert-bug519601 Thu Jun 14 15:06:30 2012 (r756) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,118 +0,0 @@ -changeset: 40752:cc5ace5d6ade -user: Karl Tomlinson and Chris Jones -date: Wed Apr 14 02:04:52 2010 -0500 -summary: Bug 519601: s/netscape/netsc@pe/ for plugin dso paths passed on the command line on linux. r=karlt - -diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp ---- dom/plugins/ipc/PluginMessageUtils.cpp -+++ dom/plugins/ipc/PluginMessageUtils.cpp -@@ -13,8 +13,6 @@ - #include "PluginScriptableObjectParent.h" - #include "PluginScriptableObjectChild.h" - --using std::string; -- - using mozilla::ipc::RPCChannel; - - namespace { -@@ -82,44 +80,6 @@ MediateRace(const RPCChannel::Message& p - } - } - --#if defined(OS_LINUX) --static string --ReplaceAll(const string& haystack, const string& needle, const string& with) --{ -- string munged = haystack; -- string::size_type i = 0; -- -- while (string::npos != (i = munged.find(needle, i))) { -- munged.replace(i, needle.length(), with); -- i += with.length(); -- } -- -- return munged; --} --#endif -- --string --MungePluginDsoPath(const string& path) --{ --#if defined(OS_LINUX) -- // https://bugzilla.mozilla.org/show_bug.cgi?id=519601 -- return ReplaceAll(path, "netscape", "netsc@pe"); --#else -- return path; --#endif --} -- --string --UnmungePluginDsoPath(const string& munged) --{ --#if defined(OS_LINUX) -- return ReplaceAll(munged, "netsc@pe", "netscape"); --#else -- return munged; --#endif --} -- -- - PRLogModuleInfo* gPluginLog = PR_NewLogModule("IPCPlugins"); - - void -diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h ---- dom/plugins/ipc/PluginMessageUtils.h -+++ dom/plugins/ipc/PluginMessageUtils.h -@@ -48,11 +48,6 @@ mozilla::ipc::RPCChannel::RacyRPCPolicy - MediateRace(const mozilla::ipc::RPCChannel::Message& parent, - const mozilla::ipc::RPCChannel::Message& child); - --std::string --MungePluginDsoPath(const std::string& path); --std::string --UnmungePluginDsoPath(const std::string& munged); -- - extern PRLogModuleInfo* gPluginLog; - - const uint32_t kAllowAsyncDrawing = 0x1; -diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp ---- dom/plugins/ipc/PluginProcessChild.cpp -+++ dom/plugins/ipc/PluginProcessChild.cpp -@@ -95,7 +95,7 @@ PluginProcessChild::Init() - std::vector values = CommandLine::ForCurrentProcess()->argv(); - NS_ABORT_IF_FALSE(values.size() >= 2, "not enough args"); - -- pluginFilename = UnmungePluginDsoPath(values[1]); -+ pluginFilename = values[1]; - - #elif defined(OS_WIN) - std::vector values = -diff --git a/dom/plugins/ipc/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp ---- dom/plugins/ipc/PluginProcessParent.cpp -+++ dom/plugins/ipc/PluginProcessParent.cpp -@@ -10,10 +10,6 @@ - #include "base/process_util.h" - - #include "mozilla/ipc/BrowserProcessSubThread.h" --#include "mozilla/plugins/PluginMessageUtils.h" -- --using std::vector; --using std::string; - - using mozilla::ipc::BrowserProcessSubThread; - using mozilla::ipc::GeckoChildProcessHost; -@@ -73,8 +69,12 @@ PluginProcessParent::Launch(PRInt32 time - } - } - -- vector args; -- args.push_back(MungePluginDsoPath(mPluginFilePath)); -+ std::vector args; -+#if defined(XP_WIN) -+ args.push_back("\""+ mPluginFilePath +"\""); -+#else -+ args.push_back(mPluginFilePath); -+#endif - return SyncLaunch(args, timeoutMs, selectedArchitecture); - } - Added: branches/experimental/www/libxul/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-dom-plugins-ipc-PluginMessageUtils.cpp Thu Jun 14 15:06:30 2012 (r757) @@ -0,0 +1,11 @@ +--- dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Deleted: branches/experimental/www/libxul/files/patch-libcxx-revert-bug519601 ============================================================================== --- branches/experimental/www/libxul/files/patch-libcxx-revert-bug519601 Thu Jun 14 15:06:30 2012 (r756) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,116 +0,0 @@ -changeset: 40752:cc5ace5d6ade -user: Karl Tomlinson and Chris Jones -date: Wed Apr 14 02:04:52 2010 -0500 -summary: Bug 519601: s/netscape/netsc@pe/ for plugin dso paths passed on the command line on linux. r=karlt - -diff --git a/dom/plugins/ipc/PluginMessageUtils.cpp b/dom/plugins/ipc/PluginMessageUtils.cpp ---- dom/plugins/ipc/PluginMessageUtils.cpp -+++ dom/plugins/ipc/PluginMessageUtils.cpp -@@ -13,8 +13,6 @@ - #include "PluginScriptableObjectParent.h" - #include "PluginScriptableObjectChild.h" - --using std::string; -- - using mozilla::ipc::RPCChannel; - - namespace { -@@ -114,42 +112,6 @@ MediateRace(const RPCChannel::Message& p - } - } - --static string --ReplaceAll(const string& haystack, const string& needle, const string& with) --{ -- string munged = haystack; -- string::size_type i = 0; -- -- while (string::npos != (i = munged.find(needle, i))) { -- munged.replace(i, needle.length(), with); -- i += with.length(); -- } -- -- return munged; --} -- --string --MungePluginDsoPath(const string& path) --{ --#if defined(OS_LINUX) -- // https://bugzilla.mozilla.org/show_bug.cgi?id=519601 -- return ReplaceAll(path, "netscape", "netsc@pe"); --#else -- return path; --#endif --} -- --string --UnmungePluginDsoPath(const string& munged) --{ --#if defined(OS_LINUX) -- return ReplaceAll(munged, "netsc@pe", "netscape"); --#else -- return munged; --#endif --} -- -- - PRLogModuleInfo* gPluginLog = PR_NewLogModule("IPCPlugins"); - - void -diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h ---- dom/plugins/ipc/PluginMessageUtils.h -+++ dom/plugins/ipc/PluginMessageUtils.h -@@ -48,11 +48,6 @@ mozilla::ipc::RPCChannel::RacyRPCPolicy - MediateRace(const mozilla::ipc::RPCChannel::Message& parent, - const mozilla::ipc::RPCChannel::Message& child); - --std::string --MungePluginDsoPath(const std::string& path); --std::string --UnmungePluginDsoPath(const std::string& munged); -- - extern PRLogModuleInfo* gPluginLog; - - const uint32_t kAllowAsyncDrawing = 0x1; -diff --git a/dom/plugins/ipc/PluginProcessChild.cpp b/dom/plugins/ipc/PluginProcessChild.cpp ---- dom/plugins/ipc/PluginProcessChild.cpp -+++ dom/plugins/ipc/PluginProcessChild.cpp -@@ -95,7 +95,7 @@ PluginProcessChild::Init() - std::vector values = CommandLine::ForCurrentProcess()->argv(); - NS_ABORT_IF_FALSE(values.size() >= 2, "not enough args"); - -- pluginFilename = UnmungePluginDsoPath(values[1]); -+ pluginFilename = values[1]; - - #elif defined(OS_WIN) - std::vector values = -diff --git a/dom/plugins/ipc/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp ---- dom/plugins/ipc/PluginProcessParent.cpp -+++ dom/plugins/ipc/PluginProcessParent.cpp -@@ -10,10 +10,6 @@ - #include "base/process_util.h" - - #include "mozilla/ipc/BrowserProcessSubThread.h" --#include "mozilla/plugins/PluginMessageUtils.h" -- --using std::vector; --using std::string; - - using mozilla::ipc::BrowserProcessSubThread; - using mozilla::ipc::GeckoChildProcessHost; -@@ -73,8 +69,12 @@ PluginProcessParent::Launch(PRInt32 time - } - } - -- vector args; -- args.push_back(MungePluginDsoPath(mPluginFilePath)); -+ std::vector args; -+#if defined(XP_WIN) -+ args.push_back("\""+ mPluginFilePath +"\""); -+#else -+ args.push_back(mPluginFilePath); -+#endif - return SyncLaunch(args, timeoutMs, selectedArchitecture); - } - From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 14 15:28:55 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 A7D1C106566C for ; Thu, 14 Jun 2012 15:28:55 +0000 (UTC) (envelope-from mexas@bristol.ac.uk) Received: from dirj.bris.ac.uk (dirj.bris.ac.uk [137.222.10.78]) by mx1.freebsd.org (Postfix) with ESMTP id 5D21B8FC16 for ; Thu, 14 Jun 2012 15:28:55 +0000 (UTC) Received: from ncsc.bris.ac.uk ([137.222.10.41]) by dirj.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1SfByg-0002Vq-Lb for freebsd-gecko@freebsd.org; Thu, 14 Jun 2012 16:28:54 +0100 Received: from mech-cluster241.men.bris.ac.uk ([137.222.187.241]) by ncsc.bris.ac.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1SfByg-0005ZW-Bq for freebsd-gecko@freebsd.org; Thu, 14 Jun 2012 16:28:54 +0100 Received: from mech-cluster241.men.bris.ac.uk (localhost [127.0.0.1]) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5) with ESMTP id q5EFSsoE001577 for ; Thu, 14 Jun 2012 16:28:54 +0100 (BST) (envelope-from mexas@bris.ac.uk) Received: (from mexas@localhost) by mech-cluster241.men.bris.ac.uk (8.14.5/8.14.5/Submit) id q5EFSsW0001576 for freebsd-gecko@freebsd.org; Thu, 14 Jun 2012 16:28:54 +0100 (BST) (envelope-from mexas@bris.ac.uk) X-Authentication-Warning: mech-cluster241.men.bris.ac.uk: mexas set sender to mexas@bris.ac.uk using -f Date: Thu, 14 Jun 2012 16:28:53 +0100 From: Anton Shterenlikht To: freebsd-gecko@freebsd.org Message-ID: <20120614152853.GA1562@mech-cluster241.men.bris.ac.uk> References: <201206141506.q5EF6VrH073265@trillian.chruetertee.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201206141506.q5EF6VrH073265@trillian.chruetertee.ch> User-Agent: Mutt/1.4.2.3i Subject: svn checkout firefox-nightly - timed out X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2012 15:28:55 -0000 # svn co svn://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental/www/firefox-nightly . svn: E000060: Unable to connect to a repository at URL 'svn://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental/www/firefox-nightly' svn: E000060: Can't connect to host 'trillian.chruetertee.ch': Operation timed out # What am I doing wrong? -- Anton Shterenlikht Room 2.6, Queen's Building Mech Eng Dept Bristol University University Walk, Bristol BS8 1TR, UK Tel: +44 (0)117 331 5944 Fax: +44 (0)117 929 4423 From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 14 16:02:04 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09B041065674 for ; Thu, 14 Jun 2012 16:02:04 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id CD3AD8FC16 for ; Thu, 14 Jun 2012 16:02:03 +0000 (UTC) Received: from sofia.torservers.net ([109.163.233.201]:7012 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1SfCUa-0017Tq-Qc; Thu, 14 Jun 2012 12:01:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:Cc:To:From; bh=kDtHvG9NdYtmVTPjVtz/jRdogs0+0n6AakP4pXlgghg=; b=H5pqfkNd40uKKwvelExpq0uqc31rINylxTFygnbc3KISqo2G7k18St39Mfy+kSR2ZXJQgwMMLs2ucBtR+yyNrkc0/fNNacoE2Bk4ldkjyNr9MDgK7qB+KjJui7VEm5lTJGTn+aSU6l6Abm/vfaMjtogw6e5Jil/nra7QQU1cC4k=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1SfCTc-000Jsx-7H; Thu, 14 Jun 2012 16:00:53 +0000 From: Jan Beich To: Anton Shterenlikht In-Reply-To: <20120614152853.GA1562@mech-cluster241.men.bris.ac.uk> (Anton Shterenlikht's message of "Thu, 14 Jun 2012 16:28:53 +0100") Date: Fri, 15 Jun 2012 02:01:13 +1000 References: <201206141506.q5EF6VrH073265@trillian.chruetertee.ch> <20120614152853.GA1562@mech-cluster241.men.bris.ac.uk> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1SfCTc-000Jsx-7H@internal.tormail.org> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.allsitecontrol.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.org X-Source: X-Source-Args: X-Source-Dir: Cc: freebsd-gecko@freebsd.org Subject: Re: svn checkout firefox-nightly - timed out X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2012 16:02:04 -0000 Anton Shterenlikht writes: > # svn co svn://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental/www/firefox-nightly . > svn: E000060: Unable to connect to a repository at URL > svn://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental/www/firefox-nightly' > svn: E000060: Can't connect to host 'trillian.chruetertee.ch': Operation timed out > # > > What am I doing wrong? It doesn't serve svn://, only http:// and https://. Also, you need changes in Mk/bsd.gecko.mk or it may not work. http://lists.freebsd.org/pipermail/freebsd-gecko/2012-June/002253.html From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 15 00:58:42 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 3A9DD106566C for ; Fri, 15 Jun 2012 00:58:42 +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 BA35F8FC15 for ; Fri, 15 Jun 2012 00:58:41 +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 q5F0wZnN006009 for ; Fri, 15 Jun 2012 00:58:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5F0wUnD005344 for freebsd-gecko@freebsd.org; Fri, 15 Jun 2012 00:58:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 15 Jun 2012 00:58:30 GMT Message-Id: <201206150058.q5F0wUnD005344@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r758 - branches/experimental/www/firefox-nightly/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 15 Jun 2012 00:58:42 -0000 Author: jbeich Date: Fri Jun 15 00:58:30 2012 New Revision: 758 Log: restore pgo patch Added: branches/experimental/www/firefox-nightly/files/patch-build-pgo-profileserver.py - copied unchanged from r757, branches/experimental/www/firefox/files/patch-build-pgo-profileserver.py Copied: branches/experimental/www/firefox-nightly/files/patch-build-pgo-profileserver.py (from r757, branches/experimental/www/firefox/files/patch-build-pgo-profileserver.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-build-pgo-profileserver.py Fri Jun 15 00:58:30 2012 (r758, copy of r757, branches/experimental/www/firefox/files/patch-build-pgo-profileserver.py) @@ -0,0 +1,18 @@ +--- build/pgo/profileserver.py.orig 2011-02-24 21:49:47.000000000 +0100 ++++ build/pgo/profileserver.py 2011-02-24 21:50:30.000000000 +0100 +@@ -77,13 +77,13 @@ + t.setDaemon(True) # don't hang on exit + t.start() + +- automation.setServerInfo("localhost", PORT) ++ automation.setServerInfo("127.0.0.1", PORT) + automation.initializeProfile(PROFILE_DIRECTORY) + browserEnv = automation.environment() + browserEnv["XPCOM_DEBUG_BREAK"] = "warn" + browserEnv["MOZ_JAR_LOG_DIR"] = MOZ_JAR_LOG_DIR + +- url = "http://localhost:%d/index.html" % PORT ++ url = "http://127.0.0.1:%d/index.html" % PORT + appPath = os.path.join(SCRIPT_DIR, automation.DEFAULT_APP) + status = automation.runApp(url, browserEnv, appPath, PROFILE_DIRECTORY, {}, + debuggerInfo=debuggerInfo, From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 15 05:42:15 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 125931065670 for ; Fri, 15 Jun 2012 05:42:14 +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 EDAE88FC12 for ; Fri, 15 Jun 2012 05:42:13 +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 q5F5gC9D040345 for ; Fri, 15 Jun 2012 05:42:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5F5g78L033740 for freebsd-gecko@freebsd.org; Fri, 15 Jun 2012 05:42:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 15 Jun 2012 05:42:07 GMT Message-Id: <201206150542.q5F5g78L033740@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r759 - in branches/experimental: Mk mail/thunderbird-beta/files mail/thunderbird-esr/files mail/thunderbird/files www/firefox-beta/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey-beta/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 15 Jun 2012 05:42:15 -0000 Author: jbeich Date: Fri Jun 15 05:42:07 2012 New Revision: 759 Log: switch to libevent2, libevent1 is no longer actively developed The patches are used to honor non-default --libdir/--includedir of devel/libevent2. If you do not want two versions of libevent use the following in bsd.gecko.mk: .if exists(${LOCALBASE}/lib/event2) event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 .else event_LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent .endif PR: ports/161421 Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in branches/experimental/www/firefox-esr/files/patch-ipc-chromium-Makefile.in branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/firefox/files/patch-ipc-chromium-Makefile.in branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/libxul/files/patch-ipc-chromium-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in branches/experimental/www/firefox-beta/files/patch-configure.in branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/firefox-esr/files/patch-configure.in branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/firefox-nightly/files/patch-configure.in branches/experimental/www/firefox/files/patch-configure.in branches/experimental/www/libxul/files/patch-configure.in branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/Mk/bsd.gecko.mk Fri Jun 15 05:42:07 2012 (r759) @@ -579,7 +579,7 @@ dbm_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm -event_LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent +event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE} event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -45,6 +45,29 @@ AC_DEFINE(HAVE_CLOCK_MONOTONIC) AC_SUBST(HAVE_CLOCK_MONOTONIC) AC_SUBST(REALTIME_LIBS) +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/Makefile.in~ ++++ mozilla/ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ ++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -45,6 +45,29 @@ AC_DEFINE(HAVE_CLOCK_MONOTONIC) AC_SUBST(HAVE_CLOCK_MONOTONIC) AC_SUBST(REALTIME_LIBS) +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/Makefile.in~ ++++ mozilla/ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ ++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -18,6 +18,29 @@ INTEL_ARCHITECTURE=1 esac +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4580,7 +4580,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/Makefile.in~ ++++ mozilla/ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Added: branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ ++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/www/firefox-beta/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/firefox-beta/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -55,6 +55,29 @@ dnl system libevent Support dnl ======================================================== +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-beta/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- ipc/chromium/Makefile.in~ ++++ ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Modified: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -8,3 +8,12 @@ #include "eintr_wrapper.h" #include "base/logging.h" +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/www/firefox-esr/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/firefox-esr/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -55,6 +55,29 @@ dnl system libevent Support dnl ======================================================== +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/www/firefox-esr/files/patch-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- ipc/chromium/Makefile.in~ ++++ ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Modified: branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -8,3 +8,12 @@ #include "eintr_wrapper.h" #include "base/logging.h" +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -28,6 +28,29 @@ dnl system libevent Support dnl ======================================================== +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4263,6 +4270,10 @@ else fi fi Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- ipc/chromium/Makefile.in~ ++++ ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Added: branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,11 @@ +--- ipc/chromium/src/base/message_pump_libevent.cc~ ++++ ipc/chromium/src/base/message_pump_libevent.cc +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/www/firefox/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/firefox/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -18,7 +18,7 @@ INTEL_ARCHITECTURE=1 esac -@@ -4410,6 +4410,9 @@ else +@@ -4218,6 +4218,9 @@ else NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' fi fi @@ -28,7 +28,30 @@ dnl system libevent Support dnl ======================================================== -@@ -4580,7 +4580,7 @@ +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS +@@ -4808,7 +4810,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/www/firefox/files/patch-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- ipc/chromium/Makefile.in~ ++++ ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Added: branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,11 @@ +--- ipc/chromium/src/base/message_pump_libevent.cc~ ++++ ipc/chromium/src/base/message_pump_libevent.cc +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/www/libxul/files/patch-configure.in ============================================================================== --- branches/experimental/www/libxul/files/patch-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/libxul/files/patch-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -55,6 +55,29 @@ dnl system libevent Support dnl ======================================================== +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/www/libxul/files/patch-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- ipc/chromium/Makefile.in~ ++++ ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Modified: branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -8,3 +8,12 @@ #include "eintr_wrapper.h" #include "base/logging.h" +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -45,6 +45,29 @@ AC_DEFINE(HAVE_CLOCK_MONOTONIC) AC_SUBST(HAVE_CLOCK_MONOTONIC) AC_SUBST(REALTIME_LIBS) +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/Makefile.in~ ++++ mozilla/ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ ++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: Modified: branches/experimental/www/seamonkey/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Fri Jun 15 00:58:30 2012 (r758) +++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Fri Jun 15 05:42:07 2012 (r759) @@ -45,6 +45,29 @@ AC_DEFINE(HAVE_CLOCK_MONOTONIC) AC_SUBST(HAVE_CLOCK_MONOTONIC) AC_SUBST(REALTIME_LIBS) +@@ -4230,6 +4233,9 @@ + if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then + MOZ_NATIVE_LIBEVENT= + else ++PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent, ++ [MOZ_NATIVE_LIBEVENT=1 ++ MOZ_LIBEVENT_INCLUDES="$MOZ_LIBEVENT_CFLAGS"], [ + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +@@ -4242,10 +4248,11 @@ else + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) + AC_CHECK_LIB(event, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" ++ MOZ_LIBEVENT_INCLUDES="-I${LIBEVENT_DIR}/include" + MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi ++]) + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/Makefile.in~ ++++ mozilla/ipc/chromium/Makefile.in +@@ -23,9 +23,7 @@ vpath %.c \ + $(srcdir)/src/third_party/libevent \ + $(NULL) + else # } else { +-# message_pump_libevent.cc includes third_party/libevent/event.h, +-# which we put in $(DIST), see export rule below +-LOCAL_INCLUDES += -I$(DIST) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) + endif # } + + vpath %.cc \ Added: branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Fri Jun 15 05:42:07 2012 (r759) @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~ ++++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc +@@ -15,7 +15,7 @@ + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" +-#include "third_party/libevent/event.h" ++#include "event.h" + + // Lifecycle of struct event + // Libevent uses two main data structures: From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 15 08:37:24 2012 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D53E106567A for ; Fri, 15 Jun 2012 08:37:24 +0000 (UTC) (envelope-from az@azsupport.com) Received: from as1.azsupport.com (azsupport.com [74.52.186.194]) by mx1.freebsd.org (Postfix) with ESMTP id 52B1C8FC0A for ; Fri, 15 Jun 2012 08:37:24 +0000 (UTC) Received: from localhost (unknown [109.75.144.107]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by as1.azsupport.com (Postfix) with ESMTPSA id 8EA9C53E for ; Fri, 15 Jun 2012 10:31:28 +0200 (CEST) Date: Fri, 15 Jun 2012 10:31:25 +0200 From: Andrei To: gecko@FreeBSD.org Message-ID: <20120615103125.1a4a6173@azsupport.com> Organization: azsupport.com X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.6; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Subject: firefox 13 falls to build X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2012 08:37:24 -0000 root@az:/usr/ports/www/firefox # portupgrade ---> Upgrading 'firefox-12.0,1' to 'firefox-13.0,1' (www/firefox) ---> Building '/usr/ports/www/firefox' ===> Cleaning for firefox-13.0,1 ===> License check disabled, port has not defined LICENSE ===> Found saved configuration for firefox-13.0,1 ===> Extracting for firefox-13.0,1 => SHA256 Checksum OK for firefox-13.0.source.tar.bz2. ===> firefox-13.0,1 depends on file: /usr/local/bin/perl5.12.4 - found ===> Patching for firefox-13.0,1 ===> firefox-13.0,1 depends on file: /usr/local/bin/perl5.12.4 - found ===> Applying FreeBSD patches for firefox-13.0,1 /usr/bin/sed -i.bak -e 's|%%PTHREAD_LIBS%%|-pthread|' /usr/ports/www/firefox/work/mozilla-release/storage/build/Makefile.in /usr/ports/www/firefox/work/mozilla-release/toolkit/library/Makefile.in /usr/ports/www/firefox/work/mozilla-release/db/sqlite3/src/Makefile.in ===> firefox-13.0,1 depends on package: nspr>=4.9 - found ===> firefox-13.0,1 depends on package: cairo>=1.10.2_1,1 - found ===> firefox-13.0,1 depends on executable: unzip - found ===> firefox-13.0,1 depends on executable: zip - found ===> firefox-13.0,1 depends on executable: yasm - found ===> firefox-13.0,1 depends on executable: gmake - found ===> firefox-13.0,1 depends on executable: gcc46 - found ===> firefox-13.0,1 depends on file: /usr/local/bin/as - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/printproto.pc - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/sm.pc - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/xt.pc - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/xi.pc - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/xext.pc - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/x11.pc - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/xinerama.pc - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/ice.pc - found ===> firefox-13.0,1 depends on file: /usr/local/libdata/pkgconfig/xproto.pc - found ===> firefox-13.0,1 depends on file: /usr/local/bin/perl5.12.4 - found ===> firefox-13.0,1 depends on file: /usr/local/bin/autoconf-2.13 - found ===> firefox-13.0,1 depends on file: /usr/local/bin/intltool-extract - found ===> firefox-13.0,1 depends on executable: pkg-config - found ===> firefox-13.0,1 depends on executable: update-desktop-database - found ===> firefox-13.0,1 depends on shared library: execinfo.1 - found ===> firefox-13.0,1 depends on shared library: event-1.4 - found ===> firefox-13.0,1 depends on shared library: cairo.2 - found ===> firefox-13.0,1 depends on shared library: nspr4 - found ===> firefox-13.0,1 depends on shared library: dbus-glib-1.2 - found ===> firefox-13.0,1 depends on shared library: notify.4 - found ===> firefox-13.0,1 depends on shared library: iconv.3 - found ===> firefox-13.0,1 depends on shared library: GL.1 - found ===> firefox-13.0,1 depends on shared library: atk-1.0.0 - found ===> firefox-13.0,1 depends on shared library: glib-2.0.0 - found ===> firefox-13.0,1 depends on shared library: gtk-x11-2.0.0 - found ===> firefox-13.0,1 depends on shared library: IDL-2.0 - found ===> firefox-13.0,1 depends on shared library: pango-1.0.0 - found ===> Configuring for firefox-13.0,1 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/js/src/ctypes/libffi/aclocal.m4 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/js/src/ctypes/libffi/m4/libtool.m4 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/js/src/ctypes/libffi/acinclude.m4 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/js/src/ctypes/libffi/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/js/src/aclocal.m4 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/js/src/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/modules/freetype2/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/modules/freetype2/builds/unix/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/modules/freetype2/builds/unix/aclocal.m4 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/toolkit/crashreporter/google-breakpad/aclocal.m4 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/toolkit/crashreporter/google-breakpad/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/nsprpub/aclocal.m4 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/nsprpub/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/aclocal.m4 ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/security/nss/tests/pkcs11/netscape/trivial/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/ipc/chromium/src/third_party/libevent/configure ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/work/mozilla-release/ipc/chromium/src/third_party/libevent/aclocal.m4 (cd /usr/ports/www/firefox/work/mozilla-release && /usr/local/bin/autoconf-2.13) (cd /usr/ports/www/firefox/work/mozilla-release/js/src/ && /usr/local/bin/autoconf-2.13) Adding configure options from /usr/ports/www/firefox/work/mozilla-release/./.mozconfig: --prefix=/usr/ports/www/firefox/work/fake --program-transform-name=s/firefox/firefox/ --with-default-mozilla-five-home=/usr/local/lib/firefox --enable-svg --enable-svg-renderer=cairo --enable-application=browser --enable-official-branding --disable-updater --enable-canvas --enable-libxul --disable-necko-wifi --with-system-libevent=/usr/local --enable-system-cairo --with-system-nspr --enable-crypto --disable-tests --enable-default-toolkit=cairo-gtk2 --enable-xft --with-pthreads --x-includes=/usr/local/include --x-libraries=/usr/local/lib --enable-extensions=default --enable-image-decoders=default --enable-necko-protocols=default --with-system-zlib=/usr --with-gssapi=/usr --disable-auto-deps --disable-debug-symbols --enable-chrome-format=jar --disable-cpp-exceptions --disable-cpp-rtti --disable-glibtest --disable-gtktest --disable-freetypetest --enable-double-buffer --enable-mathml --disable-installer --disable-md --disable-pedantic --disable-bidi --disable-xterm-updates --disable-xprint --enable-xinerama --enable-optimize=-O2 --disable-gnomevfs --enable-strip --enable-install-strip --disable-debug --disable-logging --disable-gnomeui creating cache ./config.cache checking host system type... amd64-portbld-freebsd10.0 checking target system type... amd64-portbld-freebsd10.0 checking build system type... amd64-portbld-freebsd10.0 checking for mawk... no checking for gawk... gawk checking for /usr/local/bin/perl5.12.4... /usr/local/bin/perl5.12.4 checking for gcc... gcc46 checking whether the C compiler (gcc46 -O2 -fno-strict-aliasing -pipe -march=nocona -O2 -fno-strict-aliasing -O2 -Wl,-rpath=/usr/local/lib/gcc46 -Wl,-rpath=/usr/local/lib/gcc46) works... yes checking whether the C compiler (gcc46 -O2 -fno-strict-aliasing -pipe -march=nocona -O2 -fno-strict-aliasing -O2 -Wl,-rpath=/usr/local/lib/gcc46 -Wl,-rpath=/usr/local/lib/gcc46) is a cross-compiler... no checking whether we are using GNU C... yes checking whether gcc46 accepts -g... yes checking for c++... g++46 checking whether the C++ compiler (g++46 -O2 -fno-strict-aliasing -pipe -march=nocona -O2 -fno-strict-aliasing -O2 -Wl,-rpath=/usr/local/lib/gcc46 -fconserve-space -Wl,-rpath=/usr/local/lib/gcc46) works... yes checking whether the C++ compiler (g++46 -O2 -fno-strict-aliasing -pipe -march=nocona -O2 -fno-strict-aliasing -O2 -Wl,-rpath=/usr/local/lib/gcc46 -fconserve-space -Wl,-rpath=/usr/local/lib/gcc46) is a cross-compiler... no checking whether we are using GNU C++... yes checking whether g++46 accepts -g... yes checking for ranlib... ranlib checking for as... /usr/bin/as checking for ar... ar checking for ld... ld checking for strip... strip checking for windres... no checking how to run the C preprocessor... cpp46 checking how to run the C++ preprocessor... g++46 -E checking for a BSD compatible install... /usr/bin/install -c -o root -g wheel checking whether ln -s works... yes checking for minimum required perl version >= 5.006... 5.012004 checking for full perl installation... yes checking for python2.7... /usr/local/bin/python2.7 checking for doxygen... : checking for autoconf... /usr/local/bin/autoconf-2.13 checking for unzip... /usr/bin/unzip checking for zip... /usr/local/bin/zip checking for makedepend... /usr/local/bin/makedepend checking for xargs... /usr/bin/xargs checking for rpmbuild... : checking whether the C compiler is clang older than version 2.9... no checking bad gcc versions... we're ok checking for gmake... /usr/local/bin/gmake checking for X... libraries /usr/local/lib, headers /usr/local/include checking for dnet_ntoa in -ldnet... no checking for dnet_ntoa in -ldnet_stub... no checking for gethostbyname... yes checking for connect... yes checking for remove... yes checking for shmat... yes checking for IceConnectionNumber in -lICE... yes checking that static assertion macros used in autoconf tests work... yes checking whether the compiler supports -Wno-extended-offsetof... no checking whether the compiler supports -Wno-invalid-offsetof... yes checking whether the compiler supports -Wno-variadic-macros... yes checking whether the compiler supports -Werror=return-type... yes checking whether ld has archive extraction flags... yes checking for 64-bit OS... yes checking for Python version >= 2.5 but not 3.x... yes checking for custom implementation... none specified checking for ANSI C header files... yes checking for working const... yes checking for mode_t... yes checking for off_t... yes checking for pid_t... yes checking for size_t... yes checking for __stdcall... no checking for ssize_t... yes checking for st_blksize in struct stat... yes checking for siginfo_t... yes checking for int64... no checking for uint... yes checking for uint_t... no checking for uname.domainname... no checking for uname.__domainname... no checking for gcc c++0x headers bug without rtti... no checking for usable char16_t (2 bytes, unsigned)... yes checking for usable wchar_t (2 bytes, unsigned)... no checking for visibility(hidden) attribute... yes checking for visibility(default) attribute... yes checking for visibility pragma support... yes checking For gcc visibility bug with class-level attributes (GCC bug 26905)... no checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)... no checking for gcc PR49911... no checking whether the linker supports Identical Code Folding... no checking for __force_align_arg_pointer__ attribute... no checking for dirent.h that defines DIR... yes checking for opendir in -ldir... no checking for sys/byteorder.h... no checking for compat.h... no checking for getopt.h... yes checking for sys/bitypes.h... no checking for memory.h... yes checking for unistd.h... yes checking for gnu/libc-version.h... no checking for nl_types.h... yes checking for malloc.h... no checking for X11/XKBlib.h... yes checking for io.h... no checking for cpuid.h... yes checking for sys/statvfs.h... yes checking for sys/statfs.h... no checking for sys/vfs.h... no checking for sys/mount.h... yes checking for sys/quota.h... no checking for sys/sysmacros.h... no checking for linux/quota.h... no checking for mmintrin.h... yes checking for new... yes checking for sys/cdefs.h... yes checking for gethostbyname_r in -lc_r... no checking for library containing dlopen... none required checking for dlfcn.h... yes checking for dladdr... yes checking for memmem... yes checking for socket in -lsocket... no checking for XDrawLines in -lX11... yes checking for XextAddDisplay in -lXext... yes checking for XtFree in -lXt... yes checking for XShmCreateImage in -lXext... yes checking for X11/extensions/scrnsaver.h... yes checking for XScreenSaverQueryInfo in -lXss... yes checking for freetype-config... /usr/local/bin/freetype-config checking for FreeType - version >= 6.1.0... yes checking for FT_Bitmap_Size.y_ppem... no checking for FT_GlyphSlot_Embolden... yes checking for FT_Load_Sfnt_Table... yes checking for FT_Select_Size... yes checking for pthread_create in -lpthreads... no checking for pthread_create in -lpthread... no checking for pthread_create in -lc_r... no checking for pthread_create in -lc... no configure: error: --with-pthreads specified for a system without pthread support ===> Script "configure" failed unexpectedly. Please report the problem to gecko@FreeBSD.org [maintainer] and attach the "/usr/ports/www/firefox/work/mozilla-release/config.log" including the output of the failure of your make command. Also, it might be a good idea to provide an overview of all packages installed on your system (e.g. an `ls /var/db/pkg`). *** [do-configure] Error code 1 Stop in /usr/ports/www/firefox. *** [build] Error code 1 Stop in /usr/ports/www/firefox. ** Command failed [exit code 1]: /usr/bin/script -qa /tmp/portupgrade20120615-78807-baarnc-0 env UPGRADE_TOOL=portupgrade UPGRADE_PORT=firefox-12.0,1 UPGRADE_PORT_VER=12.0,1 make ** Fix the problem and try again. ** Listing the failed packages (-:ignored / *:skipped / !:failed) ! www/firefox (firefox-12.0,1) (configure error) root@az:/usr/ports/www/firefox # uname -a FreeBSD az 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Fri Jun 15 08:37:23 CEST 2012 root@az:/usr/obj/usr/src/sys/localhost amd64 From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 15 19:42:59 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB1B7106564A for ; Fri, 15 Jun 2012 19:42:59 +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 677908FC08 for ; Fri, 15 Jun 2012 19:42:59 +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 q5FJgwKV094204 for ; Fri, 15 Jun 2012 19:42:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5FJgqWZ093944 for freebsd-gecko@freebsd.org; Fri, 15 Jun 2012 19:42:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 15 Jun 2012 19:42:52 GMT Message-Id: <201206151942.q5FJgqWZ093944@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r760 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 15 Jun 2012 19:42:59 -0000 Author: jbeich Date: Fri Jun 15 19:42:52 2012 New Revision: 760 Log: add hunspell to USE_MOZILLA description (after r748) Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Fri Jun 15 05:42:07 2012 (r759) +++ branches/experimental/Mk/bsd.gecko.mk Fri Jun 15 19:42:52 2012 (r760) @@ -450,11 +450,11 @@ # Ports can use the following: # # USE_MOZILLA By default, it enables the denendencies: cairo, dbm, -# event, ffi, jpeg, nspr, nss, png, sqlite, vpx and zip. -# Search for '_ALL_DEPENDS' below to see the list. If -# your port doesn't need one of list then you can use -# '-' like 'USE_MOZILLA= -png -zip' to subtract the -# dependencies. +# event, ffi, hunspell, jpeg, nspr, nss, png, sqlite, +# vpx and zip. Search for '_ALL_DEPENDS' below to see +# the list. If your port doesn't need one of list then +# you can use '-' like 'USE_MOZILLA= -png -zip' to +# subtract the dependencies. # # GECKO_PLIST_PRE_FILES Manual add files in the plist if it needs. # From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 16 05:21:56 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89ED9106564A for ; Sat, 16 Jun 2012 05:21:56 +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 811058FC0C for ; Sat, 16 Jun 2012 05:21:55 +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 q5G5LmhQ039326 for ; Sat, 16 Jun 2012 05:21:48 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5G5LgVQ034705 for freebsd-gecko@freebsd.org; Sat, 16 Jun 2012 05:21:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 16 Jun 2012 05:21:42 GMT Message-Id: <201206160521.q5G5LgVQ034705@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r761 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/firefox www/firefox-beta www/firefox-beta/files www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey-beta www/seamonkey-beta/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 16 Jun 2012 05:21:56 -0000 Author: jbeich Date: Sat Jun 16 05:21:42 2012 New Revision: 761 Log: - use system libvpx (better support for tier2 archs) - leave patches for bundled libvpx intact Added: branches/experimental/mail/thunderbird-beta/files/patch-bug741737 branches/experimental/mail/thunderbird-esr/files/patch-bug741737 branches/experimental/mail/thunderbird/files/patch-bug741737 branches/experimental/www/firefox-beta/files/patch-bug741737 branches/experimental/www/firefox-esr/files/patch-bug741737 branches/experimental/www/firefox/files/patch-bug741737 branches/experimental/www/libxul/files/patch-bug741737 branches/experimental/www/seamonkey-beta/files/patch-bug741737 branches/experimental/www/seamonkey/files/patch-bug741737 Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/Mk/bsd.gecko.mk Sat Jun 16 05:21:42 2012 (r761) @@ -611,8 +611,8 @@ sqlite_MOZ_OPTIONS= --enable-system-sqlite vpx_LIB_DEPENDS= vpx:${PORTSDIR}/multimedia/libvpx -vpx_MOZ_OPTIONS= --with-system-libvpx=${LOCALBASE} -vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx +vpx_MOZ_OPTIONS= --with-system-libvpx +#vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx zip_DEPENDS= zip:${PORTSDIR}/archivers/zip Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -25,7 +25,7 @@ USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= thunderbird-10.* -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes Added: branches/experimental/mail/thunderbird-beta/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,93 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) +- +-MOZ_NATIVE_LIBVPX= ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) ++ + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) +- dnl We need at least v1.0.0 to fix several crash bugs (for which we +- dnl had local patches prior to v1.0.0). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported decoder symbols between the v1.0.0 release +- dnl and the v0.9.7 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- AC_DEFINE(MOZ_NATIVE_LIBVPX) +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + + Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -26,7 +26,7 @@ LATEST_LINK= thunderbird-esr USE_GECKO= gecko CONFLICTS= thunderbird-1[1-9].* -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes Added: branches/experimental/mail/thunderbird-esr/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,90 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -5588,12 +5588,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) + +-MOZ_NATIVE_LIBVPX= + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5606,53 +5604,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v0.9.7]) +- dnl We need at least v0.9.7 to fix several crash bugs (for which we +- dnl had local patches prior to v0.9.7). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported symbols between the v0.9.7 release and the +- dnl v0.9.6 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 0.9.7) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/mail/thunderbird/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -25,7 +25,7 @@ USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= thunderbird-10.* -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes Added: branches/experimental/mail/thunderbird/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,93 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) +- +-MOZ_NATIVE_LIBVPX= ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) ++ + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) +- dnl We need at least v1.0.0 to fix several crash bugs (for which we +- dnl had local patches prior to v1.0.0). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported decoder symbols between the v1.0.0 release +- dnl and the v0.9.7 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- AC_DEFINE(MOZ_NATIVE_LIBVPX) +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + + Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/www/firefox-beta/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -28,7 +28,7 @@ USE_GECKO= gecko CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm MOZILLA_NAME= Firefox MOZ_TOOLKIT= cairo-gtk2 Added: branches/experimental/www/firefox-beta/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-beta/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,93 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- configure.in ++++ configure.in +@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) +- +-MOZ_NATIVE_LIBVPX= ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) ++ + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) +- dnl We need at least v1.0.0 to fix several crash bugs (for which we +- dnl had local patches prior to v1.0.0). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported decoder symbols between the v1.0.0 release +- dnl and the v0.9.7 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- AC_DEFINE(MOZ_NATIVE_LIBVPX) +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + + Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/www/firefox-esr/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -29,7 +29,7 @@ USE_GECKO= gecko CONFLICTS= firefox-1[1-9].* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm MOZILLA_NAME= Firefox MOZ_TOOLKIT= cairo-gtk2 Added: branches/experimental/www/firefox-esr/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,90 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- configure.in ++++ configure.in +@@ -5588,12 +5588,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) + +-MOZ_NATIVE_LIBVPX= + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5606,53 +5604,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v0.9.7]) +- dnl We need at least v0.9.7 to fix several crash bugs (for which we +- dnl had local patches prior to v0.9.7). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported symbols between the v0.9.7 release and the +- dnl v0.9.6 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 0.9.7) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -31,7 +31,7 @@ USE_PYTHON_BUILD=yes USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -vpx +USE_MOZILLA= # empty MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/www/firefox/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -28,7 +28,7 @@ USE_GECKO= gecko CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm MOZILLA_NAME= Firefox MOZ_TOOLKIT= cairo-gtk2 Added: branches/experimental/www/firefox/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,93 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- configure.in ++++ configure.in +@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) +- +-MOZ_NATIVE_LIBVPX= ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) ++ + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) +- dnl We need at least v1.0.0 to fix several crash bugs (for which we +- dnl had local patches prior to v1.0.0). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported decoder symbols between the v1.0.0 release +- dnl and the v0.9.7 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- AC_DEFINE(MOZ_NATIVE_LIBVPX) +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + + Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/www/libxul/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -47,7 +47,7 @@ USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner MOZ_TOOLKIT= cairo-gtk2 -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js mozilla-nss \ mozilla-plugin Added: branches/experimental/www/libxul/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,90 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- configure.in ++++ configure.in +@@ -5588,12 +5588,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) + +-MOZ_NATIVE_LIBVPX= + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5606,53 +5604,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v0.9.7]) +- dnl We need at least v0.9.7 to fix several crash bugs (for which we +- dnl had local patches prior to v0.9.7). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported symbols between the v0.9.7 release and the +- dnl v0.9.6 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 0.9.7) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/www/seamonkey-beta/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -48,7 +48,7 @@ --disable-necko-wifi \ --disable-updater -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm USE_GECKO_OPTIONS=+smb MOZ_TOOLKIT= cairo-gtk2 MOZILLA_PLIST_DIRS= bin lib Added: branches/experimental/www/seamonkey-beta/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,93 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) +- +-MOZ_NATIVE_LIBVPX= ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) ++ + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) +- dnl We need at least v1.0.0 to fix several crash bugs (for which we +- dnl had local patches prior to v1.0.0). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported decoder symbols between the v1.0.0 release +- dnl and the v0.9.7 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- AC_DEFINE(MOZ_NATIVE_LIBVPX) +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + + Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Fri Jun 15 19:42:52 2012 (r760) +++ branches/experimental/www/seamonkey/Makefile Sat Jun 16 05:21:42 2012 (r761) @@ -48,7 +48,7 @@ --disable-necko-wifi \ --disable-updater -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -nss -dbm USE_GECKO_OPTIONS=+smb MOZ_TOOLKIT= cairo-gtk2 MOZILLA_PLIST_DIRS= bin lib Added: branches/experimental/www/seamonkey/files/patch-bug741737 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-bug741737 Sat Jun 16 05:21:42 2012 (r761) @@ -0,0 +1,93 @@ +changeset: 91900:eee73897136b +user: Martin Stransky +date: Tue Apr 17 19:57:40 2012 -0400 +summary: Bug 741737 - Configure libvpx with pkgconfig. r=khuey, a=npotb + +diff --git a/configure.in b/configure.in +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -5591,12 +5591,10 @@ MOZ_ARG_DISABLE_BOOL(webm, + + dnl system libvpx Support + dnl ======================================================== +-MOZ_ARG_WITH_STRING(system-libvpx, +-[ --with-system-libvpx=[PFX] +- Use system libvpx [installed at prefix PFX]], +- LIBVPX_DIR=$withval) +- +-MOZ_NATIVE_LIBVPX= ++MOZ_ARG_WITH_BOOL(system-libvpx, ++[ --with-system-libvpx Use system libvpx (located with pkgconfig)], ++ MOZ_NATIVE_LIBVPX=1) ++ + MOZ_LIBVPX_INCLUDES= + MOZ_LIBVPX_LIBS= + +@@ -5609,54 +5607,18 @@ if test -n "$MOZ_WEBM"; then + AC_DEFINE(MOZ_VP8_ENCODER) + fi + +- if test -n "$LIBVPX_DIR" -a "$LIBVPX_DIR" != no; then +- _SAVE_CFLAGS=$CFLAGS +- _SAVE_LDFLAGS=$LDFLAGS +- _SAVE_LIBS=$LIBS +- if test "${LIBVPX_DIR}" = "yes"; then +- LIBVPX_DIR=/usr +- fi +- CFLAGS="-I${LIBVPX_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBVPX_DIR}/lib $LDFLAGS" +- MOZ_NATIVE_LIBVPX_DEC_TEST= +- MOZ_CHECK_HEADER(vpx/vpx_decoder.h, +- [if test ! -f "${LIBVPX_DIR}/include/vpx/vpx_decoder.h"; then +- AC_MSG_ERROR([vpx/vpx_decoder.h found, but is not in ${LIBVPX_DIR}/include]) +- fi], +- AC_MSG_ERROR([--with-system-libvpx requested but vpx/vpx_decoder.h not found])) +- AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, +- [MOZ_NATIVE_LIBVPX_DEC_TEST=1], +- ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) +- if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then +- AC_MSG_CHECKING([for libvpx version >= v1.0.0]) +- dnl We need at least v1.0.0 to fix several crash bugs (for which we +- dnl had local patches prior to v1.0.0). +- dnl +- dnl This is a terrible test for the library version, but we don't +- dnl have a good one. There is no version number in a public header, +- dnl and testing the headers still doesn't guarantee we link against +- dnl the right version. While we could call vpx_codec_version() at +- dnl run-time, that would break cross-compiling. There are no +- dnl additional exported decoder symbols between the v1.0.0 release +- dnl and the v0.9.7 one to check for. +- AC_TRY_COMPILE([ +- #include +- #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) +- #error "test failed." +- #endif +- ], +- [return 0;], +- [AC_MSG_RESULT([yes]) +- MOZ_NATIVE_LIBVPX=1 +- AC_DEFINE(MOZ_NATIVE_LIBVPX) +- MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" +- MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], +- [AC_MSG_RESULT([no]) +- AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) +- fi +- CFLAGS=$_SAVE_CFLAGS +- LDFLAGS=$_SAVE_LDFLAGS +- LIBS=$_SAVE_LIBS ++ if test -n "$MOZ_NATIVE_LIBVPX"; then ++ dnl ============================ ++ dnl === libvpx Version check === ++ dnl ============================ ++ dnl Check to see if we have a system libvpx package. ++ PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0) ++ ++ MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], ++ [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])]) ++ ++ AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], ++ [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])]) + fi + fi + + From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 16 05:25:48 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B11B2106564A for ; Sat, 16 Jun 2012 05:25:48 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id 7A2F68FC17 for ; Sat, 16 Jun 2012 05:25:48 +0000 (UTC) Received: from sofia.torservers.net ([109.163.233.201]:23822 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1SflW4-000Pi6-3K for freebsd-gecko@freebsd.org; Sat, 16 Jun 2012 01:25:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tormail.org; s=tm; h=Message-Id:X-TorMail-User:Content-Type:MIME-Version:References:Date:In-Reply-To:Subject:To:From; bh=zAZbfFxn7sZYjsn7QXkjL+xQr1bBuE6ViDKGOGEswGA=; b=jsiSSAAxAgaObig3p6W9op+LhrV54dYq1XBeWkHa2fKGYrI9Fhxjv9/dBBHcNjOBE3yEjHVu8Z1wO/sDaH6S99p++gPO1QfgH684p+TUBGlgrLVjS4G3f40tUAPtcDYAKKTDx9WzgfPlczZibGNiXPAIJ26outnWc6Cvh8LmA9s=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1SflUR-000LEK-IB for freebsd-gecko@freebsd.org; Sat, 16 Jun 2012 05:24:04 +0000 From: Jan Beich To: freebsd-gecko@freebsd.org In-Reply-To: <201206160521.q5G5LgVQ034705@trillian.chruetertee.ch> (svn-freebsd-gecko@chruetertee.ch's message of "Sat, 16 Jun 2012 05:21:42 GMT") Date: Fri, 15 Jun 2012 22:23:55 -0700 References: <201206160521.q5G5LgVQ034705@trillian.chruetertee.ch> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1SflUR-000LEK-IB@internal.tormail.org> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - server2.allsitecontrol.com X-AntiAbuse: Original Domain - freebsd.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tormail.org X-Source: X-Source-Args: X-Source-Dir: Subject: Re: [SVN-Commit] r761 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/firefox www/firefox-beta www/firefox-beta/files www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey-beta www/seamonkey-beta/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jun 2012 05:25:48 -0000 svn-freebsd-gecko@chruetertee.ch writes: > Author: jbeich > Date: Sat Jun 16 05:21:42 2012 > New Revision: 761 > > Log: > - use system libvpx (better support for tier2 archs) > - leave patches for bundled libvpx intact [...] Note, when using clang-built multimedia/libvpx it may spill blocks during playback. This can be avoided by recompiling the port with gcc from base/ports. From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 16 18:40:38 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E884A106566C for ; Sat, 16 Jun 2012 18:40: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 85F208FC0C for ; Sat, 16 Jun 2012 18:40:37 +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 q5GIeZSX082982 for ; Sat, 16 Jun 2012 18:40:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5GIeU0Z080424 for freebsd-gecko@freebsd.org; Sat, 16 Jun 2012 18:40:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 16 Jun 2012 18:40:30 GMT Message-Id: <201206161840.q5GIeU0Z080424@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r762 - in branches/experimental: mail/thunderbird-beta/files mail/thunderbird-esr/files mail/thunderbird/files www/firefox-beta/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey-beta/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 16 Jun 2012 18:40:38 -0000 Author: jbeich Date: Sat Jun 16 18:40:30 2012 New Revision: 762 Log: build methodjit like linux Obtained from: pkgsrc Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp branches/experimental/www/firefox-beta/files/patch-js-src-methodjit-MethodJIT.cpp branches/experimental/www/firefox-esr/files/patch-js-src-methodjit-MethodJIT.cpp branches/experimental/www/firefox-nightly/files/patch-js-src-methodjit-MethodJIT.cpp branches/experimental/www/firefox/files/patch-js-src-methodjit-MethodJIT.cpp branches/experimental/www/libxul/files/patch-js-src-methodjit-MethodJIT.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp branches/experimental/www/seamonkey/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- mozilla/js/src/methodjit/MethodJIT.cpp~ ++++ mozilla/js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- mozilla/js/src/methodjit/MethodJIT.cpp~ ++++ mozilla/js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- mozilla/js/src/methodjit/MethodJIT.cpp~ ++++ mozilla/js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/www/firefox-beta/files/patch-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-beta/files/patch-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- js/src/methodjit/MethodJIT.cpp~ ++++ js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/www/firefox-esr/files/patch-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- js/src/methodjit/MethodJIT.cpp~ ++++ js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/www/firefox-nightly/files/patch-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- js/src/methodjit/MethodJIT.cpp~ ++++ js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/www/firefox/files/patch-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- js/src/methodjit/MethodJIT.cpp~ ++++ js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/www/libxul/files/patch-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- js/src/methodjit/MethodJIT.cpp~ ++++ js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- mozilla/js/src/methodjit/MethodJIT.cpp~ ++++ mozilla/js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) Added: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-methodjit-MethodJIT.cpp Sat Jun 16 18:40:30 2012 (r762) @@ -0,0 +1,20 @@ +--- mozilla/js/src/methodjit/MethodJIT.cpp~ ++++ mozilla/js/src/methodjit/MethodJIT.cpp +@@ -171,7 +171,7 @@ + + JS_STATIC_ASSERT(offsetof(FrameRegs, sp) == 0); + +-#if defined(__linux__) && defined(JS_CPU_X64) ++#if defined(__ELF__) && defined(JS_CPU_X64) + # define SYMBOL_STRING_RELOC(name) #name "@plt" + #else + # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name) +@@ -149,7 +149,7 @@ + + #if defined(XP_MACOSX) + # define HIDE_SYMBOL(name) ".private_extern _" #name +-#elif defined(__linux__) ++#elif defined(__ELF__) + # define HIDE_SYMBOL(name) ".hidden" #name + #else + # define HIDE_SYMBOL(name) From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 16 18:42:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EFB71065672 for ; Sat, 16 Jun 2012 18:42: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 A2EAC8FC12 for ; Sat, 16 Jun 2012 18:42:36 +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 q5GIgZ9b085195 for ; Sat, 16 Jun 2012 18:42:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5GIgUGw083861 for freebsd-gecko@freebsd.org; Sat, 16 Jun 2012 18:42:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 16 Jun 2012 18:42:30 GMT Message-Id: <201206161842.q5GIgUGw083861@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r763 - in branches/experimental/www/firefox-nightly: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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, 16 Jun 2012 18:42:37 -0000 Author: jbeich Date: Sat Jun 16 18:42:30 2012 New Revision: 763 Log: - update Nightly - green light for PGO, tested a bit earlier (r96810) - switch off system nspr/sqlite until their ports are updated Added: branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp branches/experimental/www/firefox-nightly/files/patch-webapprt-gtk2-webapprt.cpp - copied, changed from r762, branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp Deleted: branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp Modified: branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/distinfo branches/experimental/www/firefox-nightly/files/patch-configure.in Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sat Jun 16 18:40:30 2012 (r762) +++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 16 18:42:30 2012 (r763) @@ -17,9 +17,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ - nss>=3.13.2:${PORTSDIR}/security/nss \ - sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \ +BUILD_DEPENDS= nss>=3.13.2:${PORTSDIR}/security/nss \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -31,7 +29,7 @@ USE_PYTHON_BUILD=yes USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= # empty +USE_MOZILLA= -nspr -sqlite MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} @@ -58,7 +56,7 @@ OPTIONS_DEFINE= PGO PGO_DESC= Enable Profile-Guided Optimization -HGREV= 96339:b76ec573a6f0 +HGREV= 96890:9602a9e99045 .include @@ -85,7 +83,6 @@ .endif .if ${PORT_OPTIONS:MPGO} -BROKEN= does not build with PGO option enabled USE_DISPLAY= yes .include "${PORTSDIR}/Mk/bsd.python.mk" Modified: branches/experimental/www/firefox-nightly/distinfo ============================================================================== --- branches/experimental/www/firefox-nightly/distinfo Sat Jun 16 18:40:30 2012 (r762) +++ branches/experimental/www/firefox-nightly/distinfo Sat Jun 16 18:42:30 2012 (r763) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/b76ec573a6f0.tar.bz2) = d174687137545e6063db16a514650c683b7c6eafccdebeb0dc40dd5fb530a5bc -SIZE (firefox-nightly/b76ec573a6f0.tar.bz2) = 82265804 +SHA256 (firefox-nightly/9602a9e99045.tar.bz2) = f94d4cdaf0a05b543dce113dfe2c208fc80d4c9e63966e4db4b5f85c7dcd6056 +SIZE (firefox-nightly/9602a9e99045.tar.bz2) = 82641467 Deleted: branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in Sat Jun 16 18:42:30 2012 (r762) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,43 +0,0 @@ ---- browser/installer/package-manifest.in~ -+++ browser/installer/package-manifest.in -@@ -58,9 +58,11 @@ - #ifndef MOZ_STATIC_JS - @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ - #endif -+#ifndef MOZ_NATIVE_NSPR - @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ -+#endif - @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ - #ifdef XP_MACOSX - @BINPATH@/XUL -@@ -109,7 +111,9 @@ - #endif - @BINPATH@/platform.ini - #ifndef XP_OS2 -+#ifndef MOZ_NATIVE_SQLITE - @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ -+#endif - #else - @BINPATH@/mozsqlt3@DLL_SUFFIX@ - #endif -@@ -581,16 +585,18 @@ - ; NSS libraries are signed in the staging directory, - ; meaning their .chk files are created there directly. - ; -+#ifndef MOZ_NATIVE_NSS - @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@ - #ifndef NSS_DISABLE_DBM - @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@ - #endif - @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ - @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ -+#endif - @BINPATH@/chrome/pippki@JAREXT@ - @BINPATH@/chrome/pippki.manifest - @BINPATH@/components/pipboot.xpt Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-configure.in Sat Jun 16 18:40:30 2012 (r762) +++ branches/experimental/www/firefox-nightly/files/patch-configure.in Sat Jun 16 18:42:30 2012 (r763) @@ -18,16 +18,6 @@ INTEL_ARCHITECTURE=1 esac -@@ -4218,6 +4218,9 @@ else - NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' - fi - fi -+if test -n "$MOZ_NATIVE_NSPR"; then -+ AC_DEFINE(MOZ_NATIVE_NSPR) -+fi - - dnl system libevent Support - dnl ======================================================== @@ -4230,6 +4233,9 @@ if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then MOZ_NATIVE_LIBEVENT= @@ -51,17 +41,6 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4263,6 +4270,10 @@ else - fi - fi - -+if test -n "$MOZ_NATIVE_NSS"; then -+ AC_DEFINE(MOZ_NATIVE_NSS) -+fi -+ - dnl ====================== - dnl Detect yasm - dnl ====================== @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Added: branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp Sat Jun 16 18:42:30 2012 (r763) @@ -0,0 +1,14 @@ +--- dom/system/OSFileConstants.cpp~ ++++ dom/system/OSFileConstants.cpp +@@ -9,9 +9,9 @@ + #include "unistd.h" + #endif // defined(XP_UNIX) + +-#if defined(XP_MACOSX) || defined(__FreeBSD__) || defined(__OpenBSD__) ++#if defined(XP_MACOSX) + #include "copyfile.h" +-#endif // defined(XP_MAC) || defined(__FreeBSD__) || defined(__OpenBSD__) ++#endif // defined(XP_MAC) + + #if defined(XP_WIN) + #include Deleted: branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in Sat Jun 16 18:42:30 2012 (r762) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- webapprt/Makefile.in~ -+++ webapprt/Makefile.in -@@ -24,9 +24,13 @@ else - ifeq ($(OS_ARCH),Darwin) - DIRS += mac - else -+ifeq ($(OS_ARCH),FreeBSD) -+DIRS += linux -+else - ifeq ($(OS_ARCH),Linux) - DIRS += linux - endif # linux -+endif # freebsd - endif # mac - endif # windows - Copied and modified: branches/experimental/www/firefox-nightly/files/patch-webapprt-gtk2-webapprt.cpp (from r762, branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp) ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp Sat Jun 16 18:40:30 2012 (r762, copy source) +++ branches/experimental/www/firefox-nightly/files/patch-webapprt-gtk2-webapprt.cpp Sat Jun 16 18:42:30 2012 (r763) @@ -1,5 +1,5 @@ ---- webapprt/linux/webapprt.cpp~ -+++ webapprt/linux/webapprt.cpp +--- webapprt/gtk2/webapprt.cpp~ ++++ webapprt/gtk2/webapprt.cpp @@ -8,6 +8,7 @@ #include Deleted: branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp Sat Jun 16 18:42:30 2012 (r762) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- webapprt/linux/webapprt.cpp~ -+++ webapprt/linux/webapprt.cpp -@@ -8,6 +8,7 @@ - #include - - // Linux headers -+#include - #include - #include -