Date: Tue, 14 Aug 2012 21:19:45 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r929 - in branches/experimental: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files Message-ID: <201208142119.q7ELJjh2093840@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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 <pthread.h> #include <sys/time.h> 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 <pthread.h> #include <sys/time.h> 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 <pthread.h> #include <sys/time.h> 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 <pthread.h> #include <sys/time.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208142119.q7ELJjh2093840>