From owner-freebsd-ports@FreeBSD.ORG Sun Jul 29 10:22:48 2012 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AD666106564A for ; Sun, 29 Jul 2012 10:22:48 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from server2.allsitecontrol.com (server2.allsitecontrol.com [63.143.36.210]) by mx1.freebsd.org (Postfix) with ESMTP id 6F6638FC0C for ; Sun, 29 Jul 2012 10:22:48 +0000 (UTC) Received: from [64.250.116.70] (port=35923 helo=internal.tormail.org) by server2.allsitecontrol.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.77) (envelope-from ) id 1SvIDZ-000VbX-6H; Sat, 28 Jul 2012 21:22:49 -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=ruD3lrfKJm0Mkfxlx8oI0ExU0UAN+HeixyPYNqk48rI=; b=U93iVx0SVEp3U7qzH8TqbQbSxlh1FwiYVw4gmEhVgSnbqMFteP8GuTLfuKVUo/OZWY8JFQ/alMhzs2qW1VrPr+XTlLB8RJBWP5ya+abG+GaRZT6SOTRfkoWVCUXIdo9X4wrojcjZsall9WIRyvq6k5hfDScejEylF4tK6+skWc0=; Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1SvIC7-0007rH-R8; Sun, 29 Jul 2012 01:21:21 +0000 From: Jan Beich To: ajtiM Date: Sun, 29 Jul 2012 11:21:13 +1000 References: <201207281026.30596.lumiwa@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-TorMail-User: jbeich Message-Id: <1SvIC7-0007rH-R8@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-ports@freebsd.org Subject: Re: firefox 14.0.1 and flash X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2012 10:22:48 -0000 --=-=-= Content-Type: text/plain ajtiM writes: > Hi! > > On my FreeBSD 9.0 Release, KDE 4.8.4, Firefox 14.0.1 stooped working with > linuxflashplugin 11. There is no problem with Opera. First, try firefox package and show pkg_info -aE output. Blame pointyhat tardiness if the package (for 14.0.1) is not available yet. Second, try to disable dom.ipc.plugins.enabled in about:config. If it helps try the first attached patch, then remove patch-bug753046 and try the second patch. If neither helps try collecting debug info # NSPR_LOG_MODULES output depends on LOGGING option $ NSPR_LOG_MODULES=plugin:5 firefox -ProfileManager -no-remote $ NSPR_LOG_MODULES=all:5 NSPR_LOG_FILE=$HOME/nspr.log firefox -P -no-remote $ NPW_DEBUG=1 NPW_LOG=$HOME/npw.log firefox -P -no-remote and see how far it got by comparing output with previous version. Also, QT4 is known to be broken with plugins. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=revert_libevent2.diff diff --git Mk/bsd.gecko.mk Mk/bsd.gecko.mk index 5bc445a..c7d6957 100644 --- Mk/bsd.gecko.mk +++ Mk/bsd.gecko.mk @@ -559,7 +559,7 @@ cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo dbm_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm -event_LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 +event_LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE} event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent diff --git www/firefox/files/patch-ipc-chromium-Makefile.in www/firefox/files/patch-ipc-chromium-Makefile.in index bba9d01..d7fb326 100644 --- www/firefox/files/patch-ipc-chromium-Makefile.in +++ www/firefox/files/patch-ipc-chromium-Makefile.in @@ -22,7 +22,7 @@ -# message_pump_libevent.cc includes third_party/libevent/event.h, -# which we put in $(DIST), see export rule below -LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_INCLUDES)) ++LOCAL_INCLUDES += $(MOZ_LIBEVENT_INCLUDES) endif # } vpath %.cc \ --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=revert_bsdipc.diff diff --git www/firefox/Makefile www/firefox/Makefile index aefbf2d..5cd78ef 100644 --- www/firefox/Makefile +++ www/firefox/Makefile @@ -21,6 +21,7 @@ sqlite3>=3.7.11:${PORTSDIR}/databases/sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ unzip:${PORTSDIR}/archivers/unzip +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo CONFLICTS_BUILD= spidermonkey-* @@ -105,6 +106,9 @@ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop post-patch: + @${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ + -e 's|/proc/self/fd|/dev/fd|' \ + -e 's|/proc["/]|/compat/linux&|' @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp diff --git www/firefox/files/patch-ipc-chromium-src-base-dir_reader_linux.h www/firefox/files/patch-ipc-chromium-src-base-dir_reader_linux.h deleted file mode 100644 index 3c53d08..0000000 --- /dev/null +++ www/firefox/files/patch-ipc-chromium-src-base-dir_reader_linux.h @@ -0,0 +1,45 @@ +--- ipc/chromium/src/base/dir_reader_linux.h.orig 2011-12-16 21:29:22.000000000 +0100 ++++ ipc/chromium/src/base/dir_reader_linux.h 2011-12-19 21:00:27.000000000 +0100 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -19,6 +20,8 @@ + + namespace base { + ++#define linux_dirent struct dirent ++#if 0 + struct linux_dirent { + uint64_t d_ino; + int64_t d_off; +@@ -26,11 +29,16 @@ + unsigned char d_type; + char d_name[0]; + }; ++#endif + + class DirReaderLinux { + public: + explicit DirReaderLinux(const char* directory_path) ++#ifdef O_DIRECTORY + : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)), ++#else ++ : fd_(open(directory_path, O_RDONLY)), ++#endif + offset_(0), + size_(0) { + memset(buf_, 0, sizeof(buf_)); +@@ -57,7 +65,7 @@ + if (offset_ != size_) + return true; + +- const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); ++ const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_)); + if (r == 0) + return false; + if (r == -1) { diff --git www/firefox/files/patch-ipc-chromium-src-base-file_util_linux.cc www/firefox/files/patch-ipc-chromium-src-base-file_util_linux.cc deleted file mode 100644 index 82241b6..0000000 --- /dev/null +++ www/firefox/files/patch-ipc-chromium-src-base-file_util_linux.cc @@ -0,0 +1,11 @@ +--- ipc/chromium/src/base/file_util_linux.cc~ ++++ ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +29,7 @@ bool GetShmemTempDir(FilePath* path) { + #ifdef ANDROID + return GetTempDir(path); + #else +- *path = FilePath("/dev/shm"); ++ *path = FilePath("/tmp"); + return true; + #endif + } diff --git www/firefox/files/patch-ipc-chromium-src-base-file_util_posix.cc www/firefox/files/patch-ipc-chromium-src-base-file_util_posix.cc deleted file mode 100644 index 90249bb..0000000 --- /dev/null +++ www/firefox/files/patch-ipc-chromium-src-base-file_util_posix.cc @@ -0,0 +1,11 @@ +--- ipc/chromium/src/base/file_util_posix.cc~ ++++ ipc/chromium/src/base/file_util_posix.cc +@@ -31,7 +31,7 @@ + #include "base/time.h" + + // FreeBSD/OpenBSD lacks stat64, but its stat handles files >2GB just fine +-#if defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(__FreeBSD__) || defined(OS_OPENBSD) + #define stat64 stat + #endif + diff --git www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc deleted file mode 100644 index 0b527d3..0000000 --- /dev/null +++ www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc @@ -0,0 +1,25 @@ +--- ipc/chromium/src/base/platform_thread_posix.cc~ ++++ ipc/chromium/src/base/platform_thread_posix.cc +@@ -11,6 +11,7 @@ + #include + #elif defined(OS_LINUX) + #include ++#include + #include + #endif + +@@ -34,7 +35,13 @@ PlatformThreadId PlatformThread::Current + #if defined(OS_MACOSX) + return mach_thread_self(); + #elif defined(OS_LINUX) +- return syscall(__NR_gettid); ++#if __FreeBSD_version > 900030 ++ return pthread_getthreadid_np(); ++#else ++ long tid; ++ syscall(SYS_thr_self, &tid); ++ return tid; ++#endif + #endif + } + diff --git www/firefox/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h www/firefox/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h deleted file mode 100644 index 75bf9d8..0000000 --- /dev/null +++ www/firefox/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h @@ -0,0 +1,11 @@ +--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ ++++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h +@@ -34,7 +34,7 @@ + #include "base/third_party/nspr/prcpucfg_win.h" + #elif defined(__APPLE__) + #include "base/third_party/nspr/prcpucfg_mac.h" +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #include "base/third_party/nspr/prcpucfg_linux.h" + #else + #error Provide a prcpucfg.h appropriate for your platform diff --git www/firefox/files/patch-ipc-chromium-src-build-build_config.h www/firefox/files/patch-ipc-chromium-src-build-build_config.h deleted file mode 100644 index 2ee0de7..0000000 --- /dev/null +++ www/firefox/files/patch-ipc-chromium-src-build-build_config.h @@ -0,0 +1,11 @@ +--- ipc/chromium/src/build/build_config.h~ ++++ ipc/chromium/src/build/build_config.h +@@ -17,7 +17,7 @@ + // A set of macros to use for platform detection. + #if defined(__APPLE__) + #define OS_MACOSX 1 +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__linux__) || defined(ANDROID) || defined(__FreeBSD__) + #define OS_LINUX 1 + #elif defined(__OpenBSD__) + #define OS_OPENBSD 1 diff --git www/firefox/files/patch-toolkit_library_Makefile.in www/firefox/files/patch-toolkit_library_Makefile.in deleted file mode 100644 index 9e9d395..0000000 --- /dev/null +++ www/firefox/files/patch-toolkit_library_Makefile.in @@ -0,0 +1,11 @@ +--- toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 ++++ 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) $^ . + +-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo + + ifdef MOZ_ENABLE_LIBXUL + include $(srcdir)/libxul-rules.mk --=-=-=--