From owner-freebsd-gecko@FreeBSD.ORG Sun Jun 17 07:30:17 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 79B4A106564A for ; Sun, 17 Jun 2012 07:30:17 +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 DF7E68FC19 for ; Sun, 17 Jun 2012 07:30:16 +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 q5H7UAsS069992 for ; Sun, 17 Jun 2012 07:30:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5H7U5Bg066966 for freebsd-gecko@freebsd.org; Sun, 17 Jun 2012 07:30:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 17 Jun 2012 07:30:05 GMT Message-Id: <201206170730.q5H7U5Bg066966@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] r764 - 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: Sun, 17 Jun 2012 07:30:17 -0000 Author: jbeich Date: Sun Jun 17 07:30:05 2012 New Revision: 764 Log: reduce red paint in about:memory, it's gotten worse in Nightly Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp branches/experimental/www/firefox-nightly/files/patch-memory-mozalloc-mozalloc.cpp branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- mozilla/memory/mozalloc/mozalloc.cpp~ ++++ mozilla/memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || defined(XP_LINUX) ++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) + // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations + // might use a libc that doesn't have malloc_usable_size. Let's fix this + // if/when it happens. Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- mozilla/memory/mozalloc/mozalloc.cpp~ ++++ mozilla/memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) ++#elif defined(MOZ_MEMORY) || defined(__FreeBSD__) + return malloc_usable_size(ptr); + #elif defined(XP_WIN) + return _msize(ptr); Added: branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- mozilla/memory/mozalloc/mozalloc.cpp~ ++++ mozilla/memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || defined(XP_LINUX) ++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) + // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations + // might use a libc that doesn't have malloc_usable_size. Let's fix this + // if/when it happens. Added: branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-beta/files/patch-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- memory/mozalloc/mozalloc.cpp~ ++++ memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || defined(XP_LINUX) ++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) + // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations + // might use a libc that doesn't have malloc_usable_size. Let's fix this + // if/when it happens. Added: branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- memory/mozalloc/mozalloc.cpp~ ++++ memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) ++#elif defined(MOZ_MEMORY) || defined(__FreeBSD__) + return malloc_usable_size(ptr); + #elif defined(XP_WIN) + return _msize(ptr); Added: branches/experimental/www/firefox-nightly/files/patch-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- memory/mozalloc/mozalloc.cpp~ ++++ memory/mozalloc/mozalloc.cpp +@@ -19,6 +19,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(XP_WIN) || (defined(XP_OS2) && defined(__declspec)) + # define MOZALLOC_EXPORT __declspec(dllexport) +@@ -210,7 +213,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) ++#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__) + // Android bionic libc doesn't have malloc_usable_size. + return malloc_usable_size(ptr); + #elif defined(XP_WIN) Added: branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- memory/mozalloc/mozalloc.cpp~ ++++ memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || defined(XP_LINUX) ++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) + // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations + // might use a libc that doesn't have malloc_usable_size. Let's fix this + // if/when it happens. Added: branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- memory/mozalloc/mozalloc.cpp~ ++++ memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) ++#elif defined(MOZ_MEMORY) || defined(__FreeBSD__) + return malloc_usable_size(ptr); + #elif defined(XP_WIN) + return _msize(ptr); Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- mozilla/memory/mozalloc/mozalloc.cpp~ ++++ mozilla/memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || defined(XP_LINUX) ++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) + // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations + // might use a libc that doesn't have malloc_usable_size. Let's fix this + // if/when it happens. Added: branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-memory-mozalloc-mozalloc.cpp Sun Jun 17 07:30:05 2012 (r764) @@ -0,0 +1,21 @@ +--- mozilla/memory/mozalloc/mozalloc.cpp~ ++++ mozilla/memory/mozalloc/mozalloc.cpp +@@ -52,6 +52,9 @@ + #if defined(XP_UNIX) + # include // for valloc on *BSD + #endif //if defined(XP_UNIX) ++#ifdef __FreeBSD__ ++# include // for malloc_usable_size ++#endif + + #if defined(MOZ_MEMORY) + // jemalloc.h doesn't redeclare symbols if they're provided by the OS +@@ -259,7 +262,7 @@ moz_malloc_usable_size(void *ptr) + + #if defined(XP_MACOSX) + return malloc_size(ptr); +-#elif defined(MOZ_MEMORY) || defined(XP_LINUX) ++#elif defined(MOZ_MEMORY) || defined(XP_LINUX) || defined(__FreeBSD__) + // XXX: the |defined(XP_LINUX)| may be too lax; some Linux installations + // might use a libc that doesn't have malloc_usable_size. Let's fix this + // if/when it happens. From owner-freebsd-gecko@FreeBSD.ORG Sun Jun 17 14:42:20 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 D699F106566C for ; Sun, 17 Jun 2012 14:42:20 +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 431848FC0A for ; Sun, 17 Jun 2012 14:42:19 +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 q5HEgIQ7074032 for ; Sun, 17 Jun 2012 14:42:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5HEgDii071891 for freebsd-gecko@freebsd.org; Sun, 17 Jun 2012 14:42:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 17 Jun 2012 14:42:13 GMT Message-Id: <201206171442.q5HEgDii071891@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] r765 - 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 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: Sun, 17 Jun 2012 14:42:20 -0000 Author: jbeich Date: Sun Jun 17 14:42:13 2012 New Revision: 765 Log: Disable glib slice allocator with system jemalloc, too. jemalloc replaced phkmalloc since FreeBSD 7.0-RELEASE. see also bug#431221 Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird3/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n + QApplication app(gArgc, gArgv); + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-beta/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3824,7 +3824,7 @@ XREMain::XRE_main(int argc, char* argv[] + ScopedLogging log; + + #if defined(MOZ_WIDGET_GTK) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n + QApplication app(gArgc, gArgv); + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3133,7 +3133,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Added: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-xre-nsAppRunner.cpp Sun Jun 17 14:42:13 2012 (r765) @@ -0,0 +1,11 @@ +--- mozilla/toolkit/xre/nsAppRunner.cpp~ ++++ mozilla/toolkit/xre/nsAppRunner.cpp +@@ -2998,7 +2998,7 @@ XRE_main(int argc, char* argv[], const n + gQtOnlyArgv[gQtOnlyArgc] = nsnull; + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 11:07:47 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 94ECC1065670 for ; Mon, 18 Jun 2012 11:07:47 +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 659BD8FC18 for ; Mon, 18 Jun 2012 11:07:47 +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 q5IB7l4x007975 for ; Mon, 18 Jun 2012 11:07:47 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5IB7k19007973 for freebsd-gecko@FreeBSD.org; Mon, 18 Jun 2012 11:07:46 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 18 Jun 2012 11:07:46 GMT Message-Id: <201206181107.q5IB7k19007973@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, 18 Jun 2012 11:07:47 -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 18 11:08:11 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 DE94C106566B for ; Mon, 18 Jun 2012 11:08:11 +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 AFE6A8FC1B for ; Mon, 18 Jun 2012 11:08:11 +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 q5IB8BlW008287 for ; Mon, 18 Jun 2012 11:08:11 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5IB8BFY008285 for gecko@FreeBSD.org; Mon, 18 Jun 2012 11:08:11 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 18 Jun 2012 11:08:11 GMT Message-Id: <201206181108.q5IB8BFY008285@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, 18 Jun 2012 11:08:11 -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/168978 gecko mail/thunderbird: /base/nsStackWalk.cpp:1196:29: error 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 30 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 13:42:40 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 9D9E1106566C for ; Mon, 18 Jun 2012 13:42:40 +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 0E9C28FC1C for ; Mon, 18 Jun 2012 13:42:39 +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 q5IDgX3N074120 for ; Mon, 18 Jun 2012 13:42:33 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5IDgRu7073551 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 13:42:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 13:42:27 GMT Message-Id: <201206181342.q5IDgRu7073551@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] r766 - in branches/experimental: Mk 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, 18 Jun 2012 13:42:40 -0000 Author: jbeich Date: Mon Jun 18 13:42:27 2012 New Revision: 766 Log: better sqlite memory reporting Added: branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Sun Jun 17 14:42:13 2012 (r765) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 13:42:27 2012 (r766) @@ -784,6 +784,7 @@ .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ ${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ + ${ECHO_CMD} "malloc_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ ${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ ${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ fi Added: branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp Mon Jun 18 13:42:27 2012 (r766) @@ -0,0 +1,38 @@ +--- storage/src/mozStorageService.cpp~ ++++ storage/src/mozStorageService.cpp +@@ -36,6 +36,25 @@ + #include "mozilla/FunctionTimer.h" + #include "mozilla/Util.h" + ++#if !defined(MOZ_MEMORY) && defined(__FreeBSD__) ++#include ++#include ++ ++#define MOZ_STORAGE_MEMORY ++ ++static inline size_t ++je_malloc_usable_size_in_advance(size_t size) { ++#if __FreeBSD_version > 1000011 ++ size_t ret; ++ if (size == 0) ++ size = 1; ++ if (!nallocm(&ret, size, 0)) ++ return ret; ++#endif ++ return size; ++} ++#endif ++ + namespace { + + class QuotaCallbackData +@@ -497,7 +516,9 @@ Service::shutdown() + sqlite3_vfs *ConstructTelemetryVFS(); + + #ifdef MOZ_STORAGE_MEMORY ++#ifdef MOZ_MEMORY + # include "jemalloc.h" ++#endif + + namespace { + From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 13:43:05 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 65168106567C for ; Mon, 18 Jun 2012 13:43: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 DBCA68FC14 for ; Mon, 18 Jun 2012 13:43:04 +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 q5IDh3CR077464 for ; Mon, 18 Jun 2012 13:43: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 q5IDgwDD075601 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 13:42:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 13:42:58 GMT Message-Id: <201206181342.q5IDgwDD075601@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] r767 - in branches/experimental/www: firefox firefox-beta firefox-esr firefox36 kompozer libxul seamonkey 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: Mon, 18 Jun 2012 13:43:05 -0000 Author: jbeich Date: Mon Jun 18 13:42:58 2012 New Revision: 767 Log: format, remove duplicate and obsolete options --enable-libxul obsolete since 2011/05/23 (bug#638429, bug#648911) --enable-canvas obsolete since 2006/09/27 (bug#353702, bug#513924) --enable-svg obsolete since 2006/09/27 (bug#353702, bug#585020) --enable-svg-renderer obsolete since 2005/10/26 (bug#310957, bug#330516) --enable-system-cairo is handled by bsd.gecko.mk Modified: branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Mon Jun 18 13:42:27 2012 (r766) +++ branches/experimental/www/firefox-beta/Makefile Mon Jun 18 13:42:58 2012 (r767) @@ -46,10 +46,10 @@ FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-svg --enable-svg-renderer=cairo \ --enable-application=browser \ - --enable-official-branding --disable-updater \ - --enable-canvas --enable-libxul --disable-necko-wifi + --enable-official-branding \ + --disable-updater \ + --disable-necko-wifi OPTIONS= PGO "Enable Profile-Guided Optimization" off Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Mon Jun 18 13:42:27 2012 (r766) +++ branches/experimental/www/firefox-esr/Makefile Mon Jun 18 13:42:58 2012 (r767) @@ -47,10 +47,10 @@ FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-svg --enable-svg-renderer=cairo \ --enable-application=browser \ - --enable-official-branding --disable-updater \ - --enable-canvas --enable-libxul --disable-necko-wifi + --enable-official-branding \ + --disable-updater \ + --disable-necko-wifi OPTIONS= PGO "Enable Profile-Guided Optimization" off Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Mon Jun 18 13:42:27 2012 (r766) +++ branches/experimental/www/firefox/Makefile Mon Jun 18 13:42:58 2012 (r767) @@ -46,10 +46,10 @@ FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-svg --enable-svg-renderer=cairo \ --enable-application=browser \ - --enable-official-branding --disable-updater \ - --enable-canvas --enable-libxul --disable-necko-wifi + --enable-official-branding \ + --disable-updater \ + --disable-necko-wifi OPTIONS= PGO "Enable Profile-Guided Optimization" off Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Mon Jun 18 13:42:27 2012 (r766) +++ branches/experimental/www/firefox36/Makefile Mon Jun 18 13:42:58 2012 (r767) @@ -43,11 +43,12 @@ FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-svg --enable-svg-renderer=cairo \ --enable-application=browser \ - --enable-official-branding --disable-updater \ - --enable-canvas --enable-libxul --disable-necko-wifi \ - --disable-ipc + --enable-official-branding \ + --enable-libxul \ + --disable-ipc \ + --disable-updater \ + --disable-necko-wifi .include Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Mon Jun 18 13:42:27 2012 (r766) +++ branches/experimental/www/kompozer/Makefile Mon Jun 18 13:42:58 2012 (r767) @@ -28,8 +28,7 @@ USE_GECKO_OPTIONS=-dbus MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-application=composer \ - --enable-system-cairo + --enable-application=composer PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux DESKTOP_ENTRIES="Kompozer" "${COMMENT}" \ Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jun 18 13:42:27 2012 (r766) +++ branches/experimental/www/libxul/Makefile Mon Jun 18 13:42:58 2012 (r767) @@ -38,8 +38,8 @@ PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --disable-javaxpcom --enable-canvas \ - --enable-system-cairo --disable-updater \ + --disable-javaxpcom \ + --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions OPTIONS= # Empty, used for generic gecko OPTIONS Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 13:42:27 2012 (r766) +++ branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 13:42:58 2012 (r767) @@ -40,13 +40,9 @@ MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-svg \ - --enable-application=suite \ - --enable-svg-renderer=cairo \ - --enable-system-cairo \ - --enable-canvas \ - --disable-necko-wifi \ - --disable-updater + --enable-application=suite \ + --disable-updater \ + --disable-necko-wifi USE_MOZILLA= -nss -dbm USE_GECKO_OPTIONS=+smb Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Jun 18 13:42:27 2012 (r766) +++ branches/experimental/www/seamonkey/Makefile Mon Jun 18 13:42:58 2012 (r767) @@ -40,13 +40,9 @@ MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-svg \ - --enable-application=suite \ - --enable-svg-renderer=cairo \ - --enable-system-cairo \ - --enable-canvas \ - --disable-necko-wifi \ - --disable-updater + --enable-application=suite \ + --disable-updater \ + --disable-necko-wifi USE_MOZILLA= -nss -dbm USE_GECKO_OPTIONS=+smb From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 13:43:19 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 8CD301065677 for ; Mon, 18 Jun 2012 13:43:19 +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 1A5478FC17 for ; Mon, 18 Jun 2012 13:43:18 +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 q5IDhIC9078955 for ; Mon, 18 Jun 2012 13:43:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5IDhDLf078579 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 13:43:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 13:43:13 GMT Message-Id: <201206181343.q5IDhDLf078579@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] r768 - 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, 18 Jun 2012 13:43:19 -0000 Author: jbeich Date: Mon Jun 18 13:43:12 2012 New Revision: 768 Log: remove obsolete options bsd.gecko.mk --disable-bidi obsolete since 2003/01/06 (bug#89203) --disable-mathml obsolete since 2011/06/02 (bug#109826, bug#660762) --disable-xprint obsolete since 2007/06/13 (bug#326716) --enable-xinerama obsolete since 2007/04/10 (bug#376658, bug#318331) --enable-crypto obsolete since 2004/12/01 (bug#272189) no opposite option existed for: --disable-double-buffer obsolete 2002/09/23 (bug#169483) --enable-cpp-exceptions obsolete since 2011/10/21 (bug#593768) --enable-cpp-rtti obsolete since 2012/06/08 (bug#762071) --enable-xterm-updates was disabled by default since eons Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 13:42:58 2012 (r767) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 13:43:12 2012 (r768) @@ -634,8 +634,7 @@ # Standard options from README MOZ_TOOLKIT?= gtk2 -MOZ_OPTIONS+= --enable-crypto \ - --disable-tests \ +MOZ_OPTIONS+= --disable-tests \ --enable-default-toolkit=${MOZ_TOOLKIT} \ --with-pthreads # Configure options for install @@ -656,20 +655,12 @@ --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 + --disable-pedantic MOZ_MK_OPTIONS+= XP_UNIX=1 \ PERL=${PERL} From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 13:44:01 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 D734F106564A for ; Mon, 18 Jun 2012 13:44:01 +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 569B88FC14 for ; Mon, 18 Jun 2012 13:44:01 +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 q5IDi0WS082666 for ; Mon, 18 Jun 2012 13:44:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5IDht5e080174 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 13:43:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 13:43:55 GMT Message-Id: <201206181343.q5IDht5e080174@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] r769 - 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: Mon, 18 Jun 2012 13:44:01 -0000 Author: jbeich Date: Mon Jun 18 13:43:54 2012 New Revision: 769 Log: setting MOZ_TOOLKIT should be an exception, not mandatory 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 18 13:43:12 2012 (r768) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 13:43:54 2012 (r769) @@ -485,7 +485,7 @@ # probably want to set MAKE_ENV+=${MOZ_EXPORT} # # MOZ_TOOLKIT A variable for the --enable-default-toolkit= in -# CONFIGURE_ARGS. The default is gtk2. +# CONFIGURE_ARGS. The default is cairo-gtk2. # # MOZ_EXTENSIONS A list of extensions to build # @@ -633,7 +633,7 @@ .endfor # Standard options from README -MOZ_TOOLKIT?= gtk2 +MOZ_TOOLKIT?= cairo-gtk2 MOZ_OPTIONS+= --disable-tests \ --enable-default-toolkit=${MOZ_TOOLKIT} \ --with-pthreads Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/mail/thunderbird-beta/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -26,7 +26,6 @@ USE_GECKO= gecko CONFLICTS= thunderbird-10.* USE_MOZILLA= -nss -dbm -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -27,7 +27,6 @@ USE_GECKO= gecko CONFLICTS= thunderbird-1[1-9].* USE_MOZILLA= -nss -dbm -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/mail/thunderbird/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -26,7 +26,6 @@ USE_GECKO= gecko CONFLICTS= thunderbird-10.* USE_MOZILLA= -nss -dbm -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/mail/thunderbird3/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -22,7 +22,6 @@ LATEST_LINK= thunderbird3 USE_GECKO= gecko USE_MOZILLA= -nss -dbm -event -ffi -vpx -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/www/firefox-beta/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -30,7 +30,6 @@ MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -nss -dbm MOZILLA_NAME= Firefox -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/www/firefox-esr/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -31,7 +31,6 @@ MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -nss -dbm MOZILLA_NAME= Firefox -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/www/firefox-nightly/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -33,7 +33,6 @@ MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/www/firefox/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -30,7 +30,6 @@ MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -nss -dbm MOZILLA_NAME= Firefox -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/www/firefox36/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -28,7 +28,6 @@ MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= 3 MOZILLA= ${PORTNAME}${MOZILLA_SUFX} -MOZ_TOOLKIT= cairo-gtk2 MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/www/libxul/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -46,7 +46,6 @@ USE_GECKO_OPTIONS=+java USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner -MOZ_TOOLKIT= cairo-gtk2 USE_MOZILLA= -nss -dbm MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js mozilla-nss \ mozilla-plugin Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -46,7 +46,6 @@ USE_MOZILLA= -nss -dbm USE_GECKO_OPTIONS=+smb -MOZ_TOOLKIT= cairo-gtk2 MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Jun 18 13:43:12 2012 (r768) +++ branches/experimental/www/seamonkey/Makefile Mon Jun 18 13:43:54 2012 (r769) @@ -46,7 +46,6 @@ USE_MOZILLA= -nss -dbm USE_GECKO_OPTIONS=+smb -MOZ_TOOLKIT= cairo-gtk2 MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 13:57:20 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 DE6DC106566B for ; Mon, 18 Jun 2012 13:57:20 +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 527918FC14 for ; Mon, 18 Jun 2012 13:57: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 q5IDvJEH024960 for ; Mon, 18 Jun 2012 13:57: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 q5IDvEdU024024 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 13:57:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 13:57:14 GMT Message-Id: <201206181357.q5IDvEdU024024@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] r770 - in branches/experimental/www: seamonkey 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: Mon, 18 Jun 2012 13:57:20 -0000 Author: jbeich Date: Mon Jun 18 13:57:13 2012 New Revision: 770 Log: --enable-glitz obsolete since 2008/09/30 (bug#445321) Modified: branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 13:43:54 2012 (r769) +++ branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 13:57:13 2012 (r770) @@ -32,7 +32,6 @@ MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -CPPFLAGS+= -I${LOCALBASE}/include/cairo USE_GCC= 4.2+ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -78,12 +77,6 @@ MOZ_OPTIONS+= --disable-gnomeui .endif -.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) -# Glitz support can only be enabled if cairo is built with glitz support -MOZ_OPTIONS+= --enable-glitz -LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz -.endif - .if defined(WITHOUT_MAILNEWS) EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ ${FILESDIR}/extra-patch-configure.in Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Jun 18 13:43:54 2012 (r769) +++ branches/experimental/www/seamonkey/Makefile Mon Jun 18 13:57:13 2012 (r770) @@ -32,7 +32,6 @@ MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -CPPFLAGS+= -I${LOCALBASE}/include/cairo USE_GCC= 4.2+ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -78,12 +77,6 @@ MOZ_OPTIONS+= --disable-gnomeui .endif -.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) -# Glitz support can only be enabled if cairo is built with glitz support -MOZ_OPTIONS+= --enable-glitz -LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz -.endif - .if defined(WITHOUT_MAILNEWS) EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \ ${FILESDIR}/extra-patch-configure.in From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 13:59:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 44C6D1065673 for ; Mon, 18 Jun 2012 13:59: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 907C18FC18 for ; Mon, 18 Jun 2012 13:59: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 q5IDxZpa029735 for ; Mon, 18 Jun 2012 13:59: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 q5IDxUZx028387 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 13:59:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 13:59:30 GMT Message-Id: <201206181359.q5IDxUZx028387@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] r771 - in branches/experimental/www/libxul19: . 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, 18 Jun 2012 13:59:37 -0000 Author: jbeich Date: Mon Jun 18 13:59:30 2012 New Revision: 771 Log: add/sync a port for libxul as it's in CVS Added: branches/experimental/www/libxul19/ - copied from r765, trunk/www/libxul/ branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp - copied unchanged from r765, branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp branches/experimental/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in - copied unchanged from r765, branches/experimental/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in Modified: branches/experimental/www/libxul19/Makefile branches/experimental/www/libxul19/files/patch-configure.in branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- trunk/www/libxul/Makefile Sun Jun 17 14:42:13 2012 (r765) +++ branches/experimental/www/libxul19/Makefile Mon Jun 18 13:59:30 2012 (r771) @@ -20,7 +20,7 @@ GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ lib/${MOZILLA}/include lib/${MOZILLA}/lib -USE_AUTOTOOLS= autoconf213 +USE_AUTOTOOLS= autoconf213:env WANT_GNOME= yes WANT_PERL= yes ALL_TARGET= default @@ -34,21 +34,19 @@ PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --disable-javaxpcom --enable-canvas \ - --enable-system-cairo --disable-updater \ - --disable-necko-wifi --disable-ipc + --disable-javaxpcom \ + --disable-ipc \ + --disable-updater \ + --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions OPTIONS= # Empty, used for generic gecko OPTIONS -USE_GECKO_OPTIONS= java debug logging optimized_cflags +USE_GECKO_OPTIONS=+java USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner -MOZ_TOOLKIT= cairo-gtk2 -USE_MOZILLA= -png -nss -dbm -jpeg +USE_MOZILLA= -nss -dbm -event -ffi -vpx MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-gtkmozembed-embedding \ mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin -OPTIONS= DBUS "Enable D-BUS support" on - .include .if ${OSVERSION} < 700000 @@ -67,13 +65,6 @@ .endif .endif -.if defined(WITHOUT_DBUS) -MOZ_OPTIONS+= --disable-dbus --disable-libnotify -.else -LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.4:${PORTSDIR}/devel/libnotify -.endif - post-patch: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ @@ -87,6 +78,7 @@ ${WRKSRC}/js/src/configure pre-configure: + (cd ${WRKSRC} && ${AUTOCONF}) (cd ${WRKSRC}/js/src/ && ${AUTOCONF}) post-build: Copied: branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in (from r765, branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in Mon Jun 18 13:59:30 2012 (r771, copy of r765, branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in) @@ -0,0 +1,16 @@ +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -46,10 +46,12 @@ + #else + @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ + #endif ++#ifndef MOZ_NATIVE_NSPR + @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ +-@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ ++#endif ++@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ + #ifdef XP_MACOSX + @BINPATH@/XUL + #else Modified: branches/experimental/www/libxul19/files/patch-configure.in ============================================================================== --- trunk/www/libxul/files/patch-configure.in Sun Jun 17 14:42:13 2012 (r765) +++ branches/experimental/www/libxul19/files/patch-configure.in Mon Jun 18 13:59:30 2012 (r771) @@ -20,3 +20,13 @@ _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" AC_CACHE_CHECK( +@@ -4252,6 +4252,9 @@ else + NSPR_LIBS='`$(LIBXUL_DIST)/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 ======================================================== Copied: branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp (from r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp Mon Jun 18 13:59:30 2012 (r771, copy of r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp) @@ -0,0 +1,74 @@ +--- modules/libpr0n/decoders/png/nsPNGDecoder.cpp.orig 2009-05-02 18:39:49.000000000 +0200 ++++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp 2012-05-09 13:14:57.000000000 +0200 +@@ -116,7 +116,7 @@ void nsPNGDecoder::CreateFrame(png_uint_ + nsresult rv = mImage->AppendFrame(x_offset, y_offset, width, height, format, + &mImageData, &imageDataLength); + if (NS_FAILED(rv)) +- longjmp(mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY ++ longjmp(png_jmpbuf(mPNG), 5); // NS_ERROR_OUT_OF_MEMORY + + mFrameRect.x = x_offset; + mFrameRect.y = y_offset; +@@ -376,7 +376,7 @@ static NS_METHOD ReadDataOut(nsIInputStr + } + + // we need to do the setjmp here otherwise bad things will happen +- if (setjmp(decoder->mPNG->jmpbuf)) { ++ if (setjmp(png_jmpbuf(decoder->mPNG))) { + png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL); + + decoder->mError = PR_TRUE; +@@ -443,7 +443,8 @@ PNGGetColorProfile(png_structp png_ptr, + // First try to see if iCCP chunk is present + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) { + png_uint_32 profileLen; +- char *profileData, *profileName; ++ unsigned char *profileData; ++ char *profileName; + int compression; + + png_get_iCCP(png_ptr, info_ptr, &profileName, &compression, +@@ -551,7 +552,7 @@ info_callback(png_structp png_ptr, png_i + /* limit image dimensions (bug #251381) */ + #define MOZ_PNG_MAX_DIMENSION 1000000L + if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION) +- longjmp(decoder->mPNG->jmpbuf, 1); ++ longjmp(png_jmpbuf(decoder->mPNG), 1); + #undef MOZ_PNG_MAX_DIMENSION + + if (color_type == PNG_COLOR_TYPE_PALETTE) +@@ -667,7 +668,7 @@ info_callback(png_structp png_ptr, png_i + // the image hasn't been inited yet + decoder->mImage->Init(width, height, decoder->mObserver); + } else if (containerWidth != PRInt32(width) || containerHeight != PRInt32(height)) { +- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_UNEXPECTED ++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_UNEXPECTED + } + + if (decoder->mObserver) +@@ -693,14 +694,14 @@ info_callback(png_structp png_ptr, png_i + decoder->mCMSLine = + (PRUint8 *)nsMemory::Alloc(bpp[channels] * width); + if (!decoder->mCMSLine) +- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY ++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY + } + + if (interlace_type == PNG_INTERLACE_ADAM7) { + if (height < PR_INT32_MAX / (width * channels)) + decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels * width * height); + if (!decoder->interlacebuf) { +- longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY ++ longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY + } + } + +@@ -920,7 +921,7 @@ void + error_callback(png_structp png_ptr, png_const_charp error_msg) + { + PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg)); +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + Copied: branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp (from r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul19/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp Mon Jun 18 13:59:30 2012 (r771, copy of r765, branches/experimental/www/firefox36/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp) @@ -0,0 +1,11 @@ +--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-03-28 13:48:53.000000000 +0200 ++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-03-28 13:46:50.000000000 +0200 +@@ -135,7 +135,7 @@ NS_IMETHODIMP nsPNGEncoder::StartImageEn + + // initialize + mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, ++ NULL, + ErrorCallback, + ErrorCallback); + if (! mPNG) Copied: branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile (from r765, branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul19/files/patch-security-nss-lib-Makefile Mon Jun 18 13:59:30 2012 (r771, copy of r765, branches/experimental/www/firefox36/files/patch-security-nss-lib-Makefile) @@ -0,0 +1,11 @@ +--- security/nss/lib/Makefile~ ++++ security/nss/lib/Makefile +@@ -63,7 +63,7 @@ ZLIB_SRCDIR = zlib # Add the zlib direc + endif + + ifndef MOZILLA_CLIENT +-ifndef NSS_USE_SYSTEM_SQLITE ++ifndef MOZ_NATIVE_SQLITE + SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS. + endif + endif Modified: branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk ============================================================================== --- trunk/www/libxul/files/patch-security_coreconf_FreeBSD.mk Sun Jun 17 14:42:13 2012 (r765) +++ branches/experimental/www/libxul19/files/patch-security_coreconf_FreeBSD.mk Mon Jun 18 13:59:30 2012 (r771) @@ -1,18 +1,46 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-06-26 07:29:06.000000000 +0200 -+++ security/coreconf/FreeBSD.mk 2010-07-18 13:25:06.000000000 +0200 -@@ -49,9 +49,6 @@ +--- security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 ++++ security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 +@@ -49,8 +49,24 @@ ifeq ($(CPU_ARCH),pc98) CPU_ARCH = x86 endif -ifeq ($(CPU_ARCH),amd64) -CPU_ARCH = x86_64 --endif ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++endif ++ifeq ($(OS_TEST),amd64) ++CPU_ARCH = amd64 ++endif ++ifeq ($(OS_TEST),ia64) ++CPU_ARCH = ia64 ++endif ++ifeq ($(OS_TEST),powerpc64) ++CPU_ARCH = powerpc ++USE_64 = 1 ++endif ++ifeq ($(OS_TEST),powerpc) ++CPU_ARCH = powerpc ++endif ++ifeq ($(OS_TEST),sparc64) ++CPU_ARCH = sparc64 + endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK +@@ -78,7 +90,7 @@ + DLL_SUFFIX = so.1.0 + endif -@@ -87,4 +84,4 @@ +-MKSHLIB = $(CC) $(DSO_LDOPTS) ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ + ifdef MAPFILE + MKSHLIB += -Wl,--version-script,$(MAPFILE) + endif +@@ -87,4 +99,6 @@ G++INCLUDES = -I/usr/include/g++ -INCLUDES += -I/usr/X11R6/include -+#INCLUDES += -I/usr/X11R6/include ++USE_SYSTEM_ZLIB = 1 ++ZLIB_LIBS = -lz ++INCLUDES += -I$(LOCALBASE)/include Copied: branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp (from r765, branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul19/files/patch-toolkit-xre-nsAppRunner.cpp Mon Jun 18 13:59:30 2012 (r771, copy of r765, branches/experimental/www/firefox36/files/patch-toolkit-xre-nsAppRunner.cpp) @@ -0,0 +1,11 @@ +--- toolkit/xre/nsAppRunner.cpp~ ++++ toolkit/xre/nsAppRunner.cpp +@@ -3046,7 +3046,7 @@ XRE_main(int argc, char* argv[], const n + QApplication app(gArgc, gArgv); + #endif + #if defined(MOZ_WIDGET_GTK2) +-#ifdef MOZ_MEMORY ++#if defined(MOZ_MEMORY) || defined(__FreeBSD__) + // Disable the slice allocator, since jemalloc already uses similar layout + // algorithms, and using a sub-allocator tends to increase fragmentation. + // This must be done before g_thread_init() is called. Modified: branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp ============================================================================== --- trunk/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp Sun Jun 17 14:42:13 2012 (r765) +++ branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp Mon Jun 18 13:59:30 2012 (r771) @@ -9,3 +9,11 @@ #include #endif +@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb + + #elif defined(HAVE__UNWIND_BACKTRACE) + ++#define _GNU_SOURCE + // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 + #include + Copied: branches/experimental/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in (from r765, branches/experimental/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul19/files/patch-xulrunner_installer_libxul-embedding.pc.in Mon Jun 18 13:59:30 2012 (r771, copy of r765, branches/experimental/www/libxul/files/patch-xulrunner_installer_libxul-embedding.pc.in) @@ -0,0 +1,9 @@ +--- xulrunner/installer/libxul-embedding.pc.in~ ++++ xulrunner/installer/libxul-embedding.pc.in +@@ -6,5 +6,5 @@ idldir=%idldir% + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% +-Libs: -L${sdkdir}/lib -lxpcomglue -ldl ++Libs: -L${sdkdir}/lib -L%%MOZ_LIBDIR%% -lxpcomglue + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 14:09:44 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 18AEB106566C for ; Mon, 18 Jun 2012 14:09:44 +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 8E1838FC15 for ; Mon, 18 Jun 2012 14:09:43 +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 q5IE9goS056475 for ; Mon, 18 Jun 2012 14:09:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5IE9b5F055887 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 14:09:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 14:09:37 GMT Message-Id: <201206181409.q5IE9b5F055887@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] r772 - in branches/experimental: Mk www/libxul www/libxul19 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, 18 Jun 2012 14:09:44 -0000 Author: jbeich Date: Mon Jun 18 14:09:37 2012 New Revision: 772 Log: --enable-javaxpcom obsolete since 2011/04/08 (bug#648593) Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 13:59:30 2012 (r771) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 14:09:37 2012 (r772) @@ -554,7 +554,6 @@ _USE_GECKO_OPTIONS_DEFAULT= dbus debug logging optimized_cflags -JAVA_DESC?= Enable JAVA xpcom LOGGING_DESC?= Enable additional log messages SMB?= Enable smb:// URI support using gnomevfs @@ -698,14 +697,6 @@ MOZ_OPTIONS+= --disable-debug .endif -.if ${PORT_OPTIONS:MJAVA} && defined(_WITH_JAVA) -USE_JAVA= yes -JAVA_VERSION+= 1.5+ -JAVA_OS+= native -CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" -MOZ_OPTIONS+= --enable-javaxpcom -.endif - .if ${PORT_OPTIONS:MLOGGING} MOZ_OPTIONS+= --enable-logging .else Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jun 18 13:59:30 2012 (r771) +++ branches/experimental/www/libxul/Makefile Mon Jun 18 14:09:37 2012 (r772) @@ -38,12 +38,10 @@ PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --disable-javaxpcom \ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions OPTIONS= # Empty, used for generic gecko OPTIONS -USE_GECKO_OPTIONS=+java USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= -nss -dbm Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Mon Jun 18 13:59:30 2012 (r771) +++ branches/experimental/www/libxul19/Makefile Mon Jun 18 14:09:37 2012 (r772) @@ -34,19 +34,20 @@ PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --disable-javaxpcom \ --disable-ipc \ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions OPTIONS= # Empty, used for generic gecko OPTIONS -USE_GECKO_OPTIONS=+java USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= -nss -dbm -event -ffi -vpx MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-gtkmozembed-embedding \ mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin +OPTIONS_DEFINE= JAVA +JAVA_DESC= Enable JAVA xpcom + .include .if ${OSVERSION} < 700000 @@ -65,6 +66,16 @@ .endif .endif +.if ${PORT_OPTIONS:MJAVA} && defined(_WITH_JAVA) +USE_JAVA= yes +JAVA_VERSION+= 1.5+ +JAVA_OS+= native +CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" +MOZ_OPTIONS+= --enable-javaxpcom +.else +MOZ_OPTIONS+= --disable-javaxpcom +.endif + post-patch: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in \ From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 14:17:33 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 BD89C106564A for ; Mon, 18 Jun 2012 14:17:33 +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 484558FC08 for ; Mon, 18 Jun 2012 14:17:33 +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 q5IEHWYT082158 for ; Mon, 18 Jun 2012 14:17:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5IEHRGD081900 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 14:17:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 14:17:27 GMT Message-Id: <201206181417.q5IEHRGD081900@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] r773 - branches/experimental/www/libxul19/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, 18 Jun 2012 14:17:33 -0000 Author: jbeich Date: Mon Jun 18 14:17:27 2012 New Revision: 773 Log: remove libc++ patch that slipped in from libxul-10.0.2 port Modified: branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp Modified: branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp ============================================================================== --- branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp Mon Jun 18 14:09:37 2012 (r772) +++ branches/experimental/www/libxul19/files/patch-xpcom_base_nsStackWalk.cpp Mon Jun 18 14:17:27 2012 (r773) @@ -9,11 +9,3 @@ #include #endif -@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb - - #elif defined(HAVE__UNWIND_BACKTRACE) - -+#define _GNU_SOURCE - // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 - #include - From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 18:53:47 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 CE2ED106564A for ; Mon, 18 Jun 2012 18:53:47 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 74C008FC1D for ; Mon, 18 Jun 2012 18:53:47 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q5IIrexV036439 for ; Mon, 18 Jun 2012 14:53:45 -0400 (EDT) (envelope-from andy@neu.net) Date: Mon, 18 Jun 2012 14:53:40 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org In-Reply-To: <201206161842.q5GIgUGw083861@trillian.chruetertee.ch> Message-ID: References: <201206161842.q5GIgUGw083861@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Spam-Status: No, score=-0.0 required=5.0 tests=T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Subject: Re: [SVN-Commit] r763 - in branches/experimental/www/firefox-nightly: . 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: Mon, 18 Jun 2012 18:53:47 -0000 On Sat, 16 Jun 2012, svn-freebsd-gecko@chruetertee.ch wrote: > 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 > - > _______________________________________________ > freebsd-gecko@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-gecko > To unsubscribe, send any mail to "freebsd-gecko-unsubscribe@freebsd.org" > FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #21 r236721: Thu Jun 7 15:52:12 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64 [root@FBSD10 /home/root/ff_nightly]# make clean ===> Cleaning for firefox-nightly-16.0.96890,1 [root@FBSD10 /home/root/ff_nightly]# make ===> License check disabled, port has not defined LICENSE ===> Found saved configuration for firefox-nightly-16.0.96339,1 ===> Extracting for firefox-nightly-16.0.96890,1 => SHA256 Checksum OK for firefox-nightly/9602a9e99045.tar.bz2. ===> firefox-nightly-16.0.96890,1 depends on file: /usr/local/bin/perl5.14.2 - found ===> Patching for firefox-nightly-16.0.96890,1 ===> firefox-nightly-16.0.96890,1 depends on file: /usr/local/bin/perl5.14.2 - found ===> Applying FreeBSD patches for firefox-nightly-16.0.96890,1 File to patch: No file found--skip this patch? [n] File to patch: No file found--skip this patch? [n] y 1 out of 1 hunks ignored--saving rejects to media/libvpx/vpx_config_c.c.rej Can't create media/libvpx/vpx_config_c.c.rej, output is in /tmp//patchrkxIfXf: No such file or directory => Patch patch-media-libvpx-vpx_config.c failed to apply cleanly. => Patch(es) patch-browser-app-nsBrowserApp.cpp patch-build-pgo-profileserver.py patch-build_unix_run-mozilla.sh patch-config_autoconf.mk.in patch-config_config.mk patch-config_mkdepend_Makefile.in patch-configure.in patch-content__base__public__nsContentUtils.h patch-db_sqlite3_src_Makefile.in patch-dom-plugins-ipc-PluginMessageUtils.cpp patch-dom-system-OSFileConstants.cpp patch-gfx-qcms-Makefile.in patch-gfx-qcms-qcmstypes.h patch-gfx-thebes-gfxPlatform.cpp patch-gfx-ycbcr-Makefile.in patch-ipc-chromium-Makefile.in patch-ipc-chromium-src-base-atomicops_internals_mutex.cc patch-ipc-chromium-src-base-dir_reader_linux.h patch-ipc-chromium-src-base-file_util_linux.cc patch-ipc-chromium-src-base-file_util_posix.cc patch-ipc-chromium-src-base-message_pump_libevent.cc patch-ipc-chromium-src-base-platform_file_posix.cc patch-ipc-chromium-src-base-platform_thread_posix.cc patch-ipc-chromium-src-base-time_posix.cc patch-ipc-chromium-src-build-build_config.h patch-js-src-Makefile.in patch-js-src-config-mkdepend_Makefile.in patch-js-src-config_config.mk patch-js-src-configure.in patch-js-src-jscpucfg.h patch-js-src-methodjit-MethodJIT.cpp patch-js_src_jsnum.cpp patch-layout_generic_Makefile.in applied cleanly. *** [do-patch] Error code 1 Stop in /home/root/ff_nightly. *** [build] Error code 1 Stop in /home/root/ff_nightly. From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 19:18:15 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 AB687106566B for ; Mon, 18 Jun 2012 19:18:15 +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 7A5178FC1B for ; Mon, 18 Jun 2012 19:18:15 +0000 (UTC) Received: from exit-01c.noisetor.net ([173.254.216.68]:29969 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1SghSO-002hPq-Ux; Mon, 18 Jun 2012 15:18:00 -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=FQyhGCQC0oHOJP0BPP2WrngDfAHQDXCtg4V5Zs6KOtw=; b=U2G5XFZeyZ49JWUA425WWL2WBftfoI92K/AIQcdcn2To2FX8EUAcAn4L2Nc1pM1VdD9wpFa+9fJIgC3Gs6z0BipW2HEvgZrdjMNBl0qZ2Crw1/flm/sqxHaGVTbGVkOWa8+xgDjdmkTL8OHi4LwcMRCpTBqB1XRrcZA9nNStTy4=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1SghRM-0008jw-Gm; Mon, 18 Jun 2012 19:16:47 +0000 From: Jan Beich To: AN In-Reply-To: (AN's message of "Mon, 18 Jun 2012 14:53:40 -0400 (EDT)") Date: Tue, 19 Jun 2012 04:16:41 +0900 References: <201206161842.q5GIgUGw083861@trillian.chruetertee.ch> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1SghRM-0008jw-Gm@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-Commit] r763 - in branches/experimental/www/firefox-nightly: . 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: Mon, 18 Jun 2012 19:18:15 -0000 AN writes: > On Sat, 16 Jun 2012, svn-freebsd-gecko@chruetertee.ch wrote: > >> 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 [...] > ===> Applying FreeBSD patches for firefox-nightly-16.0.96890,1 > File to patch: > No file found--skip this patch? [n] > File to patch: > No file found--skip this patch? [n] y > 1 out of 1 hunks ignored--saving rejects to > media/libvpx/vpx_config_c.c.rej > Can't create media/libvpx/vpx_config_c.c.rej, output is in > /tmp//patchrkxIfXf: No such file or directory > => Patch patch-media-libvpx-vpx_config.c failed to apply cleanly. I've commented out vpx_EXTRACT_AFTER_ARGS in r761. Mk/bsd.gecko.mk and firefox-nightly should be in sync. From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 20:32:17 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 B4BB51065670 for ; Mon, 18 Jun 2012 20:32:17 +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 285C68FC0A for ; Mon, 18 Jun 2012 20:32:16 +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 q5IKWFEI075053 for ; Mon, 18 Jun 2012 20:32:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5IKWAPs074581 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 20:32:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 20:32:10 GMT Message-Id: <201206182032.q5IKWAPs074581@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] r774 - in branches/experimental: Mk www/libxul www/libxul19 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, 18 Jun 2012 20:32:17 -0000 Author: jbeich Date: Mon Jun 18 20:32:10 2012 New Revision: 774 Log: libxul19: connect and conflict Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 14:17:27 2012 (r773) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 20:32:10 2012 (r774) @@ -14,7 +14,7 @@ # WITH_GECKO= libxul # # The valid backends are: -# libxul +# libxul libxul19 # # See below for more details. # ======================= /USERS ================================ @@ -80,9 +80,10 @@ # ${MOZSRC}/configure # .endif -_GECKO_ALL= libxul +_GECKO_ALL= libxul libxul19 libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so +libxul19_PLIST= ${LOCALBASE}/lib/libxul/libxul.so .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jun 18 14:17:27 2012 (r773) +++ branches/experimental/www/libxul/Makefile Mon Jun 18 20:32:10 2012 (r774) @@ -21,7 +21,7 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo WRKSRC= ${WRKDIR}/mozilla-release -CONFLICTS= mozilla-[0-9]* +CONFLICTS= mozilla-[0-9]* libxul-1.9.* USE_AUTOTOOLS= autoconf213:env WANT_GNOME= yes Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Mon Jun 18 14:17:27 2012 (r773) +++ branches/experimental/www/libxul19/Makefile Mon Jun 18 20:32:10 2012 (r774) @@ -16,7 +16,7 @@ COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps WRKSRC= ${WRKDIR}/mozilla-1.9.2 -CONFLICTS= mozilla-[0-9]* +CONFLICTS= mozilla-[0-9]* libxul-[0-9][0-9].* GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ lib/${MOZILLA}/include lib/${MOZILLA}/lib From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 20:32:46 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 3ED17106566C for ; Mon, 18 Jun 2012 20:32: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 BFA7C8FC12 for ; Mon, 18 Jun 2012 20:32: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 q5IKWiUK076195 for ; Mon, 18 Jun 2012 20:32: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 q5IKWdKi075961 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 20:32:39 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 20:32:39 GMT Message-Id: <201206182032.q5IKWdKi075961@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] r775 - branches/experimental/www/libxul19 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, 18 Jun 2012 20:32:46 -0000 Author: jbeich Date: Mon Jun 18 20:32:39 2012 New Revision: 775 Log: remove _WITH_JAVA[1], it builds fine [1] remnant from ports/105315 and r733 Modified: branches/experimental/www/libxul19/Makefile Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Mon Jun 18 20:32:10 2012 (r774) +++ branches/experimental/www/libxul19/Makefile Mon Jun 18 20:32:39 2012 (r775) @@ -66,7 +66,7 @@ .endif .endif -.if ${PORT_OPTIONS:MJAVA} && defined(_WITH_JAVA) +.if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION+= 1.5+ JAVA_OS+= native From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 20:34:27 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 6D23E106564A for ; Mon, 18 Jun 2012 20:34:27 +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 E6AFB8FC08 for ; Mon, 18 Jun 2012 20:34:26 +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 q5IKYPoS093573 for ; Mon, 18 Jun 2012 20:34:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5IKYKjg091076 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 20:34:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 20:34:20 GMT Message-Id: <201206182034.q5IKYKjg091076@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] r776 - in branches/experimental: 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/libxul19 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: Mon, 18 Jun 2012 20:34:27 -0000 Author: jbeich Date: Mon Jun 18 20:34:20 2012 New Revision: 776 Log: followup to r750, USE_AUTOTOOLS implies GNU_CONFIGURE Modified: 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/libxul19/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/mail/thunderbird-beta/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -32,7 +32,7 @@ ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -33,7 +33,7 @@ ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/mail/thunderbird/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -32,7 +32,7 @@ ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/mail/thunderbird3/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -28,7 +28,7 @@ ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/firefox-beta/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -35,7 +35,7 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/firefox-esr/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -36,7 +36,7 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/firefox-nightly/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -38,7 +38,7 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/firefox/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -35,7 +35,7 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/firefox36/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -33,7 +33,7 @@ WANT_GNOME= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes NO_MOZPKGINSTALL=yes Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/libxul/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -27,7 +27,7 @@ WANT_GNOME= yes WANT_PERL= yes ALL_TARGET= default -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/libxul19/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -24,7 +24,7 @@ WANT_GNOME= yes WANT_PERL= yes ALL_TARGET= default -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -26,7 +26,7 @@ USE_GECKO= gecko WANT_GNOME= yes WANT_PERL= yes -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes ALL_TARGET= default USE_GL= gl MAKE_JOBS_SAFE= yes Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Jun 18 20:32:39 2012 (r775) +++ branches/experimental/www/seamonkey/Makefile Mon Jun 18 20:34:20 2012 (r776) @@ -26,7 +26,7 @@ USE_GECKO= gecko WANT_GNOME= yes WANT_PERL= yes -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes ALL_TARGET= default USE_GL= gl MAKE_JOBS_SAFE= yes From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 06:40:17 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 917C0106566C for ; Tue, 19 Jun 2012 06:40:17 +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 2CA4A8FC08 for ; Tue, 19 Jun 2012 06:40:16 +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 q5J6eEHe019801 for ; Tue, 19 Jun 2012 06:40:14 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5J6e96J018563 for freebsd-gecko@freebsd.org; Tue, 19 Jun 2012 06:40:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Jun 2012 06:40:09 GMT Message-Id: <201206190640.q5J6e96J018563@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] r777 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-esr 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, 19 Jun 2012 06:40:17 -0000 Author: jbeich Date: Tue Jun 19 06:40:09 2012 New Revision: 777 Log: require recent version of sqlite Modified: branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Mon Jun 18 20:34:20 2012 (r776) +++ branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 19 06:40:09 2012 (r777) @@ -16,6 +16,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 18 20:34:20 2012 (r776) +++ branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 19 06:40:09 2012 (r777) @@ -16,6 +16,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Mon Jun 18 20:34:20 2012 (r776) +++ branches/experimental/mail/thunderbird/Makefile Tue Jun 19 06:40:09 2012 (r777) @@ -16,6 +16,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ + sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jun 18 20:34:20 2012 (r776) +++ branches/experimental/www/libxul/Makefile Tue Jun 19 06:40:09 2012 (r777) @@ -16,6 +16,7 @@ COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ + sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 20:34:20 2012 (r776) +++ branches/experimental/www/seamonkey-beta/Makefile Tue Jun 19 06:40:09 2012 (r777) @@ -16,6 +16,7 @@ COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Jun 18 20:34:20 2012 (r776) +++ branches/experimental/www/seamonkey/Makefile Tue Jun 19 06:40:09 2012 (r777) @@ -16,6 +16,7 @@ COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 06:41:19 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 1508E1065674 for ; Tue, 19 Jun 2012 06:41:19 +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 883488FC16 for ; Tue, 19 Jun 2012 06:41:18 +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 q5J6fHaj021661 for ; Tue, 19 Jun 2012 06:41:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5J6fCRZ020883 for freebsd-gecko@freebsd.org; Tue, 19 Jun 2012 06:41:12 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Jun 2012 06:41:12 GMT Message-Id: <201206190641.q5J6fCRZ020883@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] r778 - in branches/experimental: Mk mail/thunderbird3 www/firefox36 www/libxul19 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, 19 Jun 2012 06:41:19 -0000 Author: jbeich Date: Tue Jun 19 06:41:12 2012 New Revision: 778 Log: switch to omnijar chrome format by default Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/libxul19/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Tue Jun 19 06:40:09 2012 (r777) +++ branches/experimental/Mk/bsd.gecko.mk Tue Jun 19 06:41:12 2012 (r778) @@ -484,6 +484,8 @@ # MOZ_EXPORT Environment variables for the build process (added # to .mozconfig). If NOMOZCONFIG is defined, you # probably want to set MAKE_ENV+=${MOZ_EXPORT} +# MOZ_CHROME A variable for the --enable-chrome-format= in +# CONFIGURE_ARGS. The default is omni. # # MOZ_TOOLKIT A variable for the --enable-default-toolkit= in # CONFIGURE_ARGS. The default is cairo-gtk2. @@ -633,8 +635,10 @@ .endfor # Standard options from README +MOZ_CHROME?= omni MOZ_TOOLKIT?= cairo-gtk2 MOZ_OPTIONS+= --disable-tests \ + --enable-chrome-format=${MOZ_CHROME} \ --enable-default-toolkit=${MOZ_TOOLKIT} \ --with-pthreads # Configure options for install @@ -654,7 +658,6 @@ MOZ_OPTIONS+= --with-system-zlib=/usr \ --disable-auto-deps \ --disable-debug-symbols \ - --enable-chrome-format=jar \ --disable-glibtest \ --disable-gtktest \ --disable-freetypetest \ Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Tue Jun 19 06:40:09 2012 (r777) +++ branches/experimental/mail/thunderbird3/Makefile Tue Jun 19 06:41:12 2012 (r778) @@ -22,6 +22,7 @@ LATEST_LINK= thunderbird3 USE_GECKO= gecko USE_MOZILLA= -nss -dbm -event -ffi -vpx +MOZ_CHROME= jar MAKE_JOBS_SAFE= yes WANT_GNOME= yes Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Tue Jun 19 06:40:09 2012 (r777) +++ branches/experimental/www/firefox36/Makefile Tue Jun 19 06:41:12 2012 (r778) @@ -24,6 +24,7 @@ USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -nss -dbm -cairo -event -ffi -vpx +MOZ_CHROME= jar USE_GECKO_OPTIONS=+smb MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= 3 Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Tue Jun 19 06:40:09 2012 (r777) +++ branches/experimental/www/libxul19/Makefile Tue Jun 19 06:41:12 2012 (r778) @@ -42,6 +42,7 @@ USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner USE_MOZILLA= -nss -dbm -event -ffi -vpx +MOZ_CHROME= jar MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-gtkmozembed-embedding \ mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 06:51:59 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 591C7106566B for ; Tue, 19 Jun 2012 06:51: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 9B0388FC1A for ; Tue, 19 Jun 2012 06:51:58 +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 q5J6pvpa048867 for ; Tue, 19 Jun 2012 06:51:57 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5J6pqvq044669 for freebsd-gecko@freebsd.org; Tue, 19 Jun 2012 06:51:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Jun 2012 06:51:52 GMT Message-Id: <201206190651.q5J6pqvq044669@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] r779 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3 mail/thunderbird3/files www/firefox www/firefox-beta www/firefox-esr www/firefox36 www/libxul www/libxul19 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, 19 Jun 2012 06:51:59 -0000 Author: jbeich Date: Tue Jun 19 06:51:52 2012 New Revision: 779 Log: enable system nss Added: branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in branches/experimental/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in branches/experimental/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in branches/experimental/mail/thunderbird3/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Modified: 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/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -16,6 +16,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -26,7 +27,7 @@ USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= thunderbird-10.* -USE_MOZILLA= -nss -dbm +USE_MOZILLA= # empty MAKE_JOBS_SAFE= yes WANT_GNOME= yes Added: branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 19 06:51:52 2012 (r779) @@ -0,0 +1,12 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~ ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in +@@ -188,6 +188,9 @@ endif + + OBJDEST = $(OBJDIR_NAME) + ++# accept -pthread with MOZ_NATIVE_NSS ++LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS) ++ + ########################################################################### + + ifeq ($(USE_DLL_EXPORTS_FILE), 1) Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -16,6 +16,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + nss>=3.13.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -27,7 +28,7 @@ LATEST_LINK= thunderbird-esr USE_GECKO= gecko CONFLICTS= thunderbird-1[1-9].* -USE_MOZILLA= -nss -dbm +USE_MOZILLA= # empty MAKE_JOBS_SAFE= yes WANT_GNOME= yes Added: branches/experimental/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 19 06:51:52 2012 (r779) @@ -0,0 +1,12 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~ ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in +@@ -188,6 +188,9 @@ endif + + OBJDEST = $(OBJDIR_NAME) + ++# accept -pthread with MOZ_NATIVE_NSS ++LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS) ++ + ########################################################################### + + ifeq ($(USE_DLL_EXPORTS_FILE), 1) Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/mail/thunderbird/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -16,6 +16,7 @@ COMMENT= Mozilla Thunderbird is standalone mail and news that stands above BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ + nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -26,7 +27,7 @@ USE_AUTOTOOLS= autoconf213:env USE_GECKO= gecko CONFLICTS= thunderbird-10.* -USE_MOZILLA= -nss -dbm +USE_MOZILLA= # empty MAKE_JOBS_SAFE= yes WANT_GNOME= yes Added: branches/experimental/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 19 06:51:52 2012 (r779) @@ -0,0 +1,12 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~ ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in +@@ -188,6 +188,9 @@ endif + + OBJDEST = $(OBJDIR_NAME) + ++# accept -pthread with MOZ_NATIVE_NSS ++LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS) ++ + ########################################################################### + + ifeq ($(USE_DLL_EXPORTS_FILE), 1) Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/mail/thunderbird3/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -15,13 +15,14 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr \ + nss>=3.12.8:${PORTSDIR}/security/nss DEPRECATED= will be unsupported by when Thunderbird 12 is release, migrate to mail/thunderbird now USE_AUTOTOOLS= autoconf213:env LATEST_LINK= thunderbird3 USE_GECKO= gecko -USE_MOZILLA= -nss -dbm -event -ffi -vpx +USE_MOZILLA= -event -ffi -vpx MOZ_CHROME= jar MAKE_JOBS_SAFE= yes Added: branches/experimental/mail/thunderbird3/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird3/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 19 06:51:52 2012 (r779) @@ -0,0 +1,12 @@ +--- directory/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~ ++++ directory/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in +@@ -189,6 +189,9 @@ + + OBJDEST = $(OBJDIR_NAME) + ++# accept -pthread with MOZ_NATIVE_NSS ++LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS) ++ + ########################################################################### + + ifeq ($(USE_DLL_EXPORTS_FILE), 1) Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/www/firefox-beta/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -17,6 +17,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ + nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -28,7 +29,7 @@ USE_GECKO= gecko CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm +USE_MOZILLA= # empty MOZILLA_NAME= Firefox MAKE_JOBS_SAFE= yes Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/www/firefox-esr/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -17,6 +17,7 @@ COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ + nss>=3.13.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -29,7 +30,7 @@ USE_GECKO= gecko CONFLICTS= firefox-1[1-9].* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm +USE_MOZILLA= # empty MOZILLA_NAME= Firefox MAKE_JOBS_SAFE= yes Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/www/firefox/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -17,6 +17,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.10:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -28,7 +29,7 @@ USE_GECKO= gecko CONFLICTS= firefox-10.* MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm +USE_MOZILLA= # empty MOZILLA_NAME= Firefox MAKE_JOBS_SAFE= yes Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/www/firefox36/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -16,14 +16,15 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr \ + nss>=3.12.8:${PORTSDIR}/security/nss DEPRECATED= will be unsupported by when Firefox 12 is release, migrate to www/firefox now USE_AUTOTOOLS= autoconf213:env LATEST_LINK= firefox36 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm -cairo -event -ffi -vpx +USE_MOZILLA= -cairo -event -ffi -vpx MOZ_CHROME= jar USE_GECKO_OPTIONS=+smb MOZILLA_NAME= Firefox${MOZILLA_SUFX} Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/www/libxul/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -16,6 +16,7 @@ COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ + nss>=3.13.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip @@ -45,12 +46,16 @@ OPTIONS= # Empty, used for generic gecko OPTIONS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner -USE_MOZILLA= -nss -dbm -MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js mozilla-nss \ +USE_MOZILLA= # empty +MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \ mozilla-plugin .include +.if ${USE_MOZILLA:M-nss} +MOZ_PKGCONFIG_FILES+= mozilla-nss +.endif + .if ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/www/libxul19/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -41,16 +41,20 @@ OPTIONS= # Empty, used for generic gecko OPTIONS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner -USE_MOZILLA= -nss -dbm -event -ffi -vpx +USE_MOZILLA= -event -ffi -vpx MOZ_CHROME= jar MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-gtkmozembed-embedding \ - mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin + mozilla-gtkmozembed mozilla-js mozilla-plugin OPTIONS_DEFINE= JAVA JAVA_DESC= Enable JAVA xpcom .include +.if ${USE_MOZILLA:M-nss} +MOZ_PKGCONFIG_FILES+= mozilla-nss +.endif + .if ${OSVERSION} < 700000 LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/www/seamonkey-beta/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -16,6 +16,7 @@ COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo @@ -44,7 +45,7 @@ --disable-updater \ --disable-necko-wifi -USE_MOZILLA= -nss -dbm +USE_MOZILLA= # empty USE_GECKO_OPTIONS=+smb MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Tue Jun 19 06:41:12 2012 (r778) +++ branches/experimental/www/seamonkey/Makefile Tue Jun 19 06:51:52 2012 (r779) @@ -16,6 +16,7 @@ COMMENT= The open source, standards compliant web browser BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ + nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo @@ -44,7 +45,7 @@ --disable-updater \ --disable-necko-wifi -USE_MOZILLA= -nss -dbm +USE_MOZILLA= # empty USE_GECKO_OPTIONS=+smb MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 06:53:18 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 F1BA2106566B for ; Tue, 19 Jun 2012 06:53:17 +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 773328FC1F for ; Tue, 19 Jun 2012 06:53:17 +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 q5J6rGq0051436 for ; Tue, 19 Jun 2012 06:53:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5J6rBpl050008 for freebsd-gecko@freebsd.org; Tue, 19 Jun 2012 06:53:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Jun 2012 06:53:11 GMT Message-Id: <201206190653.q5J6rBpl050008@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] r780 - in branches/experimental: mail/thunderbird-beta mail/thunderbird-esr mail/thunderbird3 www/firefox-beta 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, 19 Jun 2012 06:53:18 -0000 Author: jbeich Date: Tue Jun 19 06:53:11 2012 New Revision: 780 Log: sync nspr version with what mozilla/configure.in requests Modified: branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/www/firefox-beta/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 19 06:51:52 2012 (r779) +++ branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 19 06:53:11 2012 (r780) @@ -15,7 +15,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 19 06:51:52 2012 (r779) +++ branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 19 06:53:11 2012 (r780) @@ -15,7 +15,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ nss>=3.13.1:${PORTSDIR}/security/nss \ sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Tue Jun 19 06:51:52 2012 (r779) +++ branches/experimental/mail/thunderbird3/Makefile Tue Jun 19 06:53:11 2012 (r780) @@ -15,7 +15,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr \ nss>=3.12.8:${PORTSDIR}/security/nss DEPRECATED= will be unsupported by when Thunderbird 12 is release, migrate to mail/thunderbird now Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Tue Jun 19 06:51:52 2012 (r779) +++ branches/experimental/www/firefox-beta/Makefile Tue Jun 19 06:53:11 2012 (r780) @@ -16,7 +16,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Tue Jun 19 06:51:52 2012 (r779) +++ branches/experimental/www/seamonkey-beta/Makefile Tue Jun 19 06:53:11 2012 (r780) @@ -15,7 +15,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ unzip:${PORTSDIR}/archivers/unzip Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Tue Jun 19 06:51:52 2012 (r779) +++ branches/experimental/www/seamonkey/Makefile Tue Jun 19 06:53:11 2012 (r780) @@ -15,7 +15,7 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \ +BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \ nss>=3.13.2:${PORTSDIR}/security/nss \ sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \ unzip:${PORTSDIR}/archivers/unzip From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 12:07:47 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 E4153106564A for ; Tue, 19 Jun 2012 12:07:47 +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 82AC08FC0A for ; Tue, 19 Jun 2012 12:07:47 +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 q5JC7k84032679 for ; Tue, 19 Jun 2012 12:07:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5JC7e2I031242 for freebsd-gecko@freebsd.org; Tue, 19 Jun 2012 12:07:40 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 19 Jun 2012 12:07:40 GMT Message-Id: <201206191207.q5JC7e2I031242@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] r781 - 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: Tue, 19 Jun 2012 12:07:48 -0000 Author: jbeich Date: Tue Jun 19 12:07:40 2012 New Revision: 781 Log: redo r766 in a way that fixes 'heap-allocated' warning in about:memory Added: branches/experimental/www/firefox-nightly/files/patch-memory-build-mozjemalloc_compat.c branches/experimental/www/firefox-nightly/files/patch-memory-jemalloc-Makefile.in branches/experimental/www/firefox-nightly/files/patch-memory-mozjemalloc-jemalloc.h Deleted: branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp Modified: branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Tue Jun 19 06:53:11 2012 (r780) +++ branches/experimental/www/firefox-nightly/Makefile Tue Jun 19 12:07:40 2012 (r781) @@ -65,6 +65,11 @@ WRKSRC:= ${WRKSRC}-central-${HGREV:C/.*://} +.if ${OSVERSION} > 1000011 +MOZ_OPTIONS+= --enable-jemalloc +CONFIGURE_ENV+= MOZ_JEMALLOC=1 +.endif + .if ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build Added: branches/experimental/www/firefox-nightly/files/patch-memory-build-mozjemalloc_compat.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-memory-build-mozjemalloc_compat.c Tue Jun 19 12:07:40 2012 (r781) @@ -0,0 +1,15 @@ +--- memory/build/mozjemalloc_compat.c~ ++++ memory/build/mozjemalloc_compat.c +@@ -5,7 +5,12 @@ + #include "mozilla/Types.h" + #include "jemalloc_types.h" + ++#ifdef __FreeBSD__ ++#include ++#define je_mallctl mallctl ++#else + extern int je_mallctl(const char*, void*, size_t*, void*, size_t); ++#endif + + MOZ_EXPORT_API (void) + jemalloc_stats(jemalloc_stats_t *stats) Added: branches/experimental/www/firefox-nightly/files/patch-memory-jemalloc-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-memory-jemalloc-Makefile.in Tue Jun 19 12:07:40 2012 (r781) @@ -0,0 +1,15 @@ +--- memory/jemalloc/Makefile.in~ ++++ memory/jemalloc/Makefile.in +@@ -19,10 +19,12 @@ SDK_LIBRARY = $(REAL_LIBRARY) + DIST_INSTALL = 1 + endif + ++ifneq ($(OS_TARGET),FreeBSD) + CSRCS := $(notdir $(wildcard $(srcdir)/src/src/*.c)) + ifneq ($(OS_TARGET),Darwin) + CSRCS := $(filter-out zone.c,$(CSRCS)) + endif ++endif + + include $(topsrcdir)/config/rules.mk + Added: branches/experimental/www/firefox-nightly/files/patch-memory-mozjemalloc-jemalloc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-memory-mozjemalloc-jemalloc.h Tue Jun 19 12:07:40 2012 (r781) @@ -0,0 +1,15 @@ +--- memory/mozjemalloc/jemalloc.h~ ++++ memory/mozjemalloc/jemalloc.h +@@ -52,7 +52,12 @@ void jemalloc_stats(jemalloc_stats_t *st + __attribute__((weak)) + #endif + #if defined(MOZ_JEMALLOC) ++#ifdef __FreeBSD__ ++#include ++#define je_nallocm nallocm ++#else + int je_nallocm(size_t *rsize, size_t size, int flags); ++#endif + #else + size_t je_malloc_good_size(size_t size); + #endif Deleted: branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-storage-src-mozStorageService.cpp Tue Jun 19 12:07:40 2012 (r780) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,38 +0,0 @@ ---- storage/src/mozStorageService.cpp~ -+++ storage/src/mozStorageService.cpp -@@ -36,6 +36,25 @@ - #include "mozilla/FunctionTimer.h" - #include "mozilla/Util.h" - -+#if !defined(MOZ_MEMORY) && defined(__FreeBSD__) -+#include -+#include -+ -+#define MOZ_STORAGE_MEMORY -+ -+static inline size_t -+je_malloc_usable_size_in_advance(size_t size) { -+#if __FreeBSD_version > 1000011 -+ size_t ret; -+ if (size == 0) -+ size = 1; -+ if (!nallocm(&ret, size, 0)) -+ return ret; -+#endif -+ return size; -+} -+#endif -+ - namespace { - - class QuotaCallbackData -@@ -497,7 +516,9 @@ Service::shutdown() - sqlite3_vfs *ConstructTelemetryVFS(); - - #ifdef MOZ_STORAGE_MEMORY -+#ifdef MOZ_MEMORY - # include "jemalloc.h" -+#endif - - namespace { - Modified: branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Tue Jun 19 06:53:11 2012 (r780) +++ branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Tue Jun 19 12:07:40 2012 (r781) @@ -9,3 +9,14 @@ ifndef MOZ_ENABLE_LIBXUL EXTRA_DSO_LDOPTS += \ +@@ -619,6 +619,10 @@ DEFINES += -DENABLE_LAYOUTDEBUG + endif + endif + ++ifdef MOZ_MEMORY ++EXTRA_DSO_LDOPTS += -lmemory ++endif ++ + ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_PROFILE_USE)) + # Wrap linker to measure peak virtual memory usage. + LD := $(PYTHON) $(topsrcdir)/build/link.py $(CURDIR)/linker-vsize $(LD) From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 12:50:17 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 0ED7A1065670 for ; Tue, 19 Jun 2012 12:50:17 +0000 (UTC) (envelope-from roberthuff@rcn.com) Received: from smtp02.lnh.mail.rcn.net (smtp02.lnh.mail.rcn.net [207.172.157.102]) by mx1.freebsd.org (Postfix) with ESMTP id AD2BC8FC17 for ; Tue, 19 Jun 2012 12:50:16 +0000 (UTC) Received: from mr17.lnh.mail.rcn.net ([207.172.157.37]) by smtp02.lnh.mail.rcn.net with ESMTP; 19 Jun 2012 08:50:16 -0400 Received: from smtp04.lnh.mail.rcn.net (smtp04.lnh.mail.rcn.net [207.172.157.104]) by mr17.lnh.mail.rcn.net (MOS 4.3.4-GA) with ESMTP id BNW45041; Tue, 19 Jun 2012 08:50:15 -0400 Received: from 209-6-86-84.c3-0.smr-ubr2.sbo-smr.ma.cable.rcn.com (HELO jerusalem.litteratus.org.litteratus.org) ([209.6.86.84]) by smtp04.lnh.mail.rcn.net with ESMTP; 19 Jun 2012 08:50:15 -0400 From: Robert Huff MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <20448.30086.598700.347891@jerusalem.litteratus.org> Date: Tue, 19 Jun 2012 08:50:14 -0400 To: gecko@freebsd.org X-Mailer: VM 7.17 under 21.5 (beta28) "fuki" XEmacs Lucid X-Junkmail-Whitelist: YES (by domain whitelist at mr17.lnh.mail.rcn.net) Cc: roberthuff@rcn.com Subject: adding helper applications to browser? 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, 19 Jun 2012 12:50:17 -0000 (This may not be the best place to ask this; if not, I hope someone will point me to a better forum.) In Firefox 13 and SeaMonkey 2.9, there appears to be no internal way to add a new mime-type+helper application. 1) Is this correct? Am I missing something, or do is something mis-configured? 2) If it is: is there a (preferred) add-on that will do this? 3) If there's no add-on ... is there any way other than hand-editing mimeTypes.rdf? Respectfully, Robert Huff From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 19:23:33 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 499E4106566C; Tue, 19 Jun 2012 19:23:33 +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 1D7558FC12; Tue, 19 Jun 2012 19:23:33 +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 q5JJNWuQ005445; Tue, 19 Jun 2012 19:23:33 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5JJNWlV005441; Tue, 19 Jun 2012 19:23:32 GMT (envelope-from edwin) Date: Tue, 19 Jun 2012 19:23:32 GMT Message-Id: <201206191923.q5JJNWlV005441@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/169242: www/seamonkey Right mouse buttom click freeze window 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, 19 Jun 2012 19:23:33 -0000 Synopsis: www/seamonkey Right mouse buttom click freeze window Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Tue Jun 19 19:23:32 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=169242 From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 19:23:59 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 D1BFE106567B; Tue, 19 Jun 2012 19:23:59 +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 A54498FC12; Tue, 19 Jun 2012 19:23:59 +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 q5JJNxql005579; Tue, 19 Jun 2012 19:23:59 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5JJNxmW005575; Tue, 19 Jun 2012 19:23:59 GMT (envelope-from edwin) Date: Tue, 19 Jun 2012 19:23:59 GMT Message-Id: <201206191923.q5JJNxmW005575@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/169241: www/firefox Right mouse buttom click freeze screen 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, 19 Jun 2012 19:23:59 -0000 Synopsis: www/firefox Right mouse buttom click freeze screen Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Tue Jun 19 19:23:59 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=169241 From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 20:10:48 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 EA4F81065673 for ; Tue, 19 Jun 2012 20:10:48 +0000 (UTC) (envelope-from bsd-src@helfman.org) Received: from mail-pz0-f54.google.com (mail-pz0-f54.google.com [209.85.210.54]) by mx1.freebsd.org (Postfix) with ESMTP id B27E18FC16 for ; Tue, 19 Jun 2012 20:10:48 +0000 (UTC) Received: by dadv36 with SMTP id v36so9547100dad.13 for ; Tue, 19 Jun 2012 13:10:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:x-operating-system :organization:x-living-the-dream:x-pgp-fingerprint:x-pgp-key :user-agent:x-gm-message-state; bh=UQACvqctv1tp9czKojq2U2NS+KP3huP7pSKy5u5o+Z4=; b=BiRp4eIcWSEFwwMJGV9PqLub+rVZ6vXGBDZOihTW6oGyI12zPIllUr4Eh0jLBmdUg0 y6E8OuTjPAQWjkr5eolkNnsX8qceoguSOaQLVBmL8wV7v0WYyv/rMMwJGu0O6qkY3vyu wDjCA5cui0Ooeze2d7+KWiSX84EKuhVAZQE1wXiii6WHxlCcDUmhUCJO7oBdi1c8stiU 2s0P/sO4yviF+A4/OsIy0t3MVquHMDuLRoyqKl1BtPcZIgaZaIQaICSDQ4zODx8ffnBX FgzpSHQzhrNcjt43zqCIEuNC5DI5BcV6ujc8Musq9ISt407DIqpGQY9RC9mRg3ofvGtI Deiw== Received: by 10.68.219.135 with SMTP id po7mr66438321pbc.149.1340136647818; Tue, 19 Jun 2012 13:10:47 -0700 (PDT) Received: from dormouse.experts-exchange.com ([72.29.164.238]) by mx.google.com with ESMTPS id sy3sm29014392pbc.18.2012.06.19.13.10.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 19 Jun 2012 13:10:47 -0700 (PDT) Sender: Jason Helfman Date: Tue, 19 Jun 2012 13:09:09 -0700 From: Jason Helfman To: gecko@FreeBSD.org Message-ID: <20120619200909.GC11273@dormouse.experts-exchange.com> References: <201206191923.q5JJNxmW005575@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <201206191923.q5JJNxmW005575@freefall.freebsd.org> X-Operating-System: FreeBSD 8.3-RELEASE amd64 Organization: The FreeBSD Project, http://www.freebsd.org X-Living-The-Dream: I love the SLO Life! X-PGP-FingerPrint: 8E0D C457 9A0F C91C 23F3 0454 2059 9A63 4150 D3DC X-PGP-Key: http://people.freebsd.org/~jgh/jgh.asc User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnmLlOFfZ3+m7eKqLw6pPmX5RV0DtacsD2iF8Qp41sGJ+cbyOmmNdMoyOZ3Jix9Qy9VrSsz Cc: kde@freebsd.org, bug-followup@freebsd.org Subject: Re: ports/169241: www/firefox Right mouse buttom click freeze screen 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, 19 Jun 2012 20:10:49 -0000 Note to gecko/submitter: I am running the same version of firefox on 8.3 with fluxbox, and cannot reproduce this issue. cc: kde@ -jgh -- Jason Helfman FreeBSD Committer | http://people.freebsd.org/~jgh | The Power To Serve From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 19 20:20:16 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 F255F1065672 for ; Tue, 19 Jun 2012 20:20:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C46948FC12 for ; Tue, 19 Jun 2012 20:20:16 +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 q5JKKGVZ054336 for ; Tue, 19 Jun 2012 20:20:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5JKKGXB054335; Tue, 19 Jun 2012 20:20:16 GMT (envelope-from gnats) Date: Tue, 19 Jun 2012 20:20:16 GMT Message-Id: <201206192020.q5JKKGXB054335@freefall.freebsd.org> To: gecko@FreeBSD.org From: Jason Helfman Cc: Subject: Re: ports/169241: www/firefox Right mouse buttom click freeze screen X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jason Helfman List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jun 2012 20:20:17 -0000 The following reply was made to PR ports/169241; it has been noted by GNATS. From: Jason Helfman To: gecko@FreeBSD.org Cc: bug-followup@freebsd.org, kde@freebsd.org Subject: Re: ports/169241: www/firefox Right mouse buttom click freeze screen Date: Tue, 19 Jun 2012 13:09:09 -0700 Note to gecko/submitter: I am running the same version of firefox on 8.3 with fluxbox, and cannot reproduce this issue. cc: kde@ -jgh -- Jason Helfman FreeBSD Committer | http://people.freebsd.org/~jgh | The Power To Serve From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 20 08:53:11 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 6BA8A1065670 for ; Wed, 20 Jun 2012 08:53:11 +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 E6B528FC0A for ; Wed, 20 Jun 2012 08:53:10 +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 q5K8r4Sg036222 for ; Wed, 20 Jun 2012 08:53: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 q5K8qwL3035944 for freebsd-gecko@freebsd.org; Wed, 20 Jun 2012 08:52:58 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 20 Jun 2012 08:52:58 GMT Message-Id: <201206200852.q5K8qwL3035944@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] r782 - branches/experimental/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: Wed, 20 Jun 2012 08:53:11 -0000 Author: jbeich Date: Wed Jun 20 08:52:58 2012 New Revision: 782 Log: merge r768, r769, r778 Modified: branches/experimental/www/kompozer/Makefile Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Tue Jun 19 12:07:40 2012 (r781) +++ branches/experimental/www/kompozer/Makefile Wed Jun 20 08:52:58 2012 (r782) @@ -25,9 +25,13 @@ MAKEFILE= client.mk ALL_TARGET= build_all USE_MOZILLA= -event -ffi -hunspell -sqlite -vpx +MOZ_CHROME= jar +MOZ_TOOLKIT= gtk2 USE_GECKO_OPTIONS=-dbus MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ + --enable-xinerama \ + --disable-xprint \ --enable-application=composer PORT_MOZCONFIG= ${WRKSRC}/composer/config/mozconfig.linux From owner-freebsd-gecko@FreeBSD.ORG Wed Jun 20 10:01:41 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 6C759106564A; Wed, 20 Jun 2012 10:01:41 +0000 (UTC) (envelope-from bsam@passap.ru) Received: from forward5h.mail.yandex.net (forward5h.mail.yandex.net [IPv6:2a02:6b8:0:f05::5]) by mx1.freebsd.org (Postfix) with ESMTP id 6A3058FC18; Wed, 20 Jun 2012 10:01:40 +0000 (UTC) Received: from smtp2h.mail.yandex.net (smtp2h.mail.yandex.net [84.201.187.145]) by forward5h.mail.yandex.net (Yandex) with ESMTP id B4EF6D0241F; Wed, 20 Jun 2012 14:01:38 +0400 (MSK) Received: from smtp2h.mail.yandex.net (localhost [127.0.0.1]) by smtp2h.mail.yandex.net (Yandex) with ESMTP id 329E7170014E; Wed, 20 Jun 2012 14:01:38 +0400 (MSK) Received: from 87.249.28.58.tel.ru (87.249.28.58.tel.ru [87.249.28.58]) by smtp2h.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 1bLKXBmu-1bL8SWvi; Wed, 20 Jun 2012 14:01:37 +0400 X-Yandex-Rcpt-Suid: beat@FreeBSD.org X-Yandex-Rcpt-Suid: andrew.w.nosenko@gmail.com X-Yandex-Rcpt-Suid: freebsd-ports@freebsd.org X-Yandex-Rcpt-Suid: jkim@FreeBSD.org X-Yandex-Rcpt-Suid: freebsd-gecko@FreeBSD.org Message-ID: <4FE19F81.5090105@passap.ru> Date: Wed, 20 Jun 2012 14:01:37 +0400 From: Boris Samorodov User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:13.0) Gecko/20120620 Thunderbird/13.0.1 MIME-Version: 1.0 To: Beat Gaetzi References: <4FE097DA.30701@passap.ru> <4FE18BB5.5040803@passap.ru> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Wed, 20 Jun 2012 11:15:26 +0000 Cc: jkim@FreeBSD.org, freebsd-gecko@FreeBSD.org, freebsd-ports@freebsd.org, "Andrew W. Nosenko" Subject: Re: clang, dbus, firefox+thunderbird 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, 20 Jun 2012 10:01:41 -0000 20.06.2012 12:45, Beat Gaetzi пишет: > 2012/6/20 Boris Samorodov : >> Hi All, >> >> Andrew, thanks for your time and help! >> >> 19.06.2012 21:14, Andrew W. Nosenko написал: >> >>> On Tue, Jun 19, 2012 at 6:16 PM, Boris Samorodov wrote: >>>> >>>> Hi List, >>>> >>>> I use clang compiled world (WITH_CLANG_IS_CC="YES" and >>>> WITH_LIBCPLUSPLUS="YES" at /etc/make.conf). The system >>>> is current: >>>> ----- >>>> % uname -a >>>> FreeBSD bsam.wart.ru 10.0-CURRENT FreeBSD 10.0-CURRENT #16 r237055: Thu >>>> Jun >>>> 14 17:16:43 SAMT 2012 bsam@bsam.wart.ru:/usr/obj/usr/src/sys/BBX >>>> i386 >>>> ----- >>>> >>>> While updating to the latest firefox I get an error: >>>> ----- >>>> /usr/local/include/dbus-1.0/dbus/dbus-protocol.h:459:77: error: invalid >>>> suffix on literal; C++11 requires a space between literal and identifier >>>> [-Wreserved-user-defined-literal] >>>> #define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE ">>> >>>> \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n" >>>> >>>> ^ >>>> >>>> >>>> /usr/local/include/dbus-1.0/dbus/dbus-protocol.h:459:126: error: invalid >>>> suffix on literal; C++11 requires a space between literal and identifier >>>> [-Wreserved-user-defined-literal] >>>> #define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE ">>> >>>> \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n" >>>> >>>> ^ >>>> >>>> >>>> 2 errors generated. >>>> >>>> ----- >>>> >>>> OK, I did make config and deselect DBUS. Great, firefox compiles and >>>> installs (the latest one, 13.0.1). Then I try to upgrade thunderbird >>>> and get the same error. However there is no option DBUS to disable. >>>> >>>> What am I to do? >>>> Thanks! >>> >>> >>> It's because of "User defined literals" (the new c++11 feature) and >>> your clang++ is in c++11 (or gnu++11?) mode by default. >>> >>> As workaround, you may try either: "downgrade" to something like gnu++ >>> 98 (-std=gnu++98), or edit dbus-protocol.h header for make it c++11 >>> compatible. It's easy: just add spaces around >>> DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER and >>> DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER literals in the line 459 >>> (just as compiler suggested). >>> >>> I.e. the line 459 >>> >>> #define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE ">> PUBLIC >>> \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n" >>> >>> should be written as >>> >>> #define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE ">> PUBLIC \"" DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "\"\n\"" >>> DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "\">\n" >> >> >> You are right. And AFAIK a similar fix was committed to the ports tree >> while I was testing your suggestion. >> >> The fix helped clang to build firefox with DBUS on. However, >> thunderbird stopped building with another error. I'll create >> a new thread on the matter after some testing. > > There are patches to build Thunderbird with clang: > > http://lists.freebsd.org/pipermail/freebsd-gecko/2012-June/002273.html > > Maybe you could give them a try. Confirmed. It works for thunderbird 13.0.1. Thanks! -- WBR, Boris Samorodov (bsam) FreeBSD Committer, http://www.FreeBSD.org The Power To Serve From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 21 12:05:01 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 0D4AE106567A for ; Thu, 21 Jun 2012 12:05:01 +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 94EA98FC1A for ; Thu, 21 Jun 2012 12:05:00 +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 q5LC4rsa073753 for ; Thu, 21 Jun 2012 12:04:53 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5LC4mVu070991 for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 12:04:48 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 21 Jun 2012 12:04:48 GMT Message-Id: <201206211204.q5LC4mVu070991@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] r783 - 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/libxul19 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: Thu, 21 Jun 2012 12:05:01 -0000 Author: jbeich Date: Thu Jun 21 12:04:48 2012 New Revision: 783 Log: reduce duplicate configure patching 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/libxul19/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 Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/Mk/bsd.gecko.mk Thu Jun 21 12:04:48 2012 (r783) @@ -786,11 +786,13 @@ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/configure ; \ fi - @if [ -f ${WRKSRC}/configure ] ; then \ + @-if [ -f ${WRKSRC}/configure ] ; then \ ${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g ; \ s|echo aout|echo elf|g ; \ s|/usr/X11R6|${LOCALBASE}|g' \ + ${MOZSRC}/js/src/configure \ + ${MOZSRC}/configure \ ${WRKSRC}/configure; \ fi @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/mail/thunderbird-beta/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -119,11 +119,6 @@ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ ${MOZSRC}/js/src/config/config.mk - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${MOZSRC}/js/src/configure pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/mail/thunderbird-esr/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -120,11 +120,6 @@ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ ${MOZSRC}/js/src/config/config.mk - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${MOZSRC}/js/src/configure pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/mail/thunderbird/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -123,11 +123,6 @@ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ ${MOZSRC}/js/src/config/config.mk - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${MOZSRC}/js/src/configure pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/mail/thunderbird3/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -89,11 +89,6 @@ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ ${MOZSRC}/js/src/config/config.mk - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${MOZSRC}/js/src/configure pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/firefox-beta/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -134,11 +134,6 @@ ${WRKSRC}/config/mkdepend/Makefile.in \ ${WRKSRC}/config/config.mk \ ${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/js/src/configure.in pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/firefox-esr/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -135,11 +135,6 @@ ${WRKSRC}/config/mkdepend/Makefile.in \ ${WRKSRC}/config/config.mk \ ${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/js/src/configure.in pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/firefox-nightly/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -140,11 +140,6 @@ ${WRKSRC}/config/mkdepend/Makefile.in \ ${WRKSRC}/config/config.mk \ ${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/js/src/configure.in pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/firefox/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -134,11 +134,6 @@ ${WRKSRC}/config/mkdepend/Makefile.in \ ${WRKSRC}/config/config.mk \ ${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/js/src/configure.in pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/firefox36/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -86,11 +86,6 @@ ${WRKSRC}/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \ ${WRKSRC}/js/src/config/config.mk - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/js/src/configure pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/libxul/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -92,11 +92,6 @@ ${WRKSRC}/browser/app/nsBrowserApp.cpp \ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \ ${WRKSRC}/js/src/config/config.mk - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/js/src/configure.in pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/libxul19/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -87,11 +87,6 @@ ${WRKSRC}/db/sqlite3/src/Makefile.in ${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \ ${WRKSRC}/js/src/config/mkdepend/Makefile.in - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/js/src/configure pre-configure: (cd ${WRKSRC} && ${AUTOCONF}) Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/seamonkey-beta/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -138,13 +138,6 @@ ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp @${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \ ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/mozilla/js/src/configure.in \ - ${WRKSRC}/mozilla/configure.in \ - ${WRKSRC}/configure.in @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Wed Jun 20 08:52:58 2012 (r782) +++ branches/experimental/www/seamonkey/Makefile Thu Jun 21 12:04:48 2012 (r783) @@ -138,13 +138,6 @@ ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp @${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \ ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/mozilla/js/src/configure.in \ - ${WRKSRC}/mozilla/configure.in \ - ${WRKSRC}/configure.in @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 21 12:05:29 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 F2781106564A for ; Thu, 21 Jun 2012 12:05:28 +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 623418FC17 for ; Thu, 21 Jun 2012 12:05:28 +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 q5LC5RfK079787 for ; Thu, 21 Jun 2012 12:05:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5LC5MKK078823 for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 12:05:22 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 21 Jun 2012 12:05:22 GMT Message-Id: <201206211205.q5LC5MKK078823@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] r784 - in branches/experimental/www: seamonkey 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: Thu, 21 Jun 2012 12:05:29 -0000 Author: jbeich Date: Thu Jun 21 12:05:22 2012 New Revision: 784 Log: remove obsolete iconv build fix Modified: branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Thu Jun 21 12:04:48 2012 (r783) +++ branches/experimental/www/seamonkey-beta/Makefile Thu Jun 21 12:05:22 2012 (r784) @@ -126,10 +126,6 @@ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure.in \ - ${WRKSRC}/mozilla/configure.in \ - ${WRKSRC}/mozilla/xpcom/io/nsNativeCharsetUtils.cpp @${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \ ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Thu Jun 21 12:04:48 2012 (r783) +++ branches/experimental/www/seamonkey/Makefile Thu Jun 21 12:05:22 2012 (r784) @@ -126,10 +126,6 @@ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/mozilla/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure.in \ - ${WRKSRC}/mozilla/configure.in \ - ${WRKSRC}/mozilla/xpcom/io/nsNativeCharsetUtils.cpp @${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \ ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ ${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 21 12:05:53 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 A0A3D106567A for ; Thu, 21 Jun 2012 12:05:53 +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 299348FC22 for ; Thu, 21 Jun 2012 12:05:52 +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 q5LC5qmY081825 for ; Thu, 21 Jun 2012 12:05:52 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5LC5l5T081320 for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 12:05:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 21 Jun 2012 12:05:47 GMT Message-Id: <201206211205.q5LC5l5T081320@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] r785 - 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: Thu, 21 Jun 2012 12:05:53 -0000 Author: jbeich Date: Thu Jun 21 12:05:46 2012 New Revision: 785 Log: piggyback startup-notifications on DBUS Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Jun 21 12:05:22 2012 (r784) +++ branches/experimental/Mk/bsd.gecko.mk Thu Jun 21 12:05:46 2012 (r785) @@ -676,7 +676,9 @@ .if ${PORT_OPTIONS:MDBUS} LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.4:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify \ + startup-notification-1.0:${PORTSDIR}/x11/startup-notification +MOZ_OPTIONS+= --enable-startup-notification .else MOZ_OPTIONS+= --disable-dbus --disable-libnotify .endif From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 21 12:06:36 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 8E9101065670 for ; Thu, 21 Jun 2012 12:06:36 +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 F2AF18FC20 for ; Thu, 21 Jun 2012 12:06:35 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q5LC6Z3n084333 for ; Thu, 21 Jun 2012 12:06: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 q5LC6TTV083491 for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 12:06:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 21 Jun 2012 12:06:29 GMT Message-Id: <201206211206.q5LC6TTV083491@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] r786 - in branches/experimental: Mk www/firefox-nightly 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, 21 Jun 2012 12:06:36 -0000 Author: jbeich Date: Thu Jun 21 12:06:29 2012 New Revision: 786 Log: add/enable gstreamer by default Added: branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/firefox-nightly/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Jun 21 12:05:46 2012 (r785) +++ branches/experimental/Mk/bsd.gecko.mk Thu Jun 21 12:06:29 2012 (r786) @@ -560,7 +560,7 @@ LOGGING_DESC?= Enable additional log messages SMB?= Enable smb:// URI support using gnomevfs -OPTIONS_DEFAULT+=DBUS +OPTIONS_DEFAULT+=DBUS GSTREAMER .for use in ${USE_GECKO_OPTIONS} ${use:S/-/_WITHOUT_/}= ${TRUE} @@ -683,6 +683,13 @@ MOZ_OPTIONS+= --disable-dbus --disable-libnotify .endif +.if ${PORT_OPTIONS:MGSTREAMER} +USE_GSTREAMER= yes +MOZ_OPTIONS+= --enable-gstreamer +.else +MOZ_OPTIONS+= --disable-gstreamer +.endif + .if ${PORT_OPTIONS:MSMB} USE_GNOME+= gnomevfs2 MOZ_OPTIONS+= --enable-gnomevfs Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Thu Jun 21 12:05:46 2012 (r785) +++ branches/experimental/www/firefox-nightly/Makefile Thu Jun 21 12:06:29 2012 (r786) @@ -30,6 +30,7 @@ USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -nspr -sqlite +USE_GECKO_OPTIONS=+gstreamer MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} Added: branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp Thu Jun 21 12:06:29 2012 (r786) @@ -0,0 +1,11 @@ +--- content/media/gstreamer/nsGStreamerReader.cpp~ ++++ content/media/gstreamer/nsGStreamerReader.cpp +@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata + * stream but that are otherwise decodeable. + */ + guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, +- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; ++ static_cast(~GST_PLAY_FLAG_AUDIO), static_cast(~GST_PLAY_FLAG_VIDEO)}; + guint default_flags, current_flags; + g_object_get(mPlayBin, "flags", &default_flags, NULL); + From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 21 12:08: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 2AB5C1065670 for ; Thu, 21 Jun 2012 12:08: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 A28BF8FC15 for ; Thu, 21 Jun 2012 12:08:12 +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 q5LC8BFY087383 for ; Thu, 21 Jun 2012 12:08:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5LC86RX085003 for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 12:08:06 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 21 Jun 2012 12:08:06 GMT Message-Id: <201206211208.q5LC86RX085003@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] r787 - 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/libxul www/libxul19 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: Thu, 21 Jun 2012 12:08:13 -0000 Author: jbeich Date: Thu Jun 21 12:08:06 2012 New Revision: 787 Log: fix default options for BATCH mode after r733 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/libxul/Makefile branches/experimental/www/libxul19/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 Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/Mk/bsd.gecko.mk Thu Jun 21 12:08:06 2012 (r787) @@ -560,8 +560,6 @@ LOGGING_DESC?= Enable additional log messages SMB?= Enable smb:// URI support using gnomevfs -OPTIONS_DEFAULT+=DBUS GSTREAMER - .for use in ${USE_GECKO_OPTIONS} ${use:S/-/_WITHOUT_/}= ${TRUE} .endfor Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/mail/thunderbird-beta/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -55,6 +55,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome +OPTIONS_DEFAULT=DBUS OPTIONS= LIGHTNING "Enable calendar extension" off .include Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/mail/thunderbird-esr/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -56,6 +56,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome +OPTIONS_DEFAULT=DBUS OPTIONS= LIGHTNING "Enable calendar extension" off .include Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/mail/thunderbird/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -55,6 +55,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome +OPTIONS_DEFAULT=DBUS OPTIONS= LIGHTNING "Enable calendar extension" off .include Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/mail/thunderbird3/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -54,6 +54,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome +OPTIONS_DEFAULT=DBUS OPTIONS= .include Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/www/firefox-beta/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -51,6 +51,7 @@ --disable-updater \ --disable-necko-wifi +OPTIONS_DEFAULT=DBUS OPTIONS= PGO "Enable Profile-Guided Optimization" off .include Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/www/firefox-esr/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -52,6 +52,7 @@ --disable-updater \ --disable-necko-wifi +OPTIONS_DEFAULT=DBUS OPTIONS= PGO "Enable Profile-Guided Optimization" off .include Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/www/firefox-nightly/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -53,6 +53,7 @@ --disable-updater \ --disable-necko-wifi +OPTIONS_DEFAULT=DBUS GSTREAMER OPTIONS_DEFINE= PGO PGO_DESC= Enable Profile-Guided Optimization Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/www/firefox/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -51,6 +51,7 @@ --disable-updater \ --disable-necko-wifi +OPTIONS_DEFAULT=DBUS OPTIONS= PGO "Enable Profile-Guided Optimization" off .include Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/www/libxul/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -43,6 +43,7 @@ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions +OPTIONS_DEFAULT=DBUS OPTIONS= # Empty, used for generic gecko OPTIONS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/www/libxul19/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -38,6 +38,7 @@ --disable-updater \ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions +OPTIONS_DEFAULT=DBUS OPTIONS= # Empty, used for generic gecko OPTIONS USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/www/seamonkey-beta/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -52,6 +52,7 @@ NOT_FOR_ARCHS= ia64 +OPTIONS_DEFAULT=DBUS OPTIONS=MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ LDAP "Enable LDAP support for Mailnews" on \ Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Thu Jun 21 12:06:29 2012 (r786) +++ branches/experimental/www/seamonkey/Makefile Thu Jun 21 12:08:06 2012 (r787) @@ -52,6 +52,7 @@ NOT_FOR_ARCHS= ia64 +OPTIONS_DEFAULT=DBUS OPTIONS=MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ LDAP "Enable LDAP support for Mailnews" on \ From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 21 12:13:34 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 0ABA3106564A for ; Thu, 21 Jun 2012 12:13:34 +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 8839A8FC26 for ; Thu, 21 Jun 2012 12:13:33 +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 q5LCDWsv009737 for ; Thu, 21 Jun 2012 12:13:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5LCDR5g009340 for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 12:13:27 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 21 Jun 2012 12:13:27 GMT Message-Id: <201206211213.q5LCDR5g009340@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] r788 - branches/experimental/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: Thu, 21 Jun 2012 12:13:34 -0000 Author: jbeich Date: Thu Jun 21 12:13:27 2012 New Revision: 788 Log: fix default options for BATCH mode after r733 Modified: branches/experimental/www/firefox36/Makefile Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Thu Jun 21 12:08:06 2012 (r787) +++ branches/experimental/www/firefox36/Makefile Thu Jun 21 12:13:27 2012 (r788) @@ -51,6 +51,8 @@ --disable-updater \ --disable-necko-wifi +OPTIONS_DEFAULT=DBUS + .include EXTRA_PATCHES= ${FILESDIR}/libsydney_oss From owner-freebsd-gecko@FreeBSD.ORG Thu Jun 21 14:51:59 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 15BF71065673 for ; Thu, 21 Jun 2012 14:51:59 +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 B28528FC0C for ; Thu, 21 Jun 2012 14:51:58 +0000 (UTC) Received: from ncsd.bris.ac.uk ([137.222.10.59] helo=ncs.bris.ac.uk) by dirj.bris.ac.uk with esmtp (Exim 4.72) (envelope-from ) id 1Shijk-0007V5-Ga for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 15:51:58 +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 1Shijk-0006tS-B1 for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 15:51:56 +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 q5LEpu3o094947 for ; Thu, 21 Jun 2012 15:51:56 +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 q5LEpudn094946 for freebsd-gecko@freebsd.org; Thu, 21 Jun 2012 15:51:56 +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, 21 Jun 2012 15:51:55 +0100 From: Anton Shterenlikht To: freebsd-gecko@freebsd.org Message-ID: <20120621145155.GA94123@mech-cluster241.men.bris.ac.uk> References: <201206141506.q5EF6VrH073265@trillian.chruetertee.ch> <20120614152853.GA1562@mech-cluster241.men.bris.ac.uk> <86k3z9rigm.fsf@tormail.org> <1Sgczz-000C7a-JR@internal.tormail.org> <20120620132252.GA859@mech-cluster241.men.bris.ac.uk> <20120620154156.GA22895@mech-cluster241.men.bris.ac.uk> <1ShNFI-000AFt-0E@internal.tormail.org> <1ShOjK-000HPg-Uy@internal.tormail.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1ShOjK-000HPg-Uy@internal.tormail.org> User-Agent: Mutt/1.4.2.3i Subject: bsd.gecko.mk in r788 - problems 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, 21 Jun 2012 14:51:59 -0000 # svn info bsd.gecko.mk Path: bsd.gecko.mk Name: bsd.gecko.mk Working Copy Root Path: /usr/ports/www/firefox/experimental URL: http://trillian.chruetertee.ch/svn/freebsd-gecko/branches/experimental/Mk/bsd.gecko.mk Repository Root: http://trillian.chruetertee.ch/svn/freebsd-gecko Repository UUID: 6ab5617d-af29-de11-a9e3-001676731981 Revision: 788 Node Kind: file Schedule: normal Last Changed Author: jbeich Last Changed Rev: 787 Last Changed Date: 2012-06-21 13:08:06 +0100 (Thu, 21 Jun 2012) Text Last Updated: 2012-06-21 15:39:50 +0100 (Thu, 21 Jun 2012) Checksum: af5e67c83e26c9e4561206413dd37f0b204bba39 # Script started on Thu Jun 21 15:49:55 2012 make -C ../www/firefox-nightly/ clean "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 668: Malformed conditional (${PORT_OPTIONS:MOPTIMIZED_CFLAGS}) "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 675: Malformed conditional (${PORT_OPTIONS:MDBUS}) "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 684: Malformed conditional (${PORT_OPTIONS:MGSTREAMER}) "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 691: Malformed conditional (${PORT_OPTIONS:MSMB}) "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 704: Malformed conditional (${PORT_OPTIONS:MDEBUG}) "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 711: Malformed conditional (${PORT_OPTIONS:MLOGGING}) "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 713: if-less else "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 715: if-less endif "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 742: if-less else "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 942: if-less endif "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 943: if-less endif "/usr/ports/www/firefox/experimental/Mk/bsd.port.mk", line 1479: if-less endif "/usr/ports/www/firefox/experimental/Mk/bsd.port.mk", line 1534: if-less endif "/usr/ports/www/firefox/experimental/Mk/bsd.port.mk", line 6342: if-less endif "Makefile", line 91: Malformed conditional (${PORT_OPTIONS:MPGO}) "Makefile", line 97: if-less endif "Makefile", line 110: Malformed conditional (${PORT_OPTIONS:MPGO}) "Makefile", line 121: if-less endif "Makefile", line 151: Malformed conditional (${PORT_OPTIONS:MPGO}) "Makefile", line 156: if-less endif "Makefile", line 159: warning: duplicate script for target "port-pre-install" ignored "Makefile", line 160: warning: duplicate script for target "port-pre-install" ignored "Makefile", line 161: warning: duplicate script for target "port-pre-install" ignored "Makefile", line 162: warning: duplicate script for target "port-pre-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 748: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 751: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 753: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 756: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 760: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 762: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 765: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 765: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 783: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 783: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 783: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 786: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 790: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 795: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 804: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 807: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 811: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 815: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 818: warning: duplicate script for target "gecko-post-patch" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 829: warning: duplicate script for target "gecko-post-configure" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 835: warning: duplicate script for target "gecko-post-build" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 846: warning: duplicate script for target "gecko-pre-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 847: warning: duplicate script for target "gecko-pre-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 849: warning: duplicate script for target "gecko-pre-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 851: warning: duplicate script for target "gecko-pre-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 862: warning: duplicate script for target "gecko-pre-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 878: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 879: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 880: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 885: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 885: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 885: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 885: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 893: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 894: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 895: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 896: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 897: warning: duplicate script for target "gecko-create-plist" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 909: warning: duplicate script for target "gecko-do-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 909: warning: duplicate script for target "gecko-do-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 909: warning: duplicate script for target "gecko-do-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 909: warning: duplicate script for target "gecko-do-install" ignored "/usr/ports/www/firefox/experimental/Mk/bsd.gecko.mk", line 940: warning: duplicate script for target "gecko-post-install" ignored make: fatal errors encountered -- cannot continue Script done on Thu Jun 21 15:49:57 2012 -- 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 21 16:26:59 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 4B0E1106566B; Thu, 21 Jun 2012 16:26:59 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55]) by mx1.freebsd.org (Postfix) with ESMTP id B2AB48FC14; Thu, 21 Jun 2012 16:26:58 +0000 (UTC) Received: from [192.168.1.101] (dynamic-94-247-222-224.catv.glattnet.ch [94.247.222.224]) (authenticated bits=0) by marvin.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q5LGQpuV095303 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES128-SHA bits=128 verify=NO); Thu, 21 Jun 2012 16:26:51 GMT (envelope-from beat@FreeBSD.org) From: =?iso-8859-1?Q?Beat_G=E4tzi?= Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Date: Thu, 21 Jun 2012 18:26:51 +0200 To: gecko@FreeBSD.org Message-Id: <78181AB6-44C0-4087-B1DB-56006B15A6B9@FreeBSD.org> Mime-Version: 1.0 (Apple Message framework v1278) X-Mailer: Apple Mail (2.1278) Cc: Subject: SeaMonkey 2.10.1 can't find libxul.so on startup 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, 21 Jun 2012 16:26:59 -0000 Hi, As you may have noticed SeaMonkey 2.10.1 hasn't been committed to the ports tree yet. There is still a problem when starting SeaMonkey: # seamonkey XPCOMGlueLoad error for file /usr/local/lib/seamonkey/libxpcom.so: Shared object "libxul.so" not found, required by "libxpcom.so" Couldn't load XPCOM. It looks like SeaMonkey doesn't find libxul.so which is in ${PREFIX}/lib/seamonkey/. I assume this is cause by: https://bugzilla.mozilla.org/show_bug.cgi?id=668869 I'm not sure how to solve this in a proper way. Any hint is appreciated. Patch for 2.10.1 is available here: http://people.freebsd.org/~beat/patches/seamonkey-2.10.1.patch Thanks, Beat From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 22 01:31:02 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 201DA1065674 for ; Fri, 22 Jun 2012 01:31:02 +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 8802A8FC18 for ; Fri, 22 Jun 2012 01:31:01 +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 q5M1UxX8005599 for ; Fri, 22 Jun 2012 01:30:59 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5M1UsKs005400 for freebsd-gecko@freebsd.org; Fri, 22 Jun 2012 01:30:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 22 Jun 2012 01:30:54 GMT Message-Id: <201206220130.q5M1UsKs005400@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] r789 - 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, 22 Jun 2012 01:31:02 -0000 Author: jbeich Date: Fri Jun 22 01:30:54 2012 New Revision: 789 Log: followup to r783, lump together similar substitutions Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Thu Jun 21 12:13:27 2012 (r788) +++ branches/experimental/Mk/bsd.gecko.mk Fri Jun 22 01:30:54 2012 (r789) @@ -782,26 +782,24 @@ ${ECHO_CMD} "unwind.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ fi .endfor - @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - ${WRKSRC}/config/autoconf.mk.in - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \ - ${MOZSRC}/security/coreconf/FreeBSD.mk \ - ${MOZSRC}/js/src/Makefile.in - @if [ -d ${WRKSRC}/directory/c-sdk ]; then \ - ${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ + @for f in \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/configure ; \ - fi - @-if [ -f ${WRKSRC}/configure ] ; then \ - ${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ + ${WRKSRC}/directory/c-sdk/configure \ + ${MOZSRC}/security/coreconf/FreeBSD.mk \ + ${MOZSRC}/js/src/Makefile.in \ ${MOZSRC}/js/src/configure \ ${MOZSRC}/configure \ - ${WRKSRC}/configure; \ - fi + ${WRKSRC}/configure; do \ + if [ -f $$f ] ; then \ + ${REINPLACE_CMD} -Ee 's|-lc_r|${PTHREAD_LIBS}|g ; \ + s|-l?pthread|${PTHREAD_LIBS}|g ; \ + s|echo aout|echo elf|g ; \ + s|/usr/X11R6|${LOCALBASE}|g' \ + $$f; \ + fi; \ + done + @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ + ${WRKSRC}/config/autoconf.mk.in @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/build/unix/run-mozilla.sh From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 22 01:31:54 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 DA7E01065672 for ; Fri, 22 Jun 2012 01:31:54 +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 A6D6A8FC0A for ; Fri, 22 Jun 2012 01:31:54 +0000 (UTC) Received: from tor20.anonymizer.ccc.de ([31.172.30.3]:55308 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1Shsiu-001oan-A7; Thu, 21 Jun 2012 21:31:45 -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:Subject:Cc:To:From; bh=KF/fnkTzw4paJCu/nG4bYfv6QuJ/LKXzaIXZbERw1dg=; b=AmTSoFiCHr61qIuvrnqXmNOaEMqAvmOJWxGBKyz1dEx3v6HNmfR9gCvAqr7i7Nt2RQvTjhAid37zs+jse+fmmn1xZ784oMyKBFwvBfBp49c754NcWRS3hKLpxHBaRfCeQoWY46280WdEOLJV2pplv2hiToH/cq/jDDpvf96tPpE=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1Shshe-0002ep-4R; Fri, 22 Jun 2012 01:30:27 +0000 From: Jan Beich To: Anton Shterenlikht Date: Thu, 21 Jun 2012 22:30:35 -0300 References: <201206141506.q5EF6VrH073265@trillian.chruetertee.ch> <20120614152853.GA1562@mech-cluster241.men.bris.ac.uk> <86k3z9rigm.fsf@tormail.org> <1Sgczz-000C7a-JR@internal.tormail.org> <20120620132252.GA859@mech-cluster241.men.bris.ac.uk> <20120620154156.GA22895@mech-cluster241.men.bris.ac.uk> <1ShNFI-000AFt-0E@internal.tormail.org> <1ShOjK-000HPg-Uy@internal.tormail.org> <20120621145155.GA94123@mech-cluster241.men.bris.ac.uk> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1Shshe-0002ep-4R@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: bsd.gecko.mk in r788 - problems 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, 22 Jun 2012 01:31:55 -0000 Anton Shterenlikht writes: [...] > "/usr/ports/www/firefox/experimental/Mk/bsd.port.mk", line 1479: if-less endif > "/usr/ports/www/firefox/experimental/Mk/bsd.port.mk", line 1534: if-less endif > "/usr/ports/www/firefox/experimental/Mk/bsd.port.mk", line 6342: if-less endif That file is out of date and won't work with new options. I have no clue why it's kept there but not present in trunk/. To build with freebsd-gecko you can either set up an overlay using portshaker et al. or copy missing files $ cp /usr/ports/Mk/*.mk Mk/ $ svn revert Mk/bsd.gecko.mk $ export PORTSDIR=$PWD From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 22 08:08:02 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 AD49E106566C; Fri, 22 Jun 2012 08:08:02 +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 8048F8FC15; Fri, 22 Jun 2012 08:08:02 +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 q5M882kk047007; Fri, 22 Jun 2012 08:08:02 GMT (envelope-from edwin@freefall.freebsd.org) Received: (from edwin@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5M882Jf046999; Fri, 22 Jun 2012 08:08:02 GMT (envelope-from edwin) Date: Fri, 22 Jun 2012 08:08:02 GMT Message-Id: <201206220808.q5M882Jf046999@freefall.freebsd.org> To: edwin@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, gecko@FreeBSD.org From: edwin@FreeBSD.org Cc: Subject: Re: ports/169231: [patch] Fix build for www/firefox using 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: Fri, 22 Jun 2012 08:08:02 -0000 Synopsis: [patch] Fix build for www/firefox using CLANG Responsible-Changed-From-To: freebsd-ports-bugs->gecko Responsible-Changed-By: edwin Responsible-Changed-When: Fri Jun 22 08:08:01 UTC 2012 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=169231 From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 22 12:10:54 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 835FE106564A for ; Fri, 22 Jun 2012 12:10:54 +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 38CF38FC0A for ; Fri, 22 Jun 2012 12:10:54 +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 1Si2hR-00033Z-AL for freebsd-gecko@freebsd.org; Fri, 22 Jun 2012 13:10:53 +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 1Si2hR-0001Sw-6M for freebsd-gecko@freebsd.org; Fri, 22 Jun 2012 13:10:53 +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 q5MCAq8Y087893 for ; Fri, 22 Jun 2012 13:10:52 +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 q5MCAqUX087892 for freebsd-gecko@freebsd.org; Fri, 22 Jun 2012 13:10:52 +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: Fri, 22 Jun 2012 13:10:52 +0100 From: Anton Shterenlikht To: freebsd-gecko@freebsd.org Message-ID: <20120622121052.GA86769@mech-cluster241.men.bris.ac.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Subject: firefox-nightly: /usr/ports/www/firefox/experimental/Templates/config.guess: No such file or directory 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, 22 Jun 2012 12:10:54 -0000 Building ff-nightly on r789: ===> FreeBSD 10 autotools fix applied to /usr/ports/www/firefox/experimental/www/firefox-nightly/work/mozilla-central-9602a9e99045/tools/profiler/libunwind/src/configure (cd /usr/ports/www/firefox/experimental/www/firefox-nightly/work/mozilla-central-9602a9e99045 && /usr/local/bin/autoconf-2.13) (cd /usr/ports/www/firefox/experimental/www/firefox-nightly/work/mozilla-central-9602a9e99045/js/src/ && /usr/local/bin/autoconf-2.13) cp: /usr/ports/www/firefox/experimental/Templates/config.guess: No such file or directory *** [do-configure] Error code 1 -- 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 Fri Jun 22 19:02:33 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 23491106568F for ; Fri, 22 Jun 2012 19:02:33 +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 98AFD8FC16 for ; Fri, 22 Jun 2012 19:02:32 +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 q5MJ2PTx085326 for ; Fri, 22 Jun 2012 19:02:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5MJ2KkJ083430 for freebsd-gecko@freebsd.org; Fri, 22 Jun 2012 19:02:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 22 Jun 2012 19:02:20 GMT Message-Id: <201206221902.q5MJ2KkJ083430@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] r790 - in branches/experimental: Mk www/firefox-nightly 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, 22 Jun 2012 19:02:33 -0000 Author: jbeich Date: Fri Jun 22 19:02:20 2012 New Revision: 790 Log: update Nightly Added: branches/experimental/www/firefox-nightly/files/patch-config-baseconfig.mk Deleted: branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/distinfo branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in branches/experimental/www/firefox-nightly/files/patch-configure.in Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Fri Jun 22 01:30:54 2012 (r789) +++ branches/experimental/Mk/bsd.gecko.mk Fri Jun 22 19:02:20 2012 (r790) @@ -798,8 +798,13 @@ $$f; \ fi; \ done - @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - ${WRKSRC}/config/autoconf.mk.in + @if [ -f ${WRKSRC}/config/baseconfig.mk ] ; then \ + ${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ + ${WRKSRC}/config/baseconfig.mk; \ + else \ + ${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ + ${WRKSRC}/config/autoconf.mk.in; \ + fi @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${MOZSRC}/build/unix/run-mozilla.sh Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Fri Jun 22 01:30:54 2012 (r789) +++ branches/experimental/www/firefox-nightly/Makefile Fri Jun 22 19:02:20 2012 (r790) @@ -57,7 +57,7 @@ OPTIONS_DEFINE= PGO PGO_DESC= Enable Profile-Guided Optimization -HGREV= 96890:9602a9e99045 +HGREV= 97387:93439ef24979 .include Modified: branches/experimental/www/firefox-nightly/distinfo ============================================================================== --- branches/experimental/www/firefox-nightly/distinfo Fri Jun 22 01:30:54 2012 (r789) +++ branches/experimental/www/firefox-nightly/distinfo Fri Jun 22 19:02:20 2012 (r790) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/9602a9e99045.tar.bz2) = f94d4cdaf0a05b543dce113dfe2c208fc80d4c9e63966e4db4b5f85c7dcd6056 -SIZE (firefox-nightly/9602a9e99045.tar.bz2) = 82641467 +SHA256 (firefox-nightly/93439ef24979.tar.bz2) = 15bf9dc23ce68ea681b43ed0885328f4ef6c6f9d69cd9626fdd5c17327ac3fcc +SIZE (firefox-nightly/93439ef24979.tar.bz2) = 86930297 Added: branches/experimental/www/firefox-nightly/files/patch-config-baseconfig.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-config-baseconfig.mk Fri Jun 22 19:02:20 2012 (r790) @@ -0,0 +1,16 @@ +--- config/baseconfig.mk~ ++++ config/baseconfig.mk +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/%%MOZILLA%% ++idldir = $(datadir)/idl/%%MOZILLA%% ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't Modified: branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in Fri Jun 22 01:30:54 2012 (r789) +++ branches/experimental/www/firefox-nightly/files/patch-config_autoconf.mk.in Fri Jun 22 19:02:20 2012 (r790) @@ -1,30 +1,11 @@ --- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 +++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 -@@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% +@@ -287,7 +287,7 @@ WCHAR_CFLAGS = @WCHAR_CFLAGS@ + OS_CPPFLAGS = @OS_CPPFLAGS@ + OS_CFLAGS = @OS_CFLAGS@ + OS_CXXFLAGS = @OS_CXXFLAGS@ +-OS_LDFLAGS = @OS_LDFLAGS@ ++OS_LDFLAGS = @OS_LDFLAGS@ -lc --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -@@ -275,7 +275,7 @@ - OS_CPPFLAGS = @CPPFLAGS@ - OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ - OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ --OS_LDFLAGS = @LDFLAGS@ -+OS_LDFLAGS = @LDFLAGS@ -lc - - OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ - OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ + OS_COMPILE_CFLAGS = @OS_COMPILE_CFLAGS@ + OS_COMPILE_CXXFLAGS = @OS_COMPILE_CXXFLAGS@ Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun 22 01:30:54 2012 (r789) +++ branches/experimental/www/firefox-nightly/files/patch-configure.in Fri Jun 22 19:02:20 2012 (r790) @@ -41,14 +41,14 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS -@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS +@@ -4101,7 +4105,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS --if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then -+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then - ZLIB_CFLAGS="-I${ZLIB_DIR}/include" - ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then + MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi @@ -6022,6 +6024,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" Deleted: branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp Fri Jun 22 19:02:20 2012 (r789) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- content/media/gstreamer/nsGStreamerReader.cpp~ -+++ content/media/gstreamer/nsGStreamerReader.cpp -@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata - * stream but that are otherwise decodeable. - */ - guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO, -- ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO}; -+ static_cast(~GST_PLAY_FLAG_AUDIO), static_cast(~GST_PLAY_FLAG_VIDEO)}; - guint default_flags, current_flags; - g_object_get(mPlayBin, "flags", &default_flags, NULL); - Deleted: branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp Fri Jun 22 19:02:20 2012 (r789) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- 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 From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 23 02:49:10 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 58FC1106564A for ; Sat, 23 Jun 2012 02:49:10 +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 E39538FC0A for ; Sat, 23 Jun 2012 02:49:09 +0000 (UTC) Received: from anon.xmission.com ([166.70.207.2]:48041 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1Si4DC-004Mg6-U6; Fri, 22 Jun 2012 09:47:50 -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=3Kw/T+1qHkZ9rtaDfH2lKojvtHQkvBbxY5Vwmt/Bdc4=; b=pe1pjyxxn7TiwlDT5AEoHDAVjsddeQSq4ckGLVhmhCj1GFVVXHyGZQlcliUrchSKmH08F8j9P5f+xcdvQFw9/14M1r7VG4bMJhba+WZVg6RhPYCYNFAF7OSLXnL2EZ8URJH0mg7YaJaUWkfR3u/b2+bDPEcpJenosKHPIJTRPAI=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1Si4C2-000Dl2-4q; Fri, 22 Jun 2012 13:46:36 +0000 From: Jan Beich To: Anton Shterenlikht In-Reply-To: <20120622121052.GA86769@mech-cluster241.men.bris.ac.uk> (Anton Shterenlikht's message of "Fri, 22 Jun 2012 13:10:52 +0100") Date: Fri, 22 Jun 2012 06:46:45 -0700 References: <20120622121052.GA86769@mech-cluster241.men.bris.ac.uk> MIME-Version: 1.0 Content-Type: text/plain X-TorMail-User: jbeich Message-Id: <1Si4C2-000Dl2-4q@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: firefox-nightly: /usr/ports/www/firefox/experimental/Templates/config.guess: No such file or directory 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, 23 Jun 2012 02:49:10 -0000 Anton Shterenlikht writes: > Building ff-nightly on r789: > > ===> FreeBSD 10 autotools fix applied to > /usr/ports/www/firefox/experimental/www/firefox-nightly/work/mozilla-central-9602a9e99045/tools/profiler/libunwind/src/configure > (cd > /usr/ports/www/firefox/experimental/www/firefox-nightly/work/mozilla-central-9602a9e99045 > && /usr/local/bin/autoconf-2.13) > (cd > /usr/ports/www/firefox/experimental/www/firefox-nightly/work/mozilla-central-9602a9e99045/js/src/ > && /usr/local/bin/autoconf-2.13) > cp: /usr/ports/www/firefox/experimental/Templates/config.guess: No > such file or directory > *** [do-configure] Error code 1 Looks like you also need to copy /usr/ports/Templates directory to $PORTSDIR or invoke the build like this, e.g. $ make install WITHOUT_FBSD10_FIX= autotools infer version from OSREL, or rather CONFIGURE_TARGET tuple. So, the following is more correct and works with UNAME_r=9.9-FOO workaround. Index: Mk/bsd.port.mk =================================================================== RCS file: /a/.csup/ports/Mk/bsd.port.mk,v retrieving revision 1.729 diff -u -p -r1.729 bsd.port.mk --- Mk/bsd.port.mk 15 Jun 2012 12:04:52 -0000 1.729 +++ Mk/bsd.port.mk 16 Jun 2012 14:49:35 -0000 @@ -3641,7 +3655,7 @@ do-patch: .if !target(run-autotools-fixup) run-autotools-fixup: # Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. -.if ${OSVERSION} >= 1000000 && !defined(WITHOUT_FBSD10_FIX) +.if ${OSREL:R} > 9 && !defined(WITHOUT_FBSD10_FIX) -@for f in `${FIND} ${WRKDIR} -type f \( -name config.libpath -o \ -name config.rpath -o -name configure -o -name libtool.m4 -o \ -name ltconfig -o -name libtool -o -name aclocal.m4 -o \ From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 23 13:13: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 5B8A8106566C for ; Sat, 23 Jun 2012 13:13: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 ED2108FC0C for ; Sat, 23 Jun 2012 13:13:29 +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 q5NDDSoR050350 for ; Sat, 23 Jun 2012 13:13:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5NDDNeM049089 for freebsd-gecko@freebsd.org; Sat, 23 Jun 2012 13:13:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Jun 2012 13:13:23 GMT Message-Id: <201206231313.q5NDDNeM049089@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] r791 - in branches/experimental/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, 23 Jun 2012 13:13:30 -0000 Author: jbeich Date: Sat Jun 23 13:13:23 2012 New Revision: 791 Log: update SeaMonkey, patch from beat@ Added: branches/experimental/www/seamonkey/files/patch-bugzilla-736961 branches/experimental/www/seamonkey/files/patch-suite-installer-Makefile.in Modified: branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey/distinfo branches/experimental/www/seamonkey/files/patch-mozilla-configure.in branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Fri Jun 22 19:02:20 2012 (r790) +++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:13:23 2012 (r791) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.9 +DISTVERSION= 2.10.1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -34,6 +34,7 @@ MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin +EXTRA_CFLAGS= -O0 USE_GCC= 4.2+ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} Modified: branches/experimental/www/seamonkey/distinfo ============================================================================== --- branches/experimental/www/seamonkey/distinfo Fri Jun 22 19:02:20 2012 (r790) +++ branches/experimental/www/seamonkey/distinfo Sat Jun 23 13:13:23 2012 (r791) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.9.source.tar.bz2) = d3be08bbd8f7a3f20f650bfe32ee51c3618a07b5852336a1f3595e37c14311fb -SIZE (seamonkey-2.9.source.tar.bz2) = 102265124 +SHA256 (seamonkey-2.10.1.source.tar.bz2) = 96e9542393d14a7522d05993b54239b2d45bc7198389a56e1e56af97038cac8f +SIZE (seamonkey-2.10.1.source.tar.bz2) = 103439433 Added: branches/experimental/www/seamonkey/files/patch-bugzilla-736961 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-bugzilla-736961 Sat Jun 23 13:13:23 2012 (r791) @@ -0,0 +1,111 @@ +--- mozilla/config/rules.mk.orig Wed May 2 05:16:35 2012 ++++ mozilla/config/rules.mk Fri May 11 08:42:50 2012 +@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + @if test -n "$(findstring $*.h, $(EXPORTS))"; \ + then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi + +@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ + -I$(topsrcdir)/xpcom/typelib/xpt/tools \ +- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + + # no need to link together if XPIDLSRCS contains only XPIDL_MODULE + ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) +--- mozilla/js/src/config/rules.mk.orig Fri May 11 08:42:57 2012 ++++ mozilla/js/src/config/rules.mk Fri May 11 08:43:15 2012 +@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + @if test -n "$(findstring $*.h, $(EXPORTS))"; \ + then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi + +@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ + -I$(topsrcdir)/xpcom/typelib/xpt/tools \ +- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ ++ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ + + # no need to link together if XPIDLSRCS contains only XPIDL_MODULE + ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) +--- mozilla/js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012 ++++ mozilla/js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012 +@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/qsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output dom_quickstubs.h \ + --stub-output dom_quickstubs.cpp \ + --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \ +@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dombindingsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output dombindings_gen.h \ + $(srcdir)/dombindings.conf + +@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \ + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dombindingsgen.py \ + --idlpath=$(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --stub-output dombindings_gen.cpp \ + --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \ + $(srcdir)/dombindings.conf +@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dictionary_helper_gen.py \ + -I $(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output DictionaryHelpers.h \ + $(srcdir)/dictionary_helper_gen.conf + +@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen + -I$(topsrcdir)/xpcom/idl-parser \ + $(srcdir)/dictionary_helper_gen.py \ + -I $(DEPTH)/dist/idl \ +- --cachedir=$(DEPTH)/xpcom/idl-parser \ ++ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ + --header-output DictionaryHelpers.h \ + --stub-output DictionaryHelpers.cpp \ + --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \ +--- mozilla/xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012 ++++ mozilla/xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012 +@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS) + $(PYTHON_PATH) \ + -I$(topsrcdir)/other-licenses/ply \ + -I$(topsrcdir)/xpcom/idl-parser \ +- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen ++ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen + + check:: + $(PYTHON_PATH) \ +--- mozilla/xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012 ++++ mozilla/xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012 +@@ -48,8 +48,8 @@ SDK_BINARY = \ + $(topsrcdir)/xpcom/idl-parser/xpidl.py \ + $(topsrcdir)/xpcom/idl-parser/header.py \ + $(topsrcdir)/xpcom/idl-parser/typelib.py \ +- $(DEPTH)/xpcom/idl-parser/xpidllex.py \ +- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \ ++ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \ ++ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \ + $(NULL) + + ifndef MOZ_SYSTEM_PLY Modified: branches/experimental/www/seamonkey/files/patch-mozilla-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Fri Jun 22 19:02:20 2012 (r790) +++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Sat Jun 23 13:13:23 2012 (r791) @@ -1,6 +1,6 @@ ---- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 -@@ -1549,7 +1549,7 @@ +--- mozilla/configure.in.orig 2012-05-23 20:56:34.000000000 +0200 ++++ mozilla/configure.in 2012-05-27 18:18:25.000000000 +0200 +@@ -1517,7 +1517,7 @@ CPU_ARCH=sparc ;; @@ -9,7 +9,7 @@ CPU_ARCH="$OS_TEST" ;; -@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp +@@ -1539,7 +1539,7 @@ dnl =============================================================== INTEL_ARCHITECTURE= case "$OS_TEST" in @@ -18,33 +18,6 @@ INTEL_ARCHITECTURE=1 esac -@@ -3803,19 +3803,21 @@ - AC_CHECK_FUNCS(localtime_r strtok_r) - - dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt --_SAVE_LDFLAGS=$LDFLAGS --LDFLAGS="$LDFLAGS -lrt" --AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, -+_SAVE_LIBS=$LIBS -+AC_SEARCH_LIBS(clock_gettime, rt) -+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), - ac_cv_have_clock_monotonic, - [AC_TRY_LINK([#include ], - [ struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); ], - ac_cv_have_clock_monotonic=yes, - ac_cv_have_clock_monotonic=no)]) --LDFLAGS=$_SAVE_LDFLAGS -+LIBS=$_SAVE_LIBS - if test "$ac_cv_have_clock_monotonic" = "yes"; then - HAVE_CLOCK_MONOTONIC=1 -- REALTIME_LIBS=-lrt -+ if test "$ac_cv_search_clock_gettime" != "none required"; then -+ REALTIME_LIBS=$ac_cv_search_clock_gettime -+ fi - 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= @@ -77,7 +50,7 @@ ZLIB_CFLAGS="-I${ZLIB_DIR}/include" ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" fi -@@ -6022,6 +6024,14 @@ +@@ -5903,6 +5903,14 @@ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" VPX_X86_ASM=1 ;; @@ -92,7 +65,7 @@ SunOS:x86) VPX_ASFLAGS="-f elf32 -rnasm -pnasm" VPX_X86_ASM=1 -@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then +@@ -6297,6 +6305,14 @@ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" LIBJPEG_TURBO_X64_ASM=1 ;; Modified: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in Fri Jun 22 19:02:20 2012 (r790) +++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-configure.in Sat Jun 23 13:13:23 2012 (r791) @@ -1,20 +1,40 @@ ---- mozilla/js/src/configure.in.orig 2012-03-12 10:27:55.000000000 +0100 -+++ mozilla/js/src/configure.in 2012-03-12 10:28:22.000000000 +0100 -@@ -2831,12 +2831,14 @@ - AC_DEFINE(JS_NUNBOX32) +--- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100 ++++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100 +@@ -1470,7 +1470,7 @@ + CPU_ARCH=sparc ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 - ENABLE_POLYIC=1 - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" ;; + +@@ -1492,7 +1492,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 esac +@@ -2814,6 +2814,16 @@ + AC_DEFINE(JS_CPU_X86) + AC_DEFINE(JS_NUNBOX32) + ;; ++amd64*-*) ++ ENABLE_TRACEJIT=1 ++ NANOJIT_ARCH=X64 ++ ENABLE_METHODJIT=1 ++ ENABLE_MONOIC=1 ++ ENABLE_POLYIC=1 ++ ENABLE_POLYIC_TYPED_ARRAY=1 ++ AC_DEFINE(JS_CPU_X64) ++ AC_DEFINE(JS_PUNBOX64) ++ ;; + x86_64*-*) + ENABLE_METHODJIT=1 + ENABLE_MONOIC=1 @@ -5946,6 +5946,7 @@ _EGREP_PATTERN="${_EGREP_PATTERN}dummy_n * C++ implementations should define these macros only when __STDC_LIMIT_MACROS * is defined before is included. */ Modified: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Fri Jun 22 19:02:20 2012 (r790) +++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:13:23 2012 (r791) @@ -1,12 +1,11 @@ ---- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 -+++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 -@@ -181,7 +181,7 @@ - export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) - $(INSTALL) $^ . +--- mozilla/toolkit/library/Makefile.in.orig 2012-06-15 14:04:29.000000000 +0200 ++++ mozilla/toolkit/library/Makefile.in 2012-06-19 20:48:15.000000000 +0200 +@@ -438,7 +443,7 @@ + endif + endif -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) +EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% - ifdef MOZ_ENABLE_LIBXUL - include $(srcdir)/libxul-rules.mk - + DEFINES += -DIMPL_XREAPI + Added: branches/experimental/www/seamonkey/files/patch-suite-installer-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-suite-installer-Makefile.in Sat Jun 23 13:13:23 2012 (r791) @@ -0,0 +1,11 @@ +--- suite/installer/Makefile.in.orig 2012-06-19 20:42:29.000000000 +0200 ++++ suite/installer/Makefile.in 2012-06-19 20:42:54.000000000 +0200 +@@ -49,7 +49,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Be fatal, except when building with XULRunner which already bundles some files. + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 23 13:14:31 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 0C5E51065676 for ; Sat, 23 Jun 2012 13:14:31 +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 6F5688FC1E for ; Sat, 23 Jun 2012 13:14: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 q5NDETRa052889 for ; Sat, 23 Jun 2012 13:14:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5NDEOLt050876 for freebsd-gecko@freebsd.org; Sat, 23 Jun 2012 13:14:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Jun 2012 13:14:24 GMT Message-Id: <201206231314.q5NDEOLt050876@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] r792 - in branches/experimental: Mk mail/thunderbird mail/thunderbird/files www/firefox www/firefox-nightly www/firefox/files www/seamonkey 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, 23 Jun 2012 13:14:31 -0000 Author: jbeich Date: Sat Jun 23 13:14:24 2012 New Revision: 792 Log: use objdir build Deleted: branches/experimental/mail/thunderbird/files/patch-bugzilla-736961 branches/experimental/www/firefox/files/patch-bugzilla-736961 branches/experimental/www/seamonkey/files/patch-bugzilla-736961 branches/experimental/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/mail/thunderbird/Makefile branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Sat Jun 23 13:13:23 2012 (r791) +++ branches/experimental/Mk/bsd.gecko.mk Sat Jun 23 13:14:24 2012 (r792) @@ -739,6 +739,15 @@ MOZ_OPTIONS+= --disable-v1-string-abi .endif +.if defined(GNU_CONFIGURE) && defined(OBJDIR_BUILD) +CONFIGURE_SCRIPT=../configure + +MOZ_OBJDIR= ${WRKSRC}/obj-${CONFIGURE_TARGET} +CONFIGURE_WRKSRC=${MOZ_OBJDIR} +BUILD_WRKSRC= ${MOZ_OBJDIR} +INSTALL_WRKSRC= ${MOZ_OBJDIR} +.endif + .else # bsd.port.post.mk post-patch: gecko-post-patch gecko-moz-pis-patch @@ -826,6 +835,13 @@ @${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz} .endfor +pre-configure: gecko-pre-configure + +gecko-pre-configure: +.if defined(GNU_CONFIGURE) && defined(OBJDIR_BUILD) + ${MKDIR} ${MOZ_OBJDIR} +.endif + post-configure: gecko-post-configure gecko-post-configure: Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:13:23 2012 (r791) +++ branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:14:24 2012 (r792) @@ -35,6 +35,7 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" GNU_CONFIGURE= yes +OBJDIR_BUILD= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Deleted: branches/experimental/mail/thunderbird/files/patch-bugzilla-736961 ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-bugzilla-736961 Sat Jun 23 13:14:24 2012 (r791) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,111 +0,0 @@ ---- mozilla/config/rules.mk.orig Wed May 2 05:16:35 2012 -+++ mozilla/config/rules.mk Fri May 11 08:42:50 2012 -@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - @if test -n "$(findstring $*.h, $(EXPORTS))"; \ - then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi - -@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ - -I$(topsrcdir)/xpcom/typelib/xpt/tools \ -- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - - # no need to link together if XPIDLSRCS contains only XPIDL_MODULE - ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) ---- mozilla/js/src/config/rules.mk.orig Fri May 11 08:42:57 2012 -+++ mozilla/js/src/config/rules.mk Fri May 11 08:43:15 2012 -@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - @if test -n "$(findstring $*.h, $(EXPORTS))"; \ - then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi - -@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ - -I$(topsrcdir)/xpcom/typelib/xpt/tools \ -- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - - # no need to link together if XPIDLSRCS contains only XPIDL_MODULE - ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) ---- mozilla/js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012 -+++ mozilla/js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012 -@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/qsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output dom_quickstubs.h \ - --stub-output dom_quickstubs.cpp \ - --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \ -@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dombindingsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output dombindings_gen.h \ - $(srcdir)/dombindings.conf - -@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dombindingsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --stub-output dombindings_gen.cpp \ - --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \ - $(srcdir)/dombindings.conf -@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output DictionaryHelpers.h \ - $(srcdir)/dictionary_helper_gen.conf - -@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output DictionaryHelpers.h \ - --stub-output DictionaryHelpers.cpp \ - --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \ ---- mozilla/xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012 -+++ mozilla/xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012 -@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS) - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen - - check:: - $(PYTHON_PATH) \ ---- mozilla/xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012 -+++ mozilla/xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012 -@@ -48,8 +48,8 @@ SDK_BINARY = \ - $(topsrcdir)/xpcom/idl-parser/xpidl.py \ - $(topsrcdir)/xpcom/idl-parser/header.py \ - $(topsrcdir)/xpcom/idl-parser/typelib.py \ -- $(DEPTH)/xpcom/idl-parser/xpidllex.py \ -- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \ -+ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \ -+ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \ - $(NULL) - - ifndef MOZ_SYSTEM_PLY Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sat Jun 23 13:13:23 2012 (r791) +++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 23 13:14:24 2012 (r792) @@ -59,6 +59,10 @@ HGREV= 97387:93439ef24979 +.if ${USE_MOZILLA:M-nss} +OBJDIR_BUILD= yes +.endif + .include .if empty(CXX:M*clang++*) && ${OSVERSION} > 900000 Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sat Jun 23 13:13:23 2012 (r791) +++ branches/experimental/www/firefox/Makefile Sat Jun 23 13:14:24 2012 (r792) @@ -37,6 +37,7 @@ ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} GNU_CONFIGURE= yes +OBJDIR_BUILD= yes USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl Deleted: branches/experimental/www/firefox/files/patch-bugzilla-736961 ============================================================================== --- branches/experimental/www/firefox/files/patch-bugzilla-736961 Sat Jun 23 13:14:24 2012 (r791) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,111 +0,0 @@ ---- config/rules.mk.orig Wed May 2 05:16:35 2012 -+++ config/rules.mk Fri May 11 08:42:50 2012 -@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - @if test -n "$(findstring $*.h, $(EXPORTS))"; \ - then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi - -@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ - -I$(topsrcdir)/xpcom/typelib/xpt/tools \ -- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - - # no need to link together if XPIDLSRCS contains only XPIDL_MODULE - ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) ---- js/src/config/rules.mk.orig Fri May 11 08:42:57 2012 -+++ js/src/config/rules.mk Fri May 11 08:43:15 2012 -@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - @if test -n "$(findstring $*.h, $(EXPORTS))"; \ - then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi - -@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ - -I$(topsrcdir)/xpcom/typelib/xpt/tools \ -- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - - # no need to link together if XPIDLSRCS contains only XPIDL_MODULE - ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) ---- js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012 -+++ js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012 -@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/qsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output dom_quickstubs.h \ - --stub-output dom_quickstubs.cpp \ - --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \ -@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dombindingsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output dombindings_gen.h \ - $(srcdir)/dombindings.conf - -@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dombindingsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --stub-output dombindings_gen.cpp \ - --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \ - $(srcdir)/dombindings.conf -@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output DictionaryHelpers.h \ - $(srcdir)/dictionary_helper_gen.conf - -@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output DictionaryHelpers.h \ - --stub-output DictionaryHelpers.cpp \ - --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \ ---- xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012 -+++ xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012 -@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS) - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen - - check:: - $(PYTHON_PATH) \ ---- xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012 -+++ xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012 -@@ -48,8 +48,8 @@ SDK_BINARY = \ - $(topsrcdir)/xpcom/idl-parser/xpidl.py \ - $(topsrcdir)/xpcom/idl-parser/header.py \ - $(topsrcdir)/xpcom/idl-parser/typelib.py \ -- $(DEPTH)/xpcom/idl-parser/xpidllex.py \ -- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \ -+ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \ -+ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \ - $(NULL) - - ifndef MOZ_SYSTEM_PLY Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:13:23 2012 (r791) +++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:14:24 2012 (r792) @@ -29,6 +29,7 @@ WANT_GNOME= yes WANT_PERL= yes GNU_CONFIGURE= yes +OBJDIR_BUILD= yes ALL_TARGET= default USE_GL= gl MAKE_JOBS_SAFE= yes Deleted: branches/experimental/www/seamonkey/files/patch-bugzilla-736961 ============================================================================== --- branches/experimental/www/seamonkey/files/patch-bugzilla-736961 Sat Jun 23 13:14:24 2012 (r791) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,111 +0,0 @@ ---- mozilla/config/rules.mk.orig Wed May 2 05:16:35 2012 -+++ mozilla/config/rules.mk Fri May 11 08:42:50 2012 -@@ -1479,7 +1487,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - @if test -n "$(findstring $*.h, $(EXPORTS))"; \ - then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi - -@@ -1492,7 +1500,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ - -I$(topsrcdir)/xpcom/typelib/xpt/tools \ -- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - - # no need to link together if XPIDLSRCS contains only XPIDL_MODULE - ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) ---- mozilla/js/src/config/rules.mk.orig Fri May 11 08:42:57 2012 -+++ mozilla/js/src/config/rules.mk Fri May 11 08:43:15 2012 -@@ -1479,7 +1479,7 @@ $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_ - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - @if test -n "$(findstring $*.h, $(EXPORTS))"; \ - then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi - -@@ -1492,7 +1492,7 @@ $(XPIDL_GEN_DIR)/%.xpt: %.idl $(XPIDL_DEPS) $(XPIDL_GE - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ - -I$(topsrcdir)/xpcom/typelib/xpt/tools \ -- $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ -+ $(topsrcdir)/xpcom/idl-parser/typelib.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@ - - # no need to link together if XPIDLSRCS contains only XPIDL_MODULE - ifneq ($(XPIDL_MODULE).idl,$(strip $(XPIDLSRCS))) ---- mozilla/js/xpconnect/src/Makefile.in.orig Fri May 11 08:43:27 2012 -+++ mozilla/js/xpconnect/src/Makefile.in Fri May 11 08:44:03 2012 -@@ -151,7 +151,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/qsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output dom_quickstubs.h \ - --stub-output dom_quickstubs.cpp \ - --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \ -@@ -172,7 +172,7 @@ dombindings_gen.h: $(srcdir)/dombindings.conf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dombindingsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output dombindings_gen.h \ - $(srcdir)/dombindings.conf - -@@ -189,7 +189,7 @@ dombindings_gen.cpp: $(srcdir)/dombindings.conf \ - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dombindingsgen.py \ - --idlpath=$(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --stub-output dombindings_gen.cpp \ - --makedepend-output $(MDDEPDIR)/dombindingsgen.pp \ - $(srcdir)/dombindings.conf -@@ -208,7 +208,7 @@ DictionaryHelpers.h: $(srcdir)/dictionary_helper_gen.c - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output DictionaryHelpers.h \ - $(srcdir)/dictionary_helper_gen.conf - -@@ -223,7 +223,7 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen - -I$(topsrcdir)/xpcom/idl-parser \ - $(srcdir)/dictionary_helper_gen.py \ - -I $(DEPTH)/dist/idl \ -- --cachedir=$(DEPTH)/xpcom/idl-parser \ -+ --cachedir=$(DEPTH)/xpcom/idl-parser/cache \ - --header-output DictionaryHelpers.h \ - --stub-output DictionaryHelpers.cpp \ - --makedepend-output $(MDDEPDIR)/dictionary_helper_gen.pp \ ---- mozilla/xpcom/idl-parser/Makefile.in.orig Fri May 11 08:44:10 2012 -+++ mozilla/xpcom/idl-parser/Makefile.in Fri May 11 08:44:29 2012 -@@ -61,7 +61,7 @@ export:: $(PARSER_SRCS) $(PLY_PROGS) - $(PYTHON_PATH) \ - -I$(topsrcdir)/other-licenses/ply \ - -I$(topsrcdir)/xpcom/idl-parser \ -- $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=. --regen -+ $(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(DEPTH)/xpcom/idl-parser/cache --regen - - check:: - $(PYTHON_PATH) \ ---- mozilla/xpcom/typelib/xpidl/Makefile.in.orig Fri May 11 08:44:51 2012 -+++ mozilla/xpcom/typelib/xpidl/Makefile.in Fri May 11 08:45:09 2012 -@@ -48,8 +48,8 @@ SDK_BINARY = \ - $(topsrcdir)/xpcom/idl-parser/xpidl.py \ - $(topsrcdir)/xpcom/idl-parser/header.py \ - $(topsrcdir)/xpcom/idl-parser/typelib.py \ -- $(DEPTH)/xpcom/idl-parser/xpidllex.py \ -- $(DEPTH)/xpcom/idl-parser/xpidlyacc.py \ -+ $(DEPTH)/xpcom/idl-parser/cache/xpidllex.py \ -+ $(DEPTH)/xpcom/idl-parser/cache/xpidlyacc.py \ - $(NULL) - - ifndef MOZ_SYSTEM_PLY Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h Sat Jun 23 13:14:24 2012 (r791) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/config/gcc-stl-wrapper.template.h.orig 2010-05-12 13:56:18.000000000 +0000 -+++ mozilla/config/gcc-stl-wrapper.template.h 2010-05-12 13:56:52.000000000 +0000 -@@ -89,7 +89,7 @@ - // -fshort-wchar). We don't want that and so define our own inlined - // __throw_*(). - #ifndef mozilla_throw_gcc_h --# include "mozilla/throw_gcc.h" -+# include "../../memory/mozalloc/throw_gcc.h" - #endif - - #endif // if mozilla_${HEADER}_h From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 23 13:17:50 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 137DF1065672 for ; Sat, 23 Jun 2012 13:17:50 +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 764028FC1A for ; Sat, 23 Jun 2012 13:17:49 +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 q5NDHmCj065596 for ; Sat, 23 Jun 2012 13:17: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 q5NDHg6H057634 for freebsd-gecko@freebsd.org; Sat, 23 Jun 2012 13:17:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Jun 2012 13:17:42 GMT Message-Id: <201206231317.q5NDHg6H057634@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] r793 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/firefox-beta www/firefox-esr www/libxul 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, 23 Jun 2012 13:17:50 -0000 Author: jbeich Date: Sat Jun 23 13:17:42 2012 New Revision: 793 Log: followup to r737: add libc++ fix for the rest gecko >= 2.0 ports clang fix is based on patch from jkim@ Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-time_posix.cc branches/experimental/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp branches/experimental/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-time_posix.cc branches/experimental/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp branches/experimental/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-time_posix.cc branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-time_posix.cc branches/experimental/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp branches/experimental/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp branches/experimental/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in Modified: branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp branches/experimental/www/firefox-beta/Makefile branches/experimental/www/firefox-esr/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/seamonkey-beta/Makefile branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:17:42 2012 (r793) @@ -92,6 +92,16 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if !empty(CXX:M*clang++*) +CFLAGS+= -Wno-return-type-c-linkage +.endif + +.if ${CXXFLAGS:M-stdlib=libc++} +CXXABI= -lcxxrt +.else +CXXABI= # implied +.endif + .if defined(WITH_LIGHTNING) MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar @@ -113,6 +123,7 @@ -e 's|/proc/self/fd|/dev/fd|' \ -e 's|/proc["/]|/compat/linux&|' @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ + -e 's|%%CXXABI%%|${CXXABI}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793) @@ -1,6 +1,6 @@ --- mozilla/ipc/chromium/src/base/file_util_linux.cc~ +++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { +@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { #ifdef ANDROID return GetTempDir(path); #else Added: branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/time_posix.cc~ ++++ mozilla/ipc/chromium/src/base/time_posix.cc +@@ -8,6 +9,7 @@ + #include + #endif + #include ++#include + #ifdef ANDROID + #include + #else Added: branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,20 @@ +--- mailnews/addrbook/src/nsDirPrefs.cpp~ ++++ mailnews/addrbook/src/nsDirPrefs.cpp +@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid + DIR_Server *s=nsnull; + + switch (position) { +- case DIR_POS_APPEND: ++ case (PRInt32)DIR_POS_APPEND: + /* Do nothing if the request is to append a server that is already + * in the list. + */ +@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid + wholeList->AppendElement(server); + break; + +- case DIR_POS_DELETE: ++ case (PRInt32)DIR_POS_DELETE: + /* Remove the prefs corresponding to the given server. If the prefName + * value is nsnull, the server has never been saved and there are no + * prefs to remove. Added: branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,29 @@ +--- mailnews/compose/src/nsSmtpProtocol.cpp~ ++++ mailnews/compose/src/nsSmtpProtocol.cpp +@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr + + switch (code) + { +- case NS_ERROR_SMTP_SERVER_ERROR: +- case NS_ERROR_TCP_READ_ERROR: +- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: +- case NS_ERROR_SENDING_FROM_COMMAND: +- case NS_ERROR_SENDING_RCPT_COMMAND: +- case NS_ERROR_SENDING_DATA_COMMAND: +- case NS_ERROR_SENDING_MESSAGE: +- case NS_ERROR_SMTP_GREETING: ++ case (int)NS_ERROR_SMTP_SERVER_ERROR: ++ case (int)NS_ERROR_TCP_READ_ERROR: ++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: ++ case (int)NS_ERROR_SENDING_FROM_COMMAND: ++ case (int)NS_ERROR_SENDING_RCPT_COMMAND: ++ case (int)NS_ERROR_SENDING_DATA_COMMAND: ++ case (int)NS_ERROR_SENDING_MESSAGE: ++ case (int)NS_ERROR_SMTP_GREETING: + bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); + msg = nsTextFormatter::vsmprintf(eMsg.get(), args); + break; Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,11 @@ +--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793) @@ -5,7 +5,7 @@ $(INSTALL) $^ . -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%% ifdef MOZ_ENABLE_LIBXUL include $(srcdir)/libxul-rules.mk Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -8,3 +8,11 @@ #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code +@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb + + #elif defined(HAVE__UNWIND_BACKTRACE) + ++#define _GNU_SOURCE + // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 + #include + Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:17:42 2012 (r793) @@ -93,6 +93,16 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if !empty(CXX:M*clang++*) +CFLAGS+= -Wno-return-type-c-linkage +.endif + +.if ${CXXFLAGS:M-stdlib=libc++} +CXXABI= -lcxxrt +.else +CXXABI= # implied +.endif + .if defined(WITH_LIGHTNING) MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar @@ -114,6 +124,7 @@ -e 's|/proc/self/fd|/dev/fd|' \ -e 's|/proc["/]|/compat/linux&|' @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ + -e 's|%%CXXABI%%|${CXXABI}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793) @@ -1,6 +1,6 @@ --- mozilla/ipc/chromium/src/base/file_util_linux.cc~ +++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { +@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { #ifdef ANDROID return GetTempDir(path); #else Added: branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-time_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/time_posix.cc~ ++++ mozilla/ipc/chromium/src/base/time_posix.cc +@@ -8,6 +9,7 @@ + #include + #endif + #include ++#include + #ifdef ANDROID + #include + #else Added: branches/experimental/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,20 @@ +--- mailnews/addrbook/src/nsDirPrefs.cpp~ ++++ mailnews/addrbook/src/nsDirPrefs.cpp +@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid + DIR_Server *s=nsnull; + + switch (position) { +- case DIR_POS_APPEND: ++ case (PRInt32)DIR_POS_APPEND: + /* Do nothing if the request is to append a server that is already + * in the list. + */ +@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid + wholeList->AppendElement(server); + break; + +- case DIR_POS_DELETE: ++ case (PRInt32)DIR_POS_DELETE: + /* Remove the prefs corresponding to the given server. If the prefName + * value is nsnull, the server has never been saved and there are no + * prefs to remove. Added: branches/experimental/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,29 @@ +--- mailnews/compose/src/nsSmtpProtocol.cpp~ ++++ mailnews/compose/src/nsSmtpProtocol.cpp +@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr + + switch (code) + { +- case NS_ERROR_SMTP_SERVER_ERROR: +- case NS_ERROR_TCP_READ_ERROR: +- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: +- case NS_ERROR_SENDING_FROM_COMMAND: +- case NS_ERROR_SENDING_RCPT_COMMAND: +- case NS_ERROR_SENDING_DATA_COMMAND: +- case NS_ERROR_SENDING_MESSAGE: +- case NS_ERROR_SMTP_GREETING: ++ case (int)NS_ERROR_SMTP_SERVER_ERROR: ++ case (int)NS_ERROR_TCP_READ_ERROR: ++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: ++ case (int)NS_ERROR_SENDING_FROM_COMMAND: ++ case (int)NS_ERROR_SENDING_RCPT_COMMAND: ++ case (int)NS_ERROR_SENDING_DATA_COMMAND: ++ case (int)NS_ERROR_SENDING_MESSAGE: ++ case (int)NS_ERROR_SMTP_GREETING: + bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); + msg = nsTextFormatter::vsmprintf(eMsg.get(), args); + break; Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,11 @@ +--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793) @@ -5,7 +5,7 @@ $(INSTALL) $^ . -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%% ifdef MOZ_ENABLE_LIBXUL include $(srcdir)/libxul-rules.mk Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -8,3 +8,11 @@ #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code +@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb + + #elif defined(HAVE__UNWIND_BACKTRACE) + ++#define _GNU_SOURCE + // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 + #include + Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:17:42 2012 (r793) @@ -97,6 +97,12 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if ${CXXFLAGS:M-stdlib=libc++} +CXXABI= -lcxxrt +.else +CXXABI= # implied +.endif + .if defined(WITH_LIGHTNING) MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar @@ -118,6 +124,7 @@ -e 's|/proc/self/fd|/dev/fd|' \ -e 's|/proc["/]|/compat/linux&|' @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ + -e 's|%%CXXABI%%|${CXXABI}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793) @@ -1,6 +1,6 @@ --- mozilla/ipc/chromium/src/base/file_util_linux.cc~ +++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { +@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { #ifdef ANDROID return GetTempDir(path); #else Added: branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-time_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/time_posix.cc~ ++++ mozilla/ipc/chromium/src/base/time_posix.cc +@@ -8,6 +9,7 @@ + #include + #endif + #include ++#include + #ifdef ANDROID + #include + #else Added: branches/experimental/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,20 @@ +--- mailnews/addrbook/src/nsDirPrefs.cpp~ ++++ mailnews/addrbook/src/nsDirPrefs.cpp +@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid + DIR_Server *s=nsnull; + + switch (position) { +- case DIR_POS_APPEND: ++ case (PRInt32)DIR_POS_APPEND: + /* Do nothing if the request is to append a server that is already + * in the list. + */ +@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid + wholeList->AppendElement(server); + break; + +- case DIR_POS_DELETE: ++ case (PRInt32)DIR_POS_DELETE: + /* Remove the prefs corresponding to the given server. If the prefName + * value is nsnull, the server has never been saved and there are no + * prefs to remove. Added: branches/experimental/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,29 @@ +--- mailnews/compose/src/nsSmtpProtocol.cpp~ ++++ mailnews/compose/src/nsSmtpProtocol.cpp +@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr + + switch (code) + { +- case NS_ERROR_SMTP_SERVER_ERROR: +- case NS_ERROR_TCP_READ_ERROR: +- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: +- case NS_ERROR_SENDING_FROM_COMMAND: +- case NS_ERROR_SENDING_RCPT_COMMAND: +- case NS_ERROR_SENDING_DATA_COMMAND: +- case NS_ERROR_SENDING_MESSAGE: +- case NS_ERROR_SMTP_GREETING: ++ case (int)NS_ERROR_SMTP_SERVER_ERROR: ++ case (int)NS_ERROR_TCP_READ_ERROR: ++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: ++ case (int)NS_ERROR_SENDING_FROM_COMMAND: ++ case (int)NS_ERROR_SENDING_RCPT_COMMAND: ++ case (int)NS_ERROR_SENDING_DATA_COMMAND: ++ case (int)NS_ERROR_SENDING_MESSAGE: ++ case (int)NS_ERROR_SMTP_GREETING: + bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); + msg = nsTextFormatter::vsmprintf(eMsg.get(), args); + break; Added: branches/experimental/mail/thunderbird/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,11 @@ +--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793) @@ -5,7 +5,7 @@ $(INSTALL) $^ . -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%% ifdef MOZ_ENABLE_LIBXUL include $(srcdir)/libxul-rules.mk Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -8,3 +8,11 @@ #if defined(_WIN32) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)) && !defined(WINCE) // WIN32 x86 stack walking code +@@ -1123,6 +1123,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb + + #elif defined(HAVE__UNWIND_BACKTRACE) + ++#define _GNU_SOURCE + // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 + #include + Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/firefox-beta/Makefile Sat Jun 23 13:17:42 2012 (r793) @@ -90,7 +90,7 @@ .endif .if !empty(CXX:M*clang++*) -CXXFLAGS+= -Wno-error=return-type-c-linkage +CXXFLAGS+= -Wno-return-type-c-linkage .endif .if ${CXXFLAGS:M-stdlib=libc++} Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/firefox-esr/Makefile Sat Jun 23 13:17:42 2012 (r793) @@ -91,7 +91,7 @@ .endif .if !empty(CXX:M*clang++*) -CXXFLAGS+= -Wno-error=return-type-c-linkage +CXXFLAGS+= -Wno-return-type-c-linkage .endif .if ${CXXFLAGS:M-stdlib=libc++} Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/libxul/Makefile Sat Jun 23 13:17:42 2012 (r793) @@ -71,7 +71,7 @@ .endif .if !empty(CXX:M*clang++*) -CXXFLAGS+= -Wno-error=return-type-c-linkage +CXXFLAGS+= -Wno-return-type-c-linkage .endif .if ${CXXFLAGS:M-stdlib=libc++} Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 13:17:42 2012 (r793) @@ -34,7 +34,6 @@ MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -USE_GCC= 4.2+ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -105,6 +104,16 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if !empty(CXX:M*clang++*) +CFLAGS+= -Wno-return-type-c-linkage +.endif + +.if ${CXXFLAGS:M-stdlib=libc++} +CXXABI= -lcxxrt +.else +CXXABI= # implied +.endif + .if defined(WITH_LIGHTNING) MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar @@ -122,6 +131,7 @@ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ + -e 's|%%CXXABI%%|${CXXABI}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793) @@ -1,6 +1,6 @@ --- mozilla/ipc/chromium/src/base/file_util_linux.cc~ +++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { +@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { #ifdef ANDROID return GetTempDir(path); #else Added: branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-time_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/time_posix.cc~ ++++ mozilla/ipc/chromium/src/base/time_posix.cc +@@ -8,6 +9,7 @@ + #include + #endif + #include ++#include + #ifdef ANDROID + #include + #else Added: branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,20 @@ +--- mailnews/addrbook/src/nsDirPrefs.cpp~ ++++ mailnews/addrbook/src/nsDirPrefs.cpp +@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid + DIR_Server *s=nsnull; + + switch (position) { +- case DIR_POS_APPEND: ++ case (PRInt32)DIR_POS_APPEND: + /* Do nothing if the request is to append a server that is already + * in the list. + */ +@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid + wholeList->AppendElement(server); + break; + +- case DIR_POS_DELETE: ++ case (PRInt32)DIR_POS_DELETE: + /* Remove the prefs corresponding to the given server. If the prefName + * value is nsnull, the server has never been saved and there are no + * prefs to remove. Added: branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,29 @@ +--- mailnews/compose/src/nsSmtpProtocol.cpp~ ++++ mailnews/compose/src/nsSmtpProtocol.cpp +@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr + + switch (code) + { +- case NS_ERROR_SMTP_SERVER_ERROR: +- case NS_ERROR_TCP_READ_ERROR: +- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: +- case NS_ERROR_SENDING_FROM_COMMAND: +- case NS_ERROR_SENDING_RCPT_COMMAND: +- case NS_ERROR_SENDING_DATA_COMMAND: +- case NS_ERROR_SENDING_MESSAGE: +- case NS_ERROR_SMTP_GREETING: ++ case (int)NS_ERROR_SMTP_SERVER_ERROR: ++ case (int)NS_ERROR_TCP_READ_ERROR: ++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: ++ case (int)NS_ERROR_SENDING_FROM_COMMAND: ++ case (int)NS_ERROR_SENDING_RCPT_COMMAND: ++ case (int)NS_ERROR_SENDING_DATA_COMMAND: ++ case (int)NS_ERROR_SENDING_MESSAGE: ++ case (int)NS_ERROR_SMTP_GREETING: + bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); + msg = nsTextFormatter::vsmprintf(eMsg.get(), args); + break; Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,11 @@ +--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Modified: branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793) @@ -5,7 +5,7 @@ $(INSTALL) $^ . -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%% ifdef MOZ_ENABLE_LIBXUL include $(srcdir)/libxul-rules.mk Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,10 @@ +--- mozilla/xpcom/base/nsStackWalk.cpp~ ++++ mozilla/xpcom/base/nsStackWalk.cpp +@@ -1638,6 +1638,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb + + #elif defined(HAVE__UNWIND_BACKTRACE) + ++#define _GNU_SOURCE + // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 + #include + Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:17:42 2012 (r793) @@ -35,8 +35,6 @@ MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -EXTRA_CFLAGS= -O0 -USE_GCC= 4.2+ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} @@ -63,6 +61,10 @@ .include +.if empty(CXX:M*clang++*) && ${OSVERSION} > 900000 +USE_GCC= 4.6+ +.endif + MOZSRC:= ${WRKDIR}/comm-release/mozilla WRKSRC= ${WRKDIR}/comm-release @@ -107,6 +109,16 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif +.if !empty(CXX:M*clang++*) +CFLAGS+= -Wno-return-type-c-linkage +.endif + +.if ${CXXFLAGS:M-stdlib=libc++} +CXXABI= -lcxxrt +.else +CXXABI= # implied +.endif + .if defined(WITH_LIGHTNING) MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar @@ -124,6 +136,8 @@ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ + -e 's|%%CXXABI%%|${CXXABI}|' \ + ${WRKSRC}/suite/build/Makefile.in \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Modified: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc ============================================================================== --- branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc Sat Jun 23 13:17:42 2012 (r793) @@ -1,6 +1,6 @@ --- mozilla/ipc/chromium/src/base/file_util_linux.cc~ +++ mozilla/ipc/chromium/src/base/file_util_linux.cc -@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { +@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { #ifdef ANDROID return GetTempDir(path); #else Added: branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-time_posix.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-ipc-chromium-src-base-time_posix.cc Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/time_posix.cc~ ++++ mozilla/ipc/chromium/src/base/time_posix.cc +@@ -8,6 +9,7 @@ + #include + #endif + #include ++#include + #ifdef ANDROID + #include + #else Added: branches/experimental/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mailnews-addrbook-src-nsDirPrefs.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,20 @@ +--- mailnews/addrbook/src/nsDirPrefs.cpp~ ++++ mailnews/addrbook/src/nsDirPrefs.cpp +@@ -375,7 +375,7 @@ static bool DIR_SetServerPosition(nsVoid + DIR_Server *s=nsnull; + + switch (position) { +- case DIR_POS_APPEND: ++ case (PRInt32)DIR_POS_APPEND: + /* Do nothing if the request is to append a server that is already + * in the list. + */ +@@ -401,7 +401,7 @@ static bool DIR_SetServerPosition(nsVoid + wholeList->AppendElement(server); + break; + +- case DIR_POS_DELETE: ++ case (PRInt32)DIR_POS_DELETE: + /* Remove the prefs corresponding to the given server. If the prefName + * value is nsnull, the server has never been saved and there are no + * prefs to remove. Added: branches/experimental/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mailnews-compose-src-nsSmtpProtocol.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,29 @@ +--- mailnews/compose/src/nsSmtpProtocol.cpp~ ++++ mailnews/compose/src/nsSmtpProtocol.cpp +@@ -127,16 +127,16 @@ nsresult nsExplainErrorDetails(nsISmtpUr + + switch (code) + { +- case NS_ERROR_SMTP_SERVER_ERROR: +- case NS_ERROR_TCP_READ_ERROR: +- case NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: +- case NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: +- case NS_ERROR_SENDING_FROM_COMMAND: +- case NS_ERROR_SENDING_RCPT_COMMAND: +- case NS_ERROR_SENDING_DATA_COMMAND: +- case NS_ERROR_SENDING_MESSAGE: +- case NS_ERROR_SMTP_GREETING: ++ case (int)NS_ERROR_SMTP_SERVER_ERROR: ++ case (int)NS_ERROR_TCP_READ_ERROR: ++ case (int)NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1: ++ case (int)NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2: ++ case (int)NS_ERROR_SENDING_FROM_COMMAND: ++ case (int)NS_ERROR_SENDING_RCPT_COMMAND: ++ case (int)NS_ERROR_SENDING_DATA_COMMAND: ++ case (int)NS_ERROR_SENDING_MESSAGE: ++ case (int)NS_ERROR_SMTP_GREETING: + bundle->GetStringFromID(NS_ERROR_GET_CODE(code), getter_Copies(eMsg)); + msg = nsTextFormatter::vsmprintf(eMsg.get(), args); + break; Added: branches/experimental/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-dom-plugins-ipc-PluginMessageUtils.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,11 @@ +--- mozilla/dom/plugins/ipc/PluginMessageUtils.cpp~ ++++ mozilla/dom/plugins/ipc/PluginMessageUtils.cpp +@@ -94,7 +94,7 @@ ReplaceAll(const string& haystack, const + i += with.length(); + } + +- return munged; ++ return munged.c_str(); + } + #endif + Modified: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:14:24 2012 (r792) +++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 23 13:17:42 2012 (r793) @@ -5,7 +5,7 @@ endif -EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%% DEFINES += -DIMPL_XREAPI Added: branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-xpcom-base-nsStackWalk.cpp Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,10 @@ +--- mozilla/xpcom/base/nsStackWalk.cpp~ ++++ mozilla/xpcom/base/nsStackWalk.cpp +@@ -1638,6 +1638,7 @@ NS_StackWalk(NS_WalkStackCallback aCallb + + #elif defined(HAVE__UNWIND_BACKTRACE) + ++#define _GNU_SOURCE + // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0 + #include + Added: branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in Sat Jun 23 13:17:42 2012 (r793) @@ -0,0 +1,10 @@ +--- suite/build/Makefile.in~ ++++ suite/build/Makefile.in +@@ -76,6 +76,7 @@ SHARED_LIBRARY_LIBS += ../shell/src/$(LI + endif + + EXTRA_DSO_LDOPTS += \ ++ %%CXXABI%% \ + $(LIBS_DIR) \ + $(EXTRA_DSO_LIBS) \ + $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \ From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 23 13:38: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 4529D1065677 for ; Sat, 23 Jun 2012 13:38: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 C2A5A8FC20 for ; Sat, 23 Jun 2012 13:38: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 q5NDcd2Q011117 for ; Sat, 23 Jun 2012 13:38: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 q5NDcY9Z010462 for freebsd-gecko@freebsd.org; Sat, 23 Jun 2012 13:38:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Jun 2012 13:38:34 GMT Message-Id: <201206231338.q5NDcY9Z010462@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] r794 - 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: Sat, 23 Jun 2012 13:38:41 -0000 Author: jbeich Date: Sat Jun 23 13:38:34 2012 New Revision: 794 Log: forgotten libc++ patch for seamonkey-beta Added: branches/experimental/www/seamonkey-beta/files/patch-suite-build-Makefile.in Modified: branches/experimental/www/seamonkey-beta/Makefile Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 13:17:42 2012 (r793) +++ branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 13:38:34 2012 (r794) @@ -132,6 +132,7 @@ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ -e 's|%%CXXABI%%|${CXXABI}|' \ + ${WRKSRC}/suite/build/Makefile.in \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in Added: branches/experimental/www/seamonkey-beta/files/patch-suite-build-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-suite-build-Makefile.in Sat Jun 23 13:38:34 2012 (r794) @@ -0,0 +1,10 @@ +--- suite/build/Makefile.in~ ++++ suite/build/Makefile.in +@@ -76,6 +76,7 @@ SHARED_LIBRARY_LIBS += ../shell/src/$(LI + endif + + EXTRA_DSO_LDOPTS += \ ++ %%CXXABI%% \ + $(LIBS_DIR) \ + $(EXTRA_DSO_LIBS) \ + $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \ From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 23 13:59:18 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 5BA081065670 for ; Sat, 23 Jun 2012 13:59:18 +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 ED2E78FC15 for ; Sat, 23 Jun 2012 13:59:17 +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 q5NDxGGp060521 for ; Sat, 23 Jun 2012 13:59:17 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5NDxBRQ058453 for freebsd-gecko@freebsd.org; Sat, 23 Jun 2012 13:59:11 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Jun 2012 13:59:11 GMT Message-Id: <201206231359.q5NDxBRQ058453@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] r795 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files www/libxul www/libxul/files www/seamonkey 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, 23 Jun 2012 13:59:18 -0000 Author: jbeich Date: Sat Jun 23 13:59:11 2012 New Revision: 795 Log: followup to r723: system-wide plugins for seamonkey, thunderbird, xulrunner-stub Added: branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp - copied, changed from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp branches/experimental/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp - copied, changed from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp branches/experimental/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp - copied, changed from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp branches/experimental/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp branches/experimental/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp - copied, changed from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Deleted: branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Modified: branches/experimental/mail/thunderbird-beta/Makefile branches/experimental/mail/thunderbird-esr/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/www/libxul/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:38:34 2012 (r794) +++ branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:59:11 2012 (r795) @@ -127,7 +127,8 @@ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/mail/app/nsMailApp.cpp \ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ ${MOZSRC}/js/src/config/config.mk Copied and modified: branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp (from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp) ============================================================================== --- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:38:34 2012 (r794, copy source) +++ branches/experimental/mail/thunderbird-beta/files/patch-mail-app-nsMailApp.cpp Sat Jun 23 13:59:11 2012 (r795) @@ -1,6 +1,6 @@ ---- browser/app/nsBrowserApp.cpp~ -+++ browser/app/nsBrowserApp.cpp -@@ -197,6 +197,7 @@ int main(int argc, char* argv[]) +--- mail/app/nsMailApp.cpp~ ++++ mail/app/nsMailApp.cpp +@@ -154,6 +154,7 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:38:34 2012 (r794) +++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:59:11 2012 (r795) @@ -128,7 +128,8 @@ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/mail/app/nsMailApp.cpp \ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ ${MOZSRC}/js/src/config/config.mk Copied and modified: branches/experimental/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp (from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp) ============================================================================== --- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:38:34 2012 (r794, copy source) +++ branches/experimental/mail/thunderbird-esr/files/patch-mail-app-nsMailApp.cpp Sat Jun 23 13:59:11 2012 (r795) @@ -1,6 +1,6 @@ ---- browser/app/nsBrowserApp.cpp~ -+++ browser/app/nsBrowserApp.cpp -@@ -197,6 +197,7 @@ int main(int argc, char* argv[]) +--- mail/app/nsMailApp.cpp~ ++++ mail/app/nsMailApp.cpp +@@ -154,6 +154,7 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:38:34 2012 (r794) +++ branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:59:11 2012 (r795) @@ -128,7 +128,8 @@ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/mail/app/nsMailApp.cpp \ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ ${MOZSRC}/js/src/config/mkdepend/Makefile.in \ ${MOZSRC}/js/src/config/config.mk Copied and modified: branches/experimental/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp (from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp) ============================================================================== --- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:38:34 2012 (r794, copy source) +++ branches/experimental/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Sat Jun 23 13:59:11 2012 (r795) @@ -1,6 +1,6 @@ ---- browser/app/nsBrowserApp.cpp~ -+++ browser/app/nsBrowserApp.cpp -@@ -197,6 +197,7 @@ int main(int argc, char* argv[]) +--- mail/app/nsMailApp.cpp~ ++++ mail/app/nsMailApp.cpp +@@ -154,6 +154,7 @@ int main(int argc, char* argv[]) TriggerQuirks(); #endif Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sat Jun 23 13:38:34 2012 (r794) +++ branches/experimental/www/libxul/Makefile Sat Jun 23 13:59:11 2012 (r795) @@ -90,7 +90,7 @@ ${WRKSRC}/toolkit/library/Makefile.in \ ${WRKSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/browser/app/nsBrowserApp.cpp \ + ${WRKSRC}/xulrunner/stub/nsXULStub.cpp \ ${WRKSRC}/js/src/config/mkdepend/Makefile.in \ ${WRKSRC}/js/src/config/config.mk Deleted: branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:59:11 2012 (r794) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- browser/app/nsBrowserApp.cpp~ -+++ browser/app/nsBrowserApp.cpp -@@ -197,6 +197,7 @@ int main(int argc, char* argv[]) - TriggerQuirks(); - #endif - -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); - nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); - if (NS_FAILED(rv)) { - Output("Couldn't calculate the application directory.\n"); Added: branches/experimental/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Sat Jun 23 13:59:11 2012 (r795) @@ -0,0 +1,11 @@ +--- xulrunner/stub/nsXULStub.cpp~ ++++ xulrunner/stub/nsXULStub.cpp +@@ -202,6 +202,8 @@ main(int argc, char **argv) + char greDir[MAXPATHLEN]; + bool greFound = false; + ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ + #if defined(XP_MACOSX) + CFBundleRef appBundle = CFBundleGetMainBundle(); + if (!appBundle) Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:38:34 2012 (r794) +++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:59:11 2012 (r795) @@ -132,7 +132,8 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/suite/app/nsSuiteApp.cpp \ ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ Copied and modified: branches/experimental/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp (from r794, branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp) ============================================================================== --- branches/experimental/www/libxul/files/patch-browser-app-nsBrowserApp.cpp Sat Jun 23 13:38:34 2012 (r794, copy source) +++ branches/experimental/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Sat Jun 23 13:59:11 2012 (r795) @@ -1,10 +1,11 @@ ---- browser/app/nsBrowserApp.cpp~ -+++ browser/app/nsBrowserApp.cpp -@@ -197,6 +197,7 @@ int main(int argc, char* argv[]) +--- suite/app/nsSuiteApp.cpp~ ++++ suite/app/nsSuiteApp.cpp +@@ -215,6 +215,8 @@ int main(int argc, char* argv[]) + #ifdef XP_MACOSX TriggerQuirks(); #endif - ++ + setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); + nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) { - Output("Couldn't calculate the application directory.\n"); From owner-freebsd-gecko@FreeBSD.ORG Sat Jun 23 14:04:26 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 ADD72106564A for ; Sat, 23 Jun 2012 14:04:26 +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 0020E8FC15 for ; Sat, 23 Jun 2012 14:04:25 +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 q5NE4PPC086919 for ; Sat, 23 Jun 2012 14:04:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5NE4JZP081986 for freebsd-gecko@freebsd.org; Sat, 23 Jun 2012 14:04:19 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Jun 2012 14:04:19 GMT Message-Id: <201206231404.q5NE4JZP081986@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] r796 - 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-nightly/files 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, 23 Jun 2012 14:04:26 -0000 Author: jbeich Date: Sat Jun 23 14:04:19 2012 New Revision: 796 Log: add cairo-qt support It depends on qt surface in cairo (ports/169343), else can be built with bundled cairo. Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp 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 Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/Mk/bsd.gecko.mk Sat Jun 23 14:04:19 2012 (r796) @@ -514,7 +514,7 @@ MOZILLA_BIN?= ${PORTNAME}-bin MOZILLA_EXEC_NAME?=${MOZILLA} MOZ_RPATH?= ${MOZILLA} -USE_GNOME+= gtk20 libidl desktopfileutils +USE_GNOME+= libidl desktopfileutils USE_ICONV= yes USE_PERL5_BUILD=yes USE_XORG= printproto sm xt xi xext x11 xinerama \ @@ -665,6 +665,15 @@ MOZ_MK_OPTIONS+= XP_UNIX=1 \ PERL=${PERL} +.if ${MOZ_TOOLKIT:Mcairo-qt} +USE_GNOME+= pango +USE_QT4+= moc_build gui network opengl +MOZ_OPTIONS+= --with-qtdir= # pkg-config +CONFIGURE_ENV+= HOST_MOC="${MOC}" HOST_RCC="${FALSE}" +.else # gtk2, cairo-gtk2 +USE_GNOME+= gtk20 +.endif + .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CONFIGURE_ENV+= MOZ_OPTIMIZE_FLAGS="${CFLAGS:M-O*}" MOZ_OPTIONS+= --enable-optimize @@ -785,6 +794,7 @@ .endif .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ + ${ECHO_CMD} "cairo-qt.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ ${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ ${ECHO_CMD} "malloc_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ ${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \ Modified: branches/experimental/mail/thunderbird-beta/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/mail/thunderbird-beta/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -31,6 +31,8 @@ MAKE_JOBS_SAFE= yes WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- mozilla/widget/qt/nsNativeThemeQt.cpp~ ++++ mozilla/widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/mail/thunderbird-esr/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -32,6 +32,8 @@ MAKE_JOBS_SAFE= yes WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" Added: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-widget-src-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- mozilla/widget/src/qt/nsNativeThemeQt.cpp~ ++++ mozilla/widget/src/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/mail/thunderbird/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -31,6 +31,8 @@ MAKE_JOBS_SAFE= yes WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" Added: branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- mozilla/widget/qt/nsNativeThemeQt.cpp~ ++++ mozilla/widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/www/firefox-beta/Makefile ============================================================================== --- branches/experimental/www/firefox-beta/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/www/firefox-beta/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -34,6 +34,8 @@ MAKE_JOBS_SAFE= yes WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} GNU_CONFIGURE= yes Added: branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-beta/files/patch-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- widget/qt/nsNativeThemeQt.cpp~ ++++ widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/www/firefox-esr/Makefile ============================================================================== --- branches/experimental/www/firefox-esr/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/www/firefox-esr/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -35,6 +35,8 @@ MAKE_JOBS_SAFE= yes WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} GNU_CONFIGURE= yes Added: branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-esr/files/patch-widget-src-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- widget/src/qt/nsNativeThemeQt.cpp~ ++++ widget/src/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -37,6 +37,8 @@ MAKE_JOBS_SAFE= yes WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} GNU_CONFIGURE= yes Added: branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- widget/qt/nsNativeThemeQt.cpp~ ++++ widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/www/firefox/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -34,6 +34,8 @@ MAKE_JOBS_SAFE= yes WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} GNU_CONFIGURE= yes Added: branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- widget/qt/nsNativeThemeQt.cpp~ ++++ widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/www/libxul/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -27,6 +27,8 @@ USE_AUTOTOOLS= autoconf213:env WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes WANT_PERL= yes ALL_TARGET= default GNU_CONFIGURE= yes Added: branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/libxul/files/patch-widget-src-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- widget/src/qt/nsNativeThemeQt.cpp~ ++++ widget/src/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/www/seamonkey-beta/Makefile ============================================================================== --- branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/www/seamonkey-beta/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -27,6 +27,8 @@ USE_GMAKE= yes USE_GECKO= gecko WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes WANT_PERL= yes GNU_CONFIGURE= yes ALL_TARGET= default Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- mozilla/widget/qt/nsNativeThemeQt.cpp~ ++++ mozilla/widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h" Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Sat Jun 23 13:59:11 2012 (r795) +++ branches/experimental/www/seamonkey/Makefile Sat Jun 23 14:04:19 2012 (r796) @@ -27,6 +27,8 @@ USE_GMAKE= yes USE_GECKO= gecko WANT_GNOME= yes +USE_QT4= # empty +QT_NONSTANDARD= yes WANT_PERL= yes GNU_CONFIGURE= yes OBJDIR_BUILD= yes Added: branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-mozilla-widget-qt-nsNativeThemeQt.cpp Sat Jun 23 14:04:19 2012 (r796) @@ -0,0 +1,12 @@ +--- mozilla/widget/qt/nsNativeThemeQt.cpp~ ++++ mozilla/widget/qt/nsNativeThemeQt.cpp +@@ -25,7 +25,9 @@ + #include "nsThemeConstants.h" + #include "nsIServiceManager.h" + #include "nsIDOMHTMLInputElement.h" ++#ifdef __GLIBC__ + #include ++#endif + + + #include "gfxASurface.h"