From owner-freebsd-gecko@FreeBSD.ORG Tue Aug 14 21:19:52 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 661941065672 for ; Tue, 14 Aug 2012 21:19:52 +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 DE36F8FC0C for ; Tue, 14 Aug 2012 21:19:51 +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 q7ELJodH094444 for ; Tue, 14 Aug 2012 21:19:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7ELJjh2093840 for freebsd-gecko@freebsd.org; Tue, 14 Aug 2012 21:19:45 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 14 Aug 2012 21:19:45 GMT Message-Id: <201208142119.q7ELJjh2093840@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] r929 - in branches/experimental: mail/thunderbird/files www/firefox-nightly/files www/firefox/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: Tue, 14 Aug 2012 21:19:52 -0000 Author: jbeich Date: Tue Aug 14 21:19:45 2012 New Revision: 929 Log: better conflict with upstream Modified: branches/experimental/mail/thunderbird/files/patch-alsapulse branches/experimental/www/firefox-nightly/files/patch-alsapulse branches/experimental/www/firefox/files/patch-alsapulse branches/experimental/www/seamonkey/files/patch-alsapulse Modified: branches/experimental/mail/thunderbird/files/patch-alsapulse ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-alsapulse Tue Aug 14 21:19:35 2012 (r928) +++ branches/experimental/mail/thunderbird/files/patch-alsapulse Tue Aug 14 21:19:45 2012 (r929) @@ -104,10 +104,10 @@ index 599aea2..41fd5af 100644 --- mozilla/media/libcubeb/src/cubeb_alsa.c +++ mozilla/media/libcubeb/src/cubeb_alsa.c -@@ -6,6 +6,7 @@ +@@ -6,6 +6,6 @@ #undef NDEBUG #define _BSD_SOURCE - #define _POSIX_SOURCE +-#define _POSIX_SOURCE +#define _XOPEN_SOURCE 500 #include #include Modified: branches/experimental/www/firefox-nightly/files/patch-alsapulse ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-alsapulse Tue Aug 14 21:19:35 2012 (r928) +++ branches/experimental/www/firefox-nightly/files/patch-alsapulse Tue Aug 14 21:19:45 2012 (r929) @@ -61,10 +61,10 @@ index 599aea2..41fd5af 100644 --- media/libcubeb/src/cubeb_alsa.c +++ media/libcubeb/src/cubeb_alsa.c -@@ -6,6 +6,7 @@ +@@ -6,6 +6,6 @@ #undef NDEBUG #define _BSD_SOURCE - #define _POSIX_SOURCE +-#define _POSIX_SOURCE +#define _XOPEN_SOURCE 500 #include #include Modified: branches/experimental/www/firefox/files/patch-alsapulse ============================================================================== --- branches/experimental/www/firefox/files/patch-alsapulse Tue Aug 14 21:19:35 2012 (r928) +++ branches/experimental/www/firefox/files/patch-alsapulse Tue Aug 14 21:19:45 2012 (r929) @@ -104,10 +104,10 @@ index 599aea2..41fd5af 100644 --- media/libcubeb/src/cubeb_alsa.c +++ media/libcubeb/src/cubeb_alsa.c -@@ -6,6 +6,7 @@ +@@ -6,6 +6,6 @@ #undef NDEBUG #define _BSD_SOURCE - #define _POSIX_SOURCE +-#define _POSIX_SOURCE +#define _XOPEN_SOURCE 500 #include #include Modified: branches/experimental/www/seamonkey/files/patch-alsapulse ============================================================================== --- branches/experimental/www/seamonkey/files/patch-alsapulse Tue Aug 14 21:19:35 2012 (r928) +++ branches/experimental/www/seamonkey/files/patch-alsapulse Tue Aug 14 21:19:45 2012 (r929) @@ -104,10 +104,10 @@ index 599aea2..41fd5af 100644 --- mozilla/media/libcubeb/src/cubeb_alsa.c +++ mozilla/media/libcubeb/src/cubeb_alsa.c -@@ -6,6 +6,7 @@ +@@ -6,6 +6,6 @@ #undef NDEBUG #define _BSD_SOURCE - #define _POSIX_SOURCE +-#define _POSIX_SOURCE +#define _XOPEN_SOURCE 500 #include #include