From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 10 09:57:46 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1CDB3592 for ; Sun, 10 Nov 2013 09:57:46 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A58EE20C4 for ; Sun, 10 Nov 2013 09:57:45 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAA9vb7K010532 for ; Sun, 10 Nov 2013 09:57:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAA9vW8d010388 for freebsd-gecko@freebsd.org; Sun, 10 Nov 2013 09:57:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 10 Nov 2013 09:57:32 GMT Message-Id: <201311100957.rAA9vW8d010388@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 Subject: [SVN-Commit] r1376 - trunk/Mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Nov 2013 09:57:46 -0000 Author: jbeich Date: Sun Nov 10 09:57:32 2013 New Revision: 1376 Log: fix $ expansion in -z origin Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Oct 30 12:53:04 2013 (r1375) +++ trunk/Mk/bsd.gecko.mk Sun Nov 10 09:57:32 2013 (r1376) @@ -540,7 +540,7 @@ MOZ_OPTIONS+= --prefix="${FAKEDIR}" CPPFLAGS+= -isystem${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,'\$$$$ORIGIN' # prefer base clang, for lang/clang{,-devel} see ports/177224 .if ${CC} == "cc" && (exists(/usr/bin/clang) && ${OSVERSION} >= 900014) From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 10 09:57:50 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 49A95593 for ; Sun, 10 Nov 2013 09:57:50 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B2C2320C5 for ; Sun, 10 Nov 2013 09:57:49 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAA9vmc3017007 for ; Sun, 10 Nov 2013 09:57: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 rAA9vgYD011483 for freebsd-gecko@freebsd.org; Sun, 10 Nov 2013 09:57:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 10 Nov 2013 09:57:42 GMT Message-Id: <201311100957.rAA9vgYD011483@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 Subject: [SVN-Commit] r1377 - in trunk: . mail/linux-thunderbird www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/linux-firefox www/linux-seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Nov 2013 09:57:50 -0000 Author: jbeich Date: Sun Nov 10 09:57:42 2013 New Revision: 1377 Log: update Added: trunk/www/firefox-nightly/files/patch-bug807492 Deleted: trunk/Gecko_ChangeLog trunk/www/firefox-nightly/files/patch-bug920112 trunk/www/firefox-nightly/files/patch-toolkit_xre_Makefile.in trunk/www/firefox/files/patch-bug807492 trunk/www/firefox/files/patch-bug851992 trunk/www/firefox/files/patch-bug853301 trunk/www/firefox/files/patch-bug876156 trunk/www/firefox/files/patch-bug886181 trunk/www/firefox/files/patch-bug910875 trunk/www/firefox/files/patch-bug916216 trunk/www/firefox/files/patch-bug918177 Modified: trunk/Gecko_TODO trunk/mail/linux-thunderbird/Makefile trunk/mail/linux-thunderbird/distinfo trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug826985 trunk/www/firefox-nightly/files/patch-bug878791 trunk/www/firefox-nightly/files/patch-bug893397 trunk/www/firefox/Makefile trunk/www/firefox/distinfo trunk/www/firefox/files/patch-config-baseconfig.mk trunk/www/linux-firefox/Makefile trunk/www/linux-seamonkey/Makefile trunk/www/linux-seamonkey/distinfo Deleted: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,4 +0,0 @@ -24.0: -- enable GSTREAMER by default for html5 with h264/aac/mp3 -- WEBRTC is now always built -- add PROFILE and TESTS options Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/Gecko_TODO Sun Nov 10 09:57:42 2013 (r1377) @@ -7,7 +7,7 @@ - libusbhid(3) for hal/linux/LinuxGamepad.cpp - OSS or GStreamer for * media/libcubeb - * media/webrtc/trunk/src/modules/audio_device + * media/webrtc/trunk/webrtc/modules/audio_device - pmc(3) for js/src/perf https://developer.mozilla.org/en-US/docs/Performance/JS::PerfMeasurement - push patch-sysdb Modified: trunk/mail/linux-thunderbird/Makefile ============================================================================== --- trunk/mail/linux-thunderbird/Makefile Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/mail/linux-thunderbird/Makefile Sun Nov 10 09:57:42 2013 (r1377) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 24.0 +DISTVERSION= 24.1.0 CATEGORIES= mail DISTNAME= ${PORTNAME}-${DISTVERSION} MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US @@ -15,5 +15,6 @@ USE_LINUX_APPS= dbusglib dbuslibs alsalib alsa-plugins-oss +NO_STAGE= yes .include "${.CURDIR}/../../www/linux-seamonkey/Makefile.common" .include Modified: trunk/mail/linux-thunderbird/distinfo ============================================================================== --- trunk/mail/linux-thunderbird/distinfo Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/mail/linux-thunderbird/distinfo Sun Nov 10 09:57:42 2013 (r1377) @@ -1,2 +1,2 @@ -SHA256 (thunderbird-24.0.tar.bz2) = f642a6978cf0c5d1c54b97f86c11e79c8ae2d0a3ee38cff296320a9a5c8911a0 -SIZE (thunderbird-24.0.tar.bz2) = 28964786 +SHA256 (thunderbird-24.1.0.tar.bz2) = 31b9a1510f45b0420ac30cab8117d8de171dc67fc5aabc22d97e2aef3c41fc83 +SIZE (thunderbird-24.1.0.tar.bz2) = 28966639 Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox-nightly/Makefile Sun Nov 10 09:57:42 2013 (r1377) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -PORTVERSION= 27.0.${HGREV:C/:.*//} +PORTVERSION= 28.0.${HGREV:C/:.*//} PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= https://hg.mozilla.org/integration/mozilla-inbound/archive/ @@ -16,12 +16,12 @@ FETCH_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss BUILD_DEPENDS= nspr>=4.10:${PORTSDIR}/devel/nspr \ - sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.8.0.2:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ unzip:${PORTSDIR}/archivers/unzip -# nss>=3.15:${PORTSDIR}/security/nss \ +# nss>=3.15.3:${PORTSDIR}/security/nss \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox-nightly/Makefile.hgrev Sun Nov 10 09:57:42 2013 (r1377) @@ -1 +1 @@ -HGREV= 148614:523b572e9987 +HGREV= 154277:53b2cdf230dc Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox-nightly/distinfo Sun Nov 10 09:57:42 2013 (r1377) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/523b572e9987.tar.bz2) = 56fc6741ac8643a5324e99b9f3ffecfd595591b51697def59a532cf5891088e4 -SIZE (firefox-nightly/523b572e9987.tar.bz2) = 125715011 +SHA256 (firefox-nightly/53b2cdf230dc.tar.bz2) = baf0ed8bcf70f9eabec9ecd817e15641048bc8645bbe1c817130d11b6d09108e +SIZE (firefox-nightly/53b2cdf230dc.tar.bz2) = 129402312 Added: trunk/www/firefox-nightly/files/patch-bug807492 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug807492 Sun Nov 10 09:57:42 2013 (r1377) @@ -0,0 +1,16 @@ +--- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc~ ++++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc +@@ -18,7 +18,13 @@ + #include + #include + //v4l includes ++#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) ++#include ++#elif defined(__sun) ++#include ++#else + #include ++#endif + + #include "webrtc/system_wrappers/interface/ref_count.h" + #include "webrtc/system_wrappers/interface/trace.h" Modified: trunk/www/firefox-nightly/files/patch-bug826985 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug826985 Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox-nightly/files/patch-bug826985 Sun Nov 10 09:57:42 2013 (r1377) @@ -53,7 +53,7 @@ index 239a292..bab496c 100644 --- media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc +++ media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc -@@ -26,11 +26,23 @@ +@@ -25,10 +25,21 @@ #else #include #endif @@ -61,9 +61,8 @@ +#include +#endif - #include "ref_count.h" - #include "trace.h" - + #include "webrtc/system_wrappers/interface/ref_count.h" + #include "webrtc/system_wrappers/interface/trace.h" +#ifdef HAVE_LIBV4L2 +#define open v4l2_open @@ -73,10 +72,9 @@ +#define mmap v4l2_mmap +#define munmap v4l2_munmap +#endif -+ + namespace webrtc { - namespace videocapturemodule @@ -130,6 +142,11 @@ WebRtc_Word32 DeviceInfoLinux::GetDeviceName( memset(deviceNameUTF8, 0, deviceNameLength); memcpy(cameraName, cap.card, sizeof(cap.card)); Modified: trunk/www/firefox-nightly/files/patch-bug878791 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug878791 Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox-nightly/files/patch-bug878791 Sun Nov 10 09:57:42 2013 (r1377) @@ -1,11 +1,11 @@ --- toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig 2013-05-11 21:19:53.000000000 +0200 +++ toolkit/components/osfile/modules/osfile_unix_allthreads.jsm 2013-06-02 17:15:05.000000000 +0200 -@@ -40,7 +40,7 @@ if (typeof Components != "undefined") { - // Open libc - let libc; - let libc_candidates = [ "libSystem.B.dylib", -- "libc.so.6", -+ "libc.so.7", - "libc.so" ]; - for (let i = 0; i < libc_candidates.length; ++i) { - try { +@@ -41,7 +41,7 @@ let Const = SharedAll.Constants.libc; + // Open libc + let libc; + let libc_candidates = [ "libSystem.B.dylib", +- "libc.so.6", ++ "libc.so.7", + "libc.so" ]; + for (let i = 0; i < libc_candidates.length; ++i) { + try { Modified: trunk/www/firefox-nightly/files/patch-bug893397 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug893397 Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox-nightly/files/patch-bug893397 Sun Nov 10 09:57:42 2013 (r1377) @@ -20,7 +20,7 @@ 'osx_corewlan.mm', ] +elif CONFIG['OS_ARCH'] == 'FreeBSD': -+ CPP_SOURCES += [ ++ SOURCES += [ + 'nsWifiScannerFreeBSD.cpp', + ] elif CONFIG['OS_ARCH'] == 'WINNT': Deleted: trunk/www/firefox-nightly/files/patch-bug920112 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug920112 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ -diff --git extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h -index acbc6ac..d4d8179 100644 ---- extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h -+++ extensions/spellcheck/hunspell/src/mozHunspellDirProvider.h -@@ -37,6 +37,7 @@ - #define mozHunspellDirProvider_h__ - - #include "nsIDirectoryService.h" -+#include "nsIFile.h" - #include "nsISimpleEnumerator.h" - #include "mozilla/Attributes.h" - Deleted: trunk/www/firefox-nightly/files/patch-toolkit_xre_Makefile.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-toolkit_xre_Makefile.in Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,8 +0,0 @@ ---- toolkit/xre/Makefile.in.orig 2007-09-10 10:31:53.000000000 -0400 -+++ toolkit/xre/Makefile.in 2007-09-10 10:35:00.000000000 -0400 -@@ -263,5 +263,3 @@ - libs:: platform.ini - $(INSTALL) $^ $(DIST)/bin - --install:: -- $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir) Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox/Makefile Sun Nov 10 09:57:42 2013 (r1377) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 25.0 +DISTVERSION= 26.0b3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -18,7 +18,7 @@ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ unzip:${PORTSDIR}/archivers/unzip -# nss>=3.15:${PORTSDIR}/security/nss \ +# nss>=3.15.3:${PORTSDIR}/security/nss \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l @@ -50,7 +50,7 @@ .include "${.CURDIR}/../../www/firefox/Makefile.options" .include -WRKSRC:= ${WRKDIR}/mozilla-release +WRKSRC:= ${WRKDIR}/mozilla-beta post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox/distinfo Sun Nov 10 09:57:42 2013 (r1377) @@ -1,2 +1,2 @@ -SHA256 (firefox-25.0.source.tar.bz2) = 5463cc625ac2a06d4d33b43dfb6365da830eef11f3ef5c0512714baaded59272 -SIZE (firefox-25.0.source.tar.bz2) = 127524815 +SHA256 (firefox-26.0b3.source.tar.bz2) = 7a85726f540dbc6a24c8bfd929dc036e8fdc40ad88f467762b8906debebe6fa2 +SIZE (firefox-26.0b3.source.tar.bz2) = 127813748 Deleted: trunk/www/firefox/files/patch-bug807492 ============================================================================== --- trunk/www/firefox/files/patch-bug807492 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,628 +0,0 @@ -JJdiff --git configure.in configure.in -index c167461..8346c11 100644 ---- configure.in -+++ configure.in -@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then - AC_DEFINE(NS_PRINT_PREVIEW) - fi - - dnl Turn off webrtc for OS's we don't handle yet, but allow - dnl --enable-webrtc to override. Can disable for everything in - dnl the master list above. - if test -n "$MOZ_WEBRTC"; then - case "$target" in -- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*) -+ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - dnl Leave enabled - ;; - *) - dnl default to disabled for all others - MOZ_WEBRTC= - ;; - esac - fi -diff --git media/mtransport/objs.mk media/mtransport/objs.mk -index f1fc85f..141e8ca 100644 ---- media/mtransport/objs.mk -+++ media/mtransport/objs.mk -@@ -18,22 +18,26 @@ LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/util/libekr \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/log \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/registry \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/stats \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/plugin \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/event \ - $(NULL) - --ifeq ($(OS_TARGET), Darwin) -+ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ - $(NULL) -+ifeq ($(OS_TARGET), Darwin) - DEFINES += -DDARWIN -+else -+DEFINES += -DBSD -+endif - endif - - ifeq ($(OS_TARGET), Linux) - LOCAL_INCLUDES += \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include \ - -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/generic/include \ - $(NULL) - DEFINES += -DLINUX -diff --git media/mtransport/test/Makefile.in media/mtransport/test/Makefile.in -index c1d5bf4..2ecf2c7 100644 ---- media/mtransport/test/Makefile.in -+++ media/mtransport/test/Makefile.in -@@ -73,22 +73,24 @@ DEFINES += -D__Userspace_os_FreeBSD=1 - else - #default_fallback; probably doesn't work - DEFINES += -D__Userspace_os_$(OS_TARGET)=1 - endif - endif - endif - endif - --ifeq ($(OS_TARGET), Darwin) -+ifneq (,$(filter Darwin DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/darwin/include -+ifeq ($(OS_TARGET), Darwin) - DEFINES += \ - -DGTEST_USE_OWN_TR1_TUPLE=1 \ - $(NULL) - endif -+endif - - ifeq ($(OS_TARGET), Linux) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/linux/include - endif - - ifeq ($(OS_TARGET), Android) - LOCAL_INCLUDES += -I$(topsrcdir)/media/mtransport/third_party/nrappkit/src/port/android/include - -diff --git media/mtransport/third_party/nICEr/nicer.gyp media/mtransport/third_party/nICEr/nicer.gyp -index 0e1f8b4..9a4b995 100644 ---- media/mtransport/third_party/nICEr/nicer.gyp -+++ media/mtransport/third_party/nICEr/nicer.gyp -@@ -126,26 +126,36 @@ - 'R_DEFINED_UINT2=uint16_t', - 'R_DEFINED_INT4=int32_t', - 'R_DEFINED_UINT4=uint32_t', - 'R_DEFINED_INT8=int64_t', - 'R_DEFINED_UINT8=uint64_t', - ], - - 'conditions' : [ -- ## Mac -+ ## Mac and BSDs - [ 'OS == "mac"', { -+ 'defines' : [ -+ 'DARWIN', -+ 'HAVE_XLOCALE', -+ ], -+ }], -+ [ 'os_bsd == 1', { -+ 'defines' : [ -+ 'BSD', -+ ], -+ }], -+ [ 'OS == "mac" or os_bsd == 1', { - 'cflags_mozilla': [ - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', - '-Wmissing-prototypes', - ], - 'defines' : [ -- 'DARWIN', - 'HAVE_LIBM=1', - 'HAVE_STRDUP=1', - 'HAVE_STRLCPY=1', - 'HAVE_SYS_TIME_H=1', - 'HAVE_VFPRINTF=1', - 'NEW_STDIO' - 'RETSIGTYPE=void', - 'TIME_WITH_SYS_TIME_H=1', -diff --git media/mtransport/third_party/nICEr/src/stun/addrs.c media/mtransport/third_party/nICEr/src/stun/addrs.c -index b0b66b2..04fea94 100644 ---- media/mtransport/third_party/nICEr/src/stun/addrs.c -+++ media/mtransport/third_party/nICEr/src/stun/addrs.c -@@ -50,17 +50,19 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex - #else - #include - /* Work around an Android NDK < r8c bug */ - #undef __unused - #include - #endif - #include - #ifndef LINUX -+#if !defined(__OpenBSD__) && !defined(__NetBSD__) - #include -+#endif - #include - #include - #include - #else - #include - #endif - #include - -@@ -75,17 +77,17 @@ static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Ex - #include - #endif /* UNIX */ - - #include "stun.h" - #include "addrs.h" - - - --#ifdef DARWIN -+#if defined(BSD) || defined(DARWIN) - /* - * Copyright (c) 1983, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright -@@ -685,17 +687,17 @@ nr_stun_remove_duplicate_addrs(nr_transport_addr addrs[], int remove_loopback, i - } - - int - nr_stun_get_addrs(nr_transport_addr addrs[], int maxaddrs, int drop_loopback, int *count) - { - int _status=0; - int i; - --#ifdef DARWIN -+#if defined(BSD) || defined(DARWIN) - _status = stun_get_mib_addrs(addrs, maxaddrs, count); - #elif defined(WIN32) - _status = stun_get_win32_addrs(addrs, maxaddrs, count); - #elif defined(__sparc__) - _status = stun_get_sparc_addrs(addrs, maxaddrs, count); - #else - _status = stun_get_siocgifconf_addrs(addrs, maxaddrs, count); - #endif -diff --git media/mtransport/third_party/nICEr/src/stun/stun.h media/mtransport/third_party/nICEr/src/stun/stun.h -index a3c51f9..eb65ac8 100644 ---- media/mtransport/third_party/nICEr/src/stun/stun.h -+++ media/mtransport/third_party/nICEr/src/stun/stun.h -@@ -36,21 +36,25 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef WIN32 - #include - #else - #include - #include - #include - #ifndef LINUX -+#if !defined(__OpenBSD__) && !defined(__NetBSD__) - #include -+#endif - #include - #include - #endif -+#ifndef BSD - #include -+#endif - #include - #ifndef LINUX - #include - #endif - #include - #include - #endif - #include -diff --git media/mtransport/third_party/nICEr/src/util/mbslen.c media/mtransport/third_party/nICEr/src/util/mbslen.c -index cc260b7..66af2d7 100644 ---- media/mtransport/third_party/nICEr/src/util/mbslen.c -+++ media/mtransport/third_party/nICEr/src/util/mbslen.c -@@ -38,50 +38,58 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include - #include - - #include - #include - #include - #include --#ifdef DARWIN -+ -+#ifdef __FreeBSD__ -+#include -+# if __FreeBSD_version > 900505 -+# define HAVE_XLOCALE -+# endif -+#endif -+ -+#ifdef HAVE_XLOCALE - #include --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - #include "nr_api.h" - #include "mbslen.h" - - /* get number of characters in a mult-byte character string */ - int - mbslen(const char *s, size_t *ncharsp) - { --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - static locale_t loc = 0; - static int initialized = 0; --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - #ifdef WIN32 - char *my_locale=0; - unsigned int i; - #endif /* WIN32 */ - int _status; - size_t nbytes; - int nchars; - mbstate_t mbs; - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - if (! initialized) { - initialized = 1; - loc = newlocale(LC_CTYPE_MASK, "UTF-8", LC_GLOBAL_LOCALE); - } - - if (loc == 0) { - /* unable to create the UTF-8 locale */ - assert(loc != 0); /* should never happen */ --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - #ifdef WIN32 - if (!setlocale(LC_CTYPE, 0)) - ABORT(R_INTERNAL); - - if (!(my_locale = r_strdup(setlocale(LC_CTYPE, 0)))) - ABORT(R_NO_MEMORY); - -@@ -94,28 +102,28 @@ mbslen(const char *s, size_t *ncharsp) - /* can't count UTF-8 characters with mbrlen if the locale isn't UTF-8 */ - /* null-checking setlocale is required because Android */ - char *locale = setlocale(LC_CTYPE, 0); - /* some systems use "utf8" instead of "UTF-8" like Fedora 17 */ - if (!locale || (!strcasestr(locale, "UTF-8") && !strcasestr(locale, "UTF8"))) - ABORT(R_NOT_FOUND); - #endif - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - } --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - - memset(&mbs, 0, sizeof(mbs)); - nchars = 0; - --#ifdef DARWIN -+#ifdef HAVE_XLOCALE - while (*s != '\0' && (nbytes = mbrlen_l(s, strlen(s), &mbs, loc)) != 0) - #else - while (*s != '\0' && (nbytes = mbrlen(s, strlen(s), &mbs)) != 0) --#endif /* DARWIN */ -+#endif /* HAVE_XLOCALE */ - { - if (nbytes == (size_t)-1) /* should never happen */ { - ABORT(R_INTERNAL); - } - if (nbytes == (size_t)-2) /* encoding error */ { - ABORT(R_BAD_DATA); - } - -diff --git media/mtransport/third_party/nrappkit/nrappkit.gyp media/mtransport/third_party/nrappkit/nrappkit.gyp -index 3cc8e1c..74016c6 100644 ---- media/mtransport/third_party/nrappkit/nrappkit.gyp -+++ media/mtransport/third_party/nrappkit/nrappkit.gyp -@@ -142,26 +142,35 @@ - 'R_DEFINED_UINT2=uint16_t', - 'R_DEFINED_INT4=int32_t', - 'R_DEFINED_UINT4=uint32_t', - 'R_DEFINED_INT8=int64_t', - 'R_DEFINED_UINT8=uint64_t', - ], - - 'conditions' : [ -- ## Mac -+ ## Mac and BSDs - [ 'OS == "mac"', { -+ 'defines' : [ -+ 'DARWIN', -+ ], -+ }], -+ [ 'os_bsd == 1', { -+ 'defines' : [ -+ 'BSD', -+ ], -+ }], -+ [ 'OS == "mac" or os_bsd == 1', { - 'cflags_mozilla': [ - '-Wall', - '-Wno-parentheses', - '-Wno-strict-prototypes', - '-Wmissing-prototypes', - ], - 'defines' : [ -- 'DARWIN', - 'HAVE_LIBM=1', - 'HAVE_STRDUP=1', - 'HAVE_STRLCPY=1', - 'HAVE_SYS_TIME_H=1', - 'HAVE_VFPRINTF=1', - 'NEW_STDIO' - 'RETSIGTYPE=void', - 'TIME_WITH_SYS_TIME_H=1', -diff --git media/mtransport/third_party/nrappkit/src/log/r_log.c media/mtransport/third_party/nrappkit/src/log/r_log.c -index efb7ef2..aebf578 100644 ---- media/mtransport/third_party/nrappkit/src/log/r_log.c -+++ media/mtransport/third_party/nrappkit/src/log/r_log.c -@@ -43,16 +43,17 @@ static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adam - #ifdef LINUX - #define _BSD_SOURCE - #endif - - #include "r_log.h" - #include "hex.h" - - #include -+#include - #ifndef _MSC_VER - #include - #include - #endif - #include - #include - - -diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -index bcb1ec0..bb73591 100644 ---- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -+++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h -@@ -33,7 +33,7 @@ - #ifndef _SYS_QUEUE_H_ - #define _SYS_QUEUE_H_ - --#ifndef DARWIN -+#if !defined(__FreeBSD__) && !defined(DARWIN) - #include - #define __offsetof offsetof - #endif -diff --git media/mtransport/third_party/nrappkit/src/util/util.c media/mtransport/third_party/nrappkit/src/util/util.c -index a7d4ff1..ff11a60 100644 ---- media/mtransport/third_party/nrappkit/src/util/util.c -+++ media/mtransport/third_party/nrappkit/src/util/util.c -@@ -40,16 +40,17 @@ - static char *RCSSTRING __UNUSED__ ="$Id: util.c,v 1.5 2007/11/21 00:09:13 adamcain Exp $"; - - #ifndef WIN32 - #include - #include - #include - #endif - #include -+#include - #include - #include - #ifdef OPENSSL - #include - #endif - #include "nr_common.h" - #include "r_common.h" - #include "registry.h" -diff --git media/webrtc/signaling/signaling.gyp media/webrtc/signaling/signaling.gyp -index 2a91e3d..31de641 100644 ---- media/webrtc/signaling/signaling.gyp -+++ media/webrtc/signaling/signaling.gyp -@@ -223,16 +223,29 @@ - 'GIPS_VER=3480', - 'SIPCC_BUILD', - 'HAVE_WINSOCK2_H' - ], - - 'cflags_mozilla': [ - ], - }], -+ ['os_bsd==1', { -+ 'include_dirs': [ -+ ], -+ 'defines': [ -+ # avoiding pointless ifdef churn -+ 'SIP_OS_OSX', -+ 'OSX', -+ 'SECLIB_OPENSSL', -+ ], -+ -+ 'cflags_mozilla': [ -+ ], -+ }], - ['OS=="mac"', { - 'include_dirs': [ - ], - 'defines': [ - 'SIP_OS_OSX', - 'OSX', - '_FORTIFY_SOURCE=2', - ], -@@ -747,17 +760,17 @@ - 'EXTERNAL_TICK_REQUIRED', - 'GIPS_VER=3480', - ], - - 'cflags_mozilla': [ - ], - - }], -- ['OS=="mac"', { -+ ['OS=="mac" or os_bsd==1', { - - 'include_dirs': [ - ], - - 'sources': [ - # SIPSTACK - './src/sipcc/core/sipstack/sip_platform_task.c', - -@@ -792,24 +805,23 @@ - './src/sipcc/cpr/darwin/cpr_darwin_timers_using_select.c', - './src/sipcc/cpr/darwin/cpr_darwin_tst.h', - './src/sipcc/cpr/darwin/cpr_darwin_types.h', - ], - - - 'defines' : [ - 'SIP_OS_OSX', -- '_POSIX_SOURCE', -+ # using BSD extensions, leave _POSIX_SOURCE undefined - 'CPR_MEMORY_LITTLE_ENDIAN', - 'NO_SOCKET_POLLING', - 'USE_TIMER_SELECT_BASED', - 'FULL_BUILD', - 'STUBBED_OUT', - 'USE_PRINTF', -- '_DARWIN_C_SOURCE', - 'NO_NSPR_10_SUPPORT', - ], - - 'cflags_mozilla': [ - ], - }], - ], - -diff --git media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -index a7c47e1..4f191de 100644 ---- media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -+++ media/webrtc/signaling/src/sipcc/cpr/darwin/cpr_darwin_ipc.c -@@ -317,21 +317,25 @@ cprGetMessage (cprMsgQueue_t msgQueue, boolean waitForever, void **ppUserData) - { - static const char fname[] = "cprGetMessage"; - - void *buffer = 0; - cpr_msg_queue_t *msgq; - cpr_msgq_node_t *node; - struct timespec timeout; - struct timeval tv; -+#ifndef __APPLE__ -+ struct timezone tz; -+#else - // On the iPhone, there is a DarwinAlias problem with "timezone" - struct _timezone { - int tz_minuteswest; /* of Greenwich */ - int tz_dsttime; /* type of dst correction to apply */ - } tz; -+#endif - - /* Initialize ppUserData */ - if (ppUserData) { - *ppUserData = NULL; - } - - msgq = (cpr_msg_queue_t *) msgQueue; - if (msgq == NULL) { -diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in -index a30e330..cfbd8a3 100644 ---- media/webrtc/signaling/test/Makefile.in -+++ media/webrtc/signaling/test/Makefile.in -@@ -81,17 +81,17 @@ endif - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) - LIBS += \ - $(XLIBS) \ - $(TK_LIBS) \ - $(MOZ_PANGO_LIBS) \ - $(NULL) - endif - --ifeq ($(OS_TARGET),Linux) -+ifneq (,$(filter Linux DragonFly FreeBSD NetBSD OpenBSD,$(OS_TARGET))) - LIBS += \ - $(MOZ_CAIRO_OSLIBS) \ - $(NULL) - endif - - ifeq ($(OS_TARGET),Darwin) - LIBS += \ - -framework AudioToolbox \ -diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -index 338d0b7..2241d41 100644 ---- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -+++ media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py -@@ -1,16 +1,17 @@ - # Copyright (c) 2012 Mozilla Foundation. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - - import collections - import gyp - import gyp.common - import sys -+import platform - import os - import re - import shlex - - generator_wants_sorted_dependencies = True - - generator_default_variables = { - } -@@ -107,30 +108,44 @@ endif - - def ensure_directory_exists(path): - dir = os.path.dirname(path) - if dir and not os.path.exists(dir): - os.makedirs(dir) - - def GetFlavor(params): - """Returns |params.flavor| if it's set, the system's default flavor else.""" -+ system = platform.system().lower() - flavors = { -- 'win32': 'win', -- 'darwin': 'mac', -- 'sunos5': 'solaris', -- 'freebsd7': 'freebsd', -- 'freebsd8': 'freebsd', -+ 'microsoft': 'win', -+ 'windows' : 'win', -+ 'darwin' : 'mac', -+ 'sunos' : 'solaris', -+ 'dragonfly': 'bsd', -+ 'freebsd' : 'bsd', -+ 'netbsd' : 'bsd', -+ 'openbsd' : 'bsd', - } -- flavor = flavors.get(sys.platform, 'linux') -- return params.get('flavor', flavor) -+ -+ if 'flavor' in params: -+ return params['flavor'] -+ if system.startswith('cygwin'): -+ return 'win' -+ if system in flavors: -+ return flavors[system] -+ -+ return 'linux' - - - def CalculateVariables(default_variables, params): -+ flavor = GetFlavor(params) -+ if flavor == 'bsd': -+ flavor = platform.system().lower() - generator_flags = params.get('generator_flags', {}) -- default_variables['OS'] = generator_flags.get('os', GetFlavor(params)) -+ default_variables['OS'] = generator_flags.get('os', flavor) - - - def CalculateGeneratorInputInfo(params): - """Calculate the generator specific info that gets fed to input (called by - gyp).""" - generator_flags = params.get('generator_flags', {}) - if generator_flags.get('adjust_static_libraries', False): - global generator_wants_static_library_dependencies_adjusted Deleted: trunk/www/firefox/files/patch-bug851992 ============================================================================== --- trunk/www/firefox/files/patch-bug851992 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,331 +0,0 @@ -diff --git a/config/Makefile.in b/config/Makefile.in ---- config/Makefile.in -+++ config/Makefile.in -@@ -97,16 +97,17 @@ export:: $(export-preqs) - -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \ - -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \ - -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \ - -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \ - -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \ - -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \ - -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ - -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ -+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers - $(INSTALL) system_wrappers $(DIST) - - GARBAGE_DIRS += system_wrappers - endif - - ifdef WRAP_STL_INCLUDES - ifdef GNU_CXX -diff --git a/config/system-headers b/config/system-headers ---- config/system-headers -+++ config/system-headers -@@ -1125,8 +1125,19 @@ gst/video/video.h - sys/msg.h - sys/ipc.h - sys/thr.h - sys/user.h - kvm.h - spawn.h - err.h - xlocale.h -+#if MOZ_NATIVE_ICU==1 -+unicode/locid.h -+unicode/numsys.h -+unicode/ucal.h -+unicode/ucol.h -+unicode/udat.h -+unicode/udatpg.h -+unicode/uenum.h -+unicode/unum.h -+unicode/ustring.h -+#endif -diff --git a/configure.in b/configure.in ---- configure.in -+++ configure.in -@@ -4134,16 +4134,32 @@ if test -n "$MOZ_NATIVE_FFI"; then - PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9) - else - PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9) - fi - MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS" - fi - - dnl ======================================================== -+dnl system icu support -+dnl ======================================================== -+MOZ_NATIVE_ICU= -+MOZ_ARG_WITH_BOOL(system-icu, -+[ --with-system-icu -+ Use system icu (located with pkgconfig)], -+ MOZ_NATIVE_ICU=1) -+ -+if test -n "$MOZ_NATIVE_ICU"; then -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS" -+fi -+ -+AC_SUBST(MOZ_NATIVE_ICU) -+ -+dnl ======================================================== - dnl Java SDK support - dnl ======================================================== - - JAVA_BIN_PATH= - MOZ_ARG_WITH_STRING(java-bin-path, - [ --with-java-bin-path=dir - Location of Java binaries (java, javac, jar)], - JAVA_BIN_PATH=$withval) -diff --git a/js/src/Makefile.in b/js/src/Makefile.in ---- js/src/Makefile.in.orig 2013-10-26 00:19:30.000000000 +0200 -+++ js/src/Makefile.in 2013-10-26 12:51:24.469902638 +0200 -@@ -232,12 +232,17 @@ - # ICU headers need to be available whether we build with the complete - # Internationalization API or not - ICU stubs rely on them. - -+ifdef MOZ_NATIVE_ICU -+LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) -+else - LOCAL_INCLUDES += \ - -I$(topsrcdir)/../../intl/icu/source/common \ - -I$(topsrcdir)/../../intl/icu/source/i18n \ - $(NULL) -+endif - - ifdef ENABLE_INTL_API -+ifndef MOZ_NATIVE_ICU - - ifeq ($(OS_ARCH),WINNT) - # Library names: On Windows, ICU uses modified library names for static -@@ -271,6 +276,7 @@ - $(call SUBMAKE,$@,intl/icu) - - endif -+endif - - # - # END ECMAScript Internationalization API -@@ -394,7 +400,11 @@ - DEFINES += -DUSE_ZLIB - endif - --SHARED_LIBRARY_LIBS += $(ICU_LIBS) -+ifdef MOZ_NATIVE_ICU -+EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) -+else -+SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) -+endif - - # Prevent floating point errors caused by VC++ optimizations - ifdef _MSC_VER -diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in ---- js/src/config/Makefile.in -+++ js/src/config/Makefile.in -@@ -54,16 +54,17 @@ include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DUNICODE -D_UNICODE - - ifdef WRAP_SYSTEM_INCLUDES - export:: \ - $(call mkdir_deps,system_wrappers_js) \ - $(NULL) - $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \ -+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js - $(INSTALL) system_wrappers_js $(DIST) - - GARBAGE_DIRS += system_wrappers_js - endif - - GARBAGE += $(srcdir)/*.pyc *.pyc - -diff --git a/js/src/config/system-headers b/js/src/config/system-headers ---- js/src/config/system-headers -+++ js/src/config/system-headers -@@ -1125,8 +1125,19 @@ gst/video/video.h - sys/msg.h - sys/ipc.h - sys/thr.h - sys/user.h - kvm.h - spawn.h - err.h - xlocale.h -+#if MOZ_NATIVE_ICU==1 -+unicode/locid.h -+unicode/numsys.h -+unicode/ucal.h -+unicode/ucol.h -+unicode/udat.h -+unicode/udatpg.h -+unicode/uenum.h -+unicode/unum.h -+unicode/ustring.h -+#endif -diff --git a/js/src/configure.in b/js/src/configure.in ---- js/src/configure.in -+++ js/src/configure.in -@@ -4406,56 +4406,65 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE - AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION) - AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION) - fi - - - dnl ======================================================== - dnl ECMAScript Internationalization API Support (uses ICU) - dnl ======================================================== -+ICU_LIB_NAMES= -+MOZ_NATIVE_ICU= -+MOZ_ARG_WITH_BOOL(system-icu, -+[ --with-system-icu -+ Use system icu (located with pkgconfig)], -+ MOZ_NATIVE_ICU=1) -+ -+if test -n "$MOZ_NATIVE_ICU"; then -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+fi - - ENABLE_INTL_API=1 - MOZ_ARG_DISABLE_BOOL(intl-api, - [ --disable-intl-api Disable the ECMAScript Internationalization API], - ENABLE_INTL_API= ) - - dnl Settings for the implementation of the ECMAScript Internationalization API - if test -n "$ENABLE_INTL_API"; then - AC_DEFINE(ENABLE_INTL_API) -- # We build ICU as a static library. -- AC_DEFINE(U_STATIC_IMPLEMENTATION) -- -- case "$OS_TARGET" in -- WINNT) -- ICU_LIB_NAMES="icuin icuuc icudt" -- ;; -- Darwin|Linux) -- ICU_LIB_NAMES="icui18n icuuc icudata" -- ;; -- *) -- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) -- esac -- -- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' --else -- ICU_LIB_NAMES= -- ICU_LIBS= -+ -+ if test -z "$MOZ_NATIVE_ICU"; then -+ case "$OS_TARGET" in -+ WINNT) -+ ICU_LIB_NAMES="icuin icuuc icudt" -+ ;; -+ Darwin|Linux) -+ ICU_LIB_NAMES="icui18n icuuc icudata" -+ ;; -+ *) -+ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) -+ esac -+ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' -+ fi - fi - - AC_SUBST(ENABLE_INTL_API) - AC_SUBST(ICU_LIB_NAMES) --AC_SUBST(ICU_LIBS) -- --dnl Source files that use ICU should have control over which parts of the ICU --dnl namespace they want to use. --AC_DEFINE(U_USING_ICU_NAMESPACE,0) -- -+AC_SUBST(MOZ_ICU_LIBS) -+AC_SUBST(MOZ_NATIVE_ICU) - - dnl Settings for ICU --if test -n "$ENABLE_INTL_API" ; then -+if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then -+ dnl We build ICU as a static library. -+ AC_DEFINE(U_STATIC_IMPLEMENTATION) -+ -+ dnl Source files that use ICU should have control over which parts of the ICU -+ dnl namespace they want to use. -+ AC_DEFINE(U_USING_ICU_NAMESPACE,0) -+ - # Set ICU compile options - ICU_CPPFLAGS="" - # don't use icu namespace automatically in client code - ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0" - # don't include obsolete header files - ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1" - # remove chunks of the library that we don't need (yet) - ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION" -diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in ---- js/src/gdb/Makefile.in -+++ js/src/gdb/Makefile.in -@@ -14,16 +14,20 @@ include $(DEPTH)/config/autoconf.mk - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DEXPORT_JS_API -DIMPL_MFBT - - LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif -+ - EXTRA_LIBS += $(MOZ_FFI_LIBS) - - # Place a GDB Python auto-load file next to the gdb-tests executable, both - # in the build directory and in the dist/bin directory. - PP_TARGETS += GDB_AUTOLOAD - GDB_AUTOLOAD := gdb-tests-gdb.py.in - GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir)) - -diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in ---- js/src/jsapi-tests/Makefile.in -+++ js/src/jsapi-tests/Makefile.in -@@ -15,16 +15,20 @@ DEFINES += -DEXPORT_JS_API - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DIMPL_MFBT - - LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS) - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif -+ - EXTRA_LIBS += $(MOZ_FFI_LIBS) - - ifdef QEMU_EXE - MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB) - endif - - # Place a GDB Python auto-load file next to the jsapi-tests executable in - # the build directory. -diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in ---- js/src/shell/Makefile.in -+++ js/src/shell/Makefile.in -@@ -22,16 +22,19 @@ DEFINES += -DEXPORT_JS_API - # Building against js_static requires that we declare mfbt sybols "exported" - # on its behalf. - DEFINES += -DIMPL_MFBT - - LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS) - ifdef MOZ_NATIVE_FFI - EXTRA_LIBS += $(MOZ_FFI_LIBS) - endif -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - - ifeq ($(OS_ARCH),Darwin) - ifeq ($(TARGET_CPU),x86_64) - DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000 - endif - endif Deleted: trunk/www/firefox/files/patch-bug853301 ============================================================================== --- trunk/www/firefox/files/patch-bug853301 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,10 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -9454,7 +9454,6 @@ if test "A" = "A"; then - # Desktop: bug 853301 - # Android: bug 864843 - # B2G: bug 866301 -- ac_configure_args="$ac_configure_args --disable-intl-api" - fi - if test "$BUILD_CTYPES"; then - # Build js-ctypes on the platforms we can. Deleted: trunk/www/firefox/files/patch-bug876156 ============================================================================== --- trunk/www/firefox/files/patch-bug876156 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ -diff --git mfbt/Atomics.h mfbt/Atomics.h -index d79af6c..40b9336 100644 ---- mfbt/Atomics.h -+++ mfbt/Atomics.h -@@ -35,7 +35,7 @@ - */ - # if !defined(__linux__) && !defined(__OpenBSD__) && \ - (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \ -- __has_include() -+ __has_include_next() - # define MOZ_HAVE_CXX11_ATOMICS - # endif - /* Deleted: trunk/www/firefox/files/patch-bug886181 ============================================================================== --- trunk/www/firefox/files/patch-bug886181 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- modules/libpref/src/init/all.js~ -+++ modules/libpref/src/init/all.js -@@ -193,7 +193,7 @@ pref("media.webm.enabled", true); - pref("media.dash.enabled", false); - #endif - #ifdef MOZ_GSTREAMER --pref("media.gstreamer.enabled", false); -+pref("media.gstreamer.enabled", true); - #endif - #ifdef MOZ_WEBRTC - pref("media.navigator.enabled", true); Deleted: trunk/www/firefox/files/patch-bug910875 ============================================================================== --- trunk/www/firefox/files/patch-bug910875 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,102 +0,0 @@ -diff --git media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -index f231b1e..6087696 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -+++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device_impl.cc -@@ -16,7 +16,9 @@ - #include - #include - --#if defined(_WIN32) -+#if defined(WEBRTC_DUMMY_AUDIO_BUILD) -+// do not include platform specific headers -+#elif defined(_WIN32) - #include "audio_device_utility_win.h" - #include "audio_device_wave_win.h" - #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) -@@ -32,14 +34,8 @@ - #include - #include "audio_device_utility_android.h" - #include "audio_device_jni_android.h" --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include "audio_device_utility_linux.h" -- #if defined(LINUX_ALSA) -- #include "audio_device_alsa_linux.h" -- #endif -- #if defined(LINUX_PULSE) -- #include "audio_device_pulse_linux.h" -- #endif - #elif defined(WEBRTC_IOS) - #include "audio_device_utility_ios.h" - #include "audio_device_ios.h" -@@ -47,6 +43,12 @@ - #include "audio_device_utility_mac.h" - #include "audio_device_mac.h" - #endif -+#if defined(LINUX_ALSA) -+ #include "audio_device_alsa_linux.h" -+#endif -+#if defined(LINUX_PULSE) -+ #include "audio_device_pulse_linux.h" -+#endif - #include "audio_device_dummy.h" - #include "audio_device_utility_dummy.h" - #include "critical_section_wrapper.h" -@@ -161,7 +163,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Che - #elif defined(WEBRTC_ANDROID) - platform = kPlatformAndroid; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is ANDROID"); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - platform = kPlatformLinux; - WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "current platform is LINUX"); - #elif defined(WEBRTC_IOS) -@@ -309,7 +311,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() - - // Create the *Linux* implementation of the Audio Device - // --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - if ((audioLayer == kLinuxPulseAudio) || (audioLayer == kPlatformDefaultAudio)) - { - #if defined(LINUX_PULSE) -@@ -355,7 +357,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() - // - ptrAudioDeviceUtility = new AudioDeviceUtilityLinux(Id()); - } --#endif // #if defined(WEBRTC_LINUX) -+#endif // #if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - - // Create the *iPhone* implementation of the Audio Device - // -diff --git media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -index defd7f8..906c4a2 100644 ---- media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -+++ media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_api.cc -@@ -197,7 +197,7 @@ class AudioDeviceAPITest: public testing::Test { - // Create default implementation instance - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( - kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( - kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL); - EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create( -@@ -1690,7 +1690,7 @@ TEST_F(AudioDeviceAPITest, CPULoad) { - - // TODO(kjellander): Fix flakiness causing failures on Windows. - // TODO(phoglund): Fix flakiness causing failures on Linux. --#if !defined(_WIN32) && !defined(WEBRTC_LINUX) -+#if !defined(_WIN32) && !defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) - TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) { - // NOTE: this API is better tested in a functional test - CheckInitialPlayoutStates(); -@@ -1759,7 +1759,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRawInputFileRecording) { - // - size of raw_input_not_recording.pcm shall be 0 - // - size of raw_input_not_recording.pcm shall be > 0 - } --#endif // !WIN32 && !WEBRTC_LINUX -+#endif // !WIN32 && !WEBRTC_LINUX && !defined(WEBRTC_BSD) - - TEST_F(AudioDeviceAPITest, RecordingSampleRate) { - uint32_t sampleRate(0); Deleted: trunk/www/firefox/files/patch-bug916216 ============================================================================== --- trunk/www/firefox/files/patch-bug916216 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,39 +0,0 @@ ---- media/webrtc/trunk/build/build_config.h~ -+++ media/webrtc/trunk/build/build_config.h -@@ -37,9 +37,15 @@ - #elif defined(_WIN32) - #define OS_WIN 1 - #define TOOLKIT_VIEWS 1 --#elif defined(__FreeBSD__) -+#elif defined(__DragonFly__) -+#define OS_DRAGONFLY 1 -+#define TOOLKIT_GTK -+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - #define OS_FREEBSD 1 - #define TOOLKIT_GTK -+#elif defined(__NetBSD__) -+#define OS_NETBSD 1 -+#define TOOLKIT_GTK - #elif defined(__OpenBSD__) - #define OS_OPENBSD 1 - #define TOOLKIT_GTK -@@ -56,15 +62,15 @@ - - // For access to standard BSD features, use OS_BSD instead of a - // more specific macro. --#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) \ -+ || defined(OS_NETBSD) || defined(OS_OPENBSD) - #define OS_BSD 1 - #endif - - // For access to standard POSIXish features, use OS_POSIX instead of a - // more specific macro. --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ -- defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ -- defined(OS_NACL) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ -+ defined(OS_SOLARIS) || defined(OS_ANDROID) || defined(OS_NACL) - #define OS_POSIX 1 - #endif - Deleted: trunk/www/firefox/files/patch-bug918177 ============================================================================== --- trunk/www/firefox/files/patch-bug918177 Sun Nov 10 09:57:42 2013 (r1376) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,36 +0,0 @@ -diff --git config/stl-headers config/stl-headers -index c057d8e..dc7f6f0 100644 ---- config/stl-headers -+++ config/stl-headers -@@ -21,6 +21,7 @@ algorithm - atomic - deque - ios -+iosfwd - iostream - iterator - limits -diff --git config/system-headers config/system-headers -index d31c94e..570c82a 100644 ---- config/system-headers -+++ config/system-headers -@@ -469,6 +469,7 @@ IOKit/IOMessage.h - IOKit/pwr_mgt/IOPMLib.h - iomanip - ios -+iosfwd - iostream - iostream.h - iterator -diff --git js/src/config/system-headers js/src/config/system-headers -index d31c94e..570c82a 100644 ---- js/src/config/system-headers -+++ js/src/config/system-headers -@@ -469,6 +469,7 @@ IOKit/IOMessage.h - IOKit/pwr_mgt/IOPMLib.h - iomanip - ios -+iosfwd - iostream - iostream.h - iterator Modified: trunk/www/firefox/files/patch-config-baseconfig.mk ============================================================================== --- trunk/www/firefox/files/patch-config-baseconfig.mk Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/firefox/files/patch-config-baseconfig.mk Sun Nov 10 09:57:42 2013 (r1377) @@ -1,8 +1,6 @@ --- config/baseconfig.mk~ +++ config/baseconfig.mk -@@ -1,9 +1,9 @@ - INCLUDED_AUTOCONF_MK = 1 - +@@ -1,7 +1,7 @@ -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) Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/linux-firefox/Makefile Sun Nov 10 09:57:42 2013 (r1377) @@ -19,6 +19,6 @@ PREFS_FILE= ${WRKSRC}/${APP_SUBDIR}defaults/preferences/browser-prefs.js APP_SUBDIR= browser/ # plugins, extensions +NO_STAGE= yes .include "${.CURDIR}/../linux-seamonkey/Makefile.common" - .include Modified: trunk/www/linux-seamonkey/Makefile ============================================================================== --- trunk/www/linux-seamonkey/Makefile Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/linux-seamonkey/Makefile Sun Nov 10 09:57:42 2013 (r1377) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/linux-seamonkey/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= seamonkey -DISTVERSION= 2.21 +DISTVERSION= 2.22 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US @@ -13,5 +13,6 @@ USE_LINUX_APPS= dbusglib dbuslibs alsalib alsa-plugins-oss +NO_STAGE= yes .include "${.CURDIR}/Makefile.common" .include Modified: trunk/www/linux-seamonkey/distinfo ============================================================================== --- trunk/www/linux-seamonkey/distinfo Sun Nov 10 09:57:32 2013 (r1376) +++ trunk/www/linux-seamonkey/distinfo Sun Nov 10 09:57:42 2013 (r1377) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.21.tar.bz2) = ff6f361e1db0add6d4c38e5594a8b99c31f11992ae56dc2981329f66439161e2 -SIZE (seamonkey-2.21.tar.bz2) = 29490026 +SHA256 (seamonkey-2.22.tar.bz2) = b7c3daf6336c9b037e082b437b98bf3fb291ec3918676fbf31c2e4182f458f31 +SIZE (seamonkey-2.22.tar.bz2) = 28981813 From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 10 13:43:02 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 39FE1ED for ; Sun, 10 Nov 2013 13:43:02 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (neu.net [199.48.129.194]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DADD02B83 for ; Sun, 10 Nov 2013 13:43:01 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.6/8.14.5) with ESMTP id rAADgrtU089244 for ; Sun, 10 Nov 2013 08:42:53 -0500 (EST) (envelope-from andy@neu.net) Date: Sun, 10 Nov 2013 08:42:53 -0500 (EST) From: AN To: freebsd-gecko@freebsd.org Subject: Re: [SVN-Commit] r1377 - in trunk: . mail/linux-thunderbird www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files www/linux-firefox www/linux-seamonkey In-Reply-To: <201311100957.rAA9vgYD011483@trillian.chruetertee.ch> Message-ID: References: <201311100957.rAA9vgYD011483@trillian.chruetertee.ch> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Scanned: clamav-milter 0.98 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2013 13:43:02 -0000 /usr/bin/clang -o host_nsinstall.o -c -O2 -pipe -B/usr/local/bin -fno-strict-aliasing -DXP_UNIX -MD -MP -MF .deps/host_nsinstall.o.pp -DUNICODE -D_UNICODE -I../../config -I. -I../dist/include -I/usr/local/include/nspr -I/usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/obj-x86_64-unknown-freebsd11.0/dist/include/nss -I/usr/local/include -I/usr/local/include -I/usr/local/include/nspr /usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/config/nsinstall.c host_pathsub.o /usr/bin/clang -o host_pathsub.o -c -O2 -pipe -B/usr/local/bin -fno-strict-aliasing -DXP_UNIX -MD -MP -MF .deps/host_pathsub.o.pp -DUNICODE -D_UNICODE -I../../config -I. -I../dist/include -I/usr/local/include/nspr -I/usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/obj-x86_64-unknown-freebsd11.0/dist/include/nss -I/usr/local/include -I/usr/local/include -I/usr/local/include/nspr /usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/config/pathsub.c /usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/obj-x86_64-unknown-freebsd11.0/_virtualenv/bin/python ../../config/nsinstall.py -t stl_wrappers ../dist touch ../dist/stl_wrappers/sentinel nsinstall_real /usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/obj-x86_64-unknown-freebsd11.0/_virtualenv/bin/python ../../config/expandlibs_exec.py --depend .deps/nsinstall_real.pp --target nsinstall_real -- /usr/bin/clang -o nsinstall_real -O2 -pipe -B/usr/local/bin -fno-strict-aliasing -DXP_UNIX -MD -MP -MF .deps/nsinstall_real.pp -DUNICODE -D_UNICODE -L/usr/local/lib -Wl,-z,origin -Wl,-rpath,' -B/usr/local/bin host_nsinstall.o host_pathsub.o Syntax error: Unterminated quoted string gmake[6]: *** [nsinstall_real] Error 2 gmake[6]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/obj-x86_64-unknown-freebsd11.0/config' gmake[5]: *** [config/export] Error 2 gmake[5]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/obj-x86_64-unknown-freebsd11.0' gmake[4]: *** [export] Error 2 gmake[4]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/obj-x86_64-unknown-freebsd11.0' gmake[3]: *** [default] Error 2 gmake[3]: Leaving directory `/usr/ports/www/FF_nightly/work/mozilla-inbound-94a544d956c6/obj-x86_64-unknown-freebsd11.0' ===> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to the maintainer. *** Error code 1 Stop. make[2]: stopped in /usr/ports/www/FF_nightly *** Error code 1 From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 10 18:21:44 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 43EF6CD9 for ; Sun, 10 Nov 2013 18:21:44 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CB9322913 for ; Sun, 10 Nov 2013 18:21:43 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAAILdpb096983 for ; Sun, 10 Nov 2013 18:21: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 rAAILYLn096431 for freebsd-gecko@freebsd.org; Sun, 10 Nov 2013 18:21:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 10 Nov 2013 18:21:34 GMT Message-Id: <201311101821.rAAILYLn096431@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 Subject: [SVN-Commit] r1378 - trunk/Mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 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, 10 Nov 2013 18:21:44 -0000 Author: jbeich Date: Sun Nov 10 18:21:34 2013 New Revision: 1378 Log: redo r1376 without quotes Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sun Nov 10 09:57:42 2013 (r1377) +++ trunk/Mk/bsd.gecko.mk Sun Nov 10 18:21:34 2013 (r1378) @@ -540,7 +540,7 @@ MOZ_OPTIONS+= --prefix="${FAKEDIR}" CPPFLAGS+= -isystem${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,'\$$$$ORIGIN' +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,\\$$$\$$$$ORIGIN # prefer base clang, for lang/clang{,-devel} see ports/177224 .if ${CC} == "cc" && (exists(/usr/bin/clang) && ${OSVERSION} >= 900014) From owner-freebsd-gecko@FreeBSD.ORG Sun Nov 10 22:18:51 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 495CD1EC for ; Sun, 10 Nov 2013 22:18:51 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (neu.net [199.48.129.194]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EA9B125C6 for ; Sun, 10 Nov 2013 22:18:50 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.6/8.14.5) with ESMTP id rAAMIm3n090385 for ; Sun, 10 Nov 2013 17:18:48 -0500 (EST) (envelope-from andy@neu.net) Date: Sun, 10 Nov 2013 17:18:48 -0500 (EST) From: AN To: freebsd-gecko@freebsd.org Subject: Re: [SVN-Commit] r1378 - trunk/Mk In-Reply-To: <201311101821.rAAILYLn096431@trillian.chruetertee.ch> Message-ID: References: <201311101821.rAAILYLn096431@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-Virus-Scanned: clamav-milter 0.98 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Nov 2013 22:18:51 -0000 On Sun, 10 Nov 2013, svn-freebsd-gecko@chruetertee.ch wrote: > Author: jbeich > Date: Sun Nov 10 18:21:34 2013 > New Revision: 1378 > > Log: > redo r1376 without quotes > > Modified: > trunk/Mk/bsd.gecko.mk > > Modified: trunk/Mk/bsd.gecko.mk > ============================================================================== > --- trunk/Mk/bsd.gecko.mk Sun Nov 10 09:57:42 2013 (r1377) > +++ trunk/Mk/bsd.gecko.mk Sun Nov 10 18:21:34 2013 (r1378) > @@ -540,7 +540,7 @@ > MOZ_OPTIONS+= --prefix="${FAKEDIR}" > > CPPFLAGS+= -isystem${LOCALBASE}/include > -LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,'\$$$$ORIGIN' > +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,\\$$$\$$$$ORIGIN > > # prefer base clang, for lang/clang{,-devel} see ports/177224 > .if ${CC} == "cc" && (exists(/usr/bin/clang) && ${OSVERSION} >= 900014) > _______________________________________________ Compiled and installed successfully. ===> Registering installation for firefox-nightly-28.0.154288,1 Installing firefox-nightly-28.0.154288,1... done However, I have no sound playback. Here are the config options: # cat /usr/ports/www/FF_nightly/Makefile.options # -*- makefile-bsdmake -*- OPTIONS_DEFINE+= DBUS DEBUG GNOME LIBPROXY LOGGING OPTIMIZED_CFLAGS GSTREAMER OPTIONS_DEFAULT+= DBUS GTK2 LOGGING GSTREAMER OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO OPTIONS_SINGLE+= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 QT4 OPTIONS_MULTI+= GNOME OPTIONS_MULTI_GNOME= GCONF GIO GNOMEUI GNOMEVFS2 GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk GNOMEUI_DESC?= libgnomeui support module LIGHTNING_DESC?= Calendar extension LOGGING_DESC?= Additional log messages PGO_DESC?= Profile-Guided Optimization # move to bsd.options.desc.mk LIBPROXY_DESC?= Proxy support via libproxy Here are the config options for cat /usr/ports/www/firefox/Makefile.options: # -*- makefile-bsdmake -*- OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \ LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST OPTIONS_DEFAULT+= ALSA DBUS GIO GSTREAMER LOGGING OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO ENIGMAIL_DESC?= Enigmail extension GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk GNOMEUI_DESC?= libgnomeui support module LIBPROXY_DESC?= Proxy support via libproxy LIGHTNING_DESC?= Calendar extension LOGGING_DESC?= Additional log messages Sound works on /usr/ports/www/firefox So, what config settings should I use on FF_Nightly? Thanks in advance. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 11 00:42:05 2013 Return-Path: Delivered-To: gecko@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B557E9DD; Mon, 11 Nov 2013 00:42:05 +0000 (UTC) (envelope-from jhs@berklix.com) Received: from land.berklix.org (land.berklix.org [144.76.10.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF5142D20; Mon, 11 Nov 2013 00:41:58 +0000 (UTC) Received: from mart.js.berklix.net (pD9FBEBC4.dip0.t-ipconnect.de [217.251.235.196]) (authenticated bits=128) by land.berklix.org (8.14.5/8.14.5) with ESMTP id rAB0fug0076173; Mon, 11 Nov 2013 00:41:56 GMT (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (fire.js.berklix.net [192.168.91.41]) by mart.js.berklix.net (8.14.3/8.14.3) with ESMTP id rAB0fguI028529; Mon, 11 Nov 2013 01:41:42 +0100 (CET) (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (localhost.js.berklix.net [127.0.0.1]) by fire.js.berklix.net (8.14.4/8.14.4) with ESMTP id rAB0fa0P065392; Mon, 11 Nov 2013 01:41:42 +0100 (CET) (envelope-from jhs@fire.js.berklix.net) Message-Id: <201311110041.rAB0fa0P065392@fire.js.berklix.net> To: ports@FreeBSD.ORG Subject: Re: Anyone looked at making a port for https://www.eff.org/https-everywhere ? From: "Julian H. Stacey" Organization: http://berklix.com BSD Unix Linux Consultancy, Munich Germany User-agent: EXMH on FreeBSD http://berklix.com/free/ X-URL: http://www.berklix.com In-reply-to: Your message "Sat, 09 Nov 2013 14:22:52 GMT." <20131109142252.GA97651@FreeBSD.org> Date: Mon, 11 Nov 2013 01:41:36 +0100 Sender: jhs@berklix.com Cc: Maintainer of ports/www/firefox , Alexey Dokuchaev , Mark Felder X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 00:42:05 -0000 > On Thu, Nov 07, 2013 at 02:34:00PM +0100, Julian H. Stacey wrote: > > Has anyone looked at making a ports wrapper for > > https://www.eff.org/https-everywhere ? > > > > Sources: https://www.eff.org/https-everywhere/development > > > > PS on current/ports, grep https-everywhere shows nothing, > > grep www.eff.org shows just security/switzerland/, port creator > > Alexey Dokuchaev added to CC. Mark Felder Thu, 07 Nov 2013 07:43:40 -0600 (14:43 CET) : > Do we actually have ports for other browser plugins (besides > flash/java)? I don't know, but added to CC list gecko@ that probably knows: "Maintainer of ports/www/firefox" Alexey Dokuchaev wrote Sat, 9 Nov 2013 14:22:52 +0000 : > Oh, that's a blast from the past. :) Frankly I already forgot why I decided > to port it, probably because I needed it back in those days. I'm afraid I > cannot say anything about https-everywhere as a whole. > > ./danfe OK Thanks, https-everywhere looks interesting, but I dont actually need it currently so not planning to write a port myself, I was just thinking of trying it if a port existed. I won't download & install the binary though. Cheers, Julian -- Julian Stacey, BSD Unix Linux C Sys Eng Consultant, Munich http://berklix.com Interleave replies below like a play script. Indent old text with "> ". Send plain text, not quoted-printable, HTML, base64, or multipart/alternative. Extradite NSA spy chief Alexander. http://berklix.eu/jhs/blog/2013_10_30 From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 11 09:46:42 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 38343AD7 for ; Mon, 11 Nov 2013 09:46:42 +0000 (UTC) (envelope-from portscout@FreeBSD.org) Received: from portscout.freebsd.org (unknown [IPv6:2001:1900:2254:206a::50:123]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 26842279C for ; Mon, 11 Nov 2013 09:46:42 +0000 (UTC) Received: from portscout.freebsd.org ([127.0.1.123]) by portscout.freebsd.org (8.14.7/8.14.7) with ESMTP id rAB9kgrr027884 for ; Mon, 11 Nov 2013 09:46:42 GMT (envelope-from portscout@portscout.freebsd.org) Received: (from portscout@localhost) by portscout.freebsd.org (8.14.7/8.14.6/Submit) id rAB9kgj1027880; Mon, 11 Nov 2013 09:46:42 GMT (envelope-from portscout) Message-Id: <201311110946.rAB9kgj1027880@portscout.freebsd.org> Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Date: Mon, 11 Nov 2013 09:46:42 +0000 From: portscout@FreeBSD.org To: gecko@freebsd.org Subject: FreeBSD ports you maintain which are out of date X-Mailer: portscout/0.8.1 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 09:46:42 -0000 Dear port maintainer, The portscout new distfile checker has detected that one or more of your ports appears to be out of date. Please take the opportunity to check each of the ports listed below, and if possible and appropriate, submit/commit an update. If any ports have already been updated, you can safely ignore the entry. You will not be e-mailed again for any of the port/version combinations below. Full details can be found at the following URL: http://portscout.freebsd.org/gecko@freebsd.org.html Port | Current version | New version ------------------------------------------------+-----------------+------------ www/xpi-colorfultabs | 19.0 | 21.3 ------------------------------------------------+-----------------+------------ If any of the above results are invalid, please check the following page for details on how to improve portscout's detection and selection of distfiles on a per-port basis: http://portscout.freebsd.org/info/portscout-portconfig.txt If wish to stop receiving portscout reminders, please contact portscout@FreeBSD.org Thanks. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 11 11:07:05 2013 Return-Path: Delivered-To: gecko@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 81A53ADB for ; Mon, 11 Nov 2013 11:07:05 +0000 (UTC) (envelope-from owner-bugmaster@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 572322CF4 for ; Mon, 11 Nov 2013 11:07:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rABB75Fm082467 for ; Mon, 11 Nov 2013 11:07:05 GMT (envelope-from owner-bugmaster@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rABB74jP082460 for gecko@FreeBSD.org; Mon, 11 Nov 2013 11:07:04 GMT (envelope-from owner-bugmaster@FreeBSD.org) Date: Mon, 11 Nov 2013 11:07:04 GMT Message-Id: <201311111107.rABB74jP082460@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 Subject: Current problem reports assigned to gecko@FreeBSD.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 11:07:05 -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/183630 gecko www/firefox: Firefox 25.0_1,1 cannot built on amd64 o ports/182499 gecko www/firefox crash when i try use textproc/ibus/ o ports/182411 gecko mail/thunderbird: Does not build with poudriere on 9.1 o ports/182386 gecko mail/thunderbird-i18n: fail to build at install stage o ports/182351 gecko mail/thunderbird - doesn't build with qt3 o ports/182346 gecko mail/thunderbird - fails to build with gtk3 o ports/181393 gecko www/xpi-quick-locale-switcher 1.7.8.5 does not works w o ports/181005 gecko mail/thunderbird - Enigmail failes to start pinentry o ports/180938 gecko www/firefox: ia64: ../../../js/src/gc/Heap.h:827:1: er o ports/180855 gecko www/firefox: Firefox 22 crashes on HTML 5 videos o ports/180766 gecko Flash not work in www/firefox o ports/180563 gecko www/seamonkey compilation error with Clang (*pp = '\0' o ports/180380 gecko www/firefox: Firefox 22.0 dies instantly when I try to o ports/179420 gecko www/seamonkey freezes completely by accessing citrix x o ports/178524 gecko BATCH=yes not work for www/firefox-i18n o ports/177404 gecko www/firefox: youtube videos in firefox not working o ports/170310 gecko mail/thunderbird: coredump/crash when used with OpenLD o ports/169366 gecko www/xpi-* ports need re-install after each Firefox upd o ports/168091 gecko Mk/bsd.gecko.mk error: USE_FIREFOX doesn't work correc f ports/165263 gecko mail/thunderbird: core dumping most time when users ar o ports/164239 gecko [PATCH] mail/thunderbird: crash with nss_ldap o ports/160387 gecko security/ca_root_nss: Allow user to trust extra local f ports/155949 gecko www/firefox: firefox 4, WITH_PGO, better Text against o ports/144044 gecko [PATCH] www/firefox: Makefile.webplugins target order 24 problems total. From owner-freebsd-gecko@FreeBSD.ORG Mon Nov 11 13:08:17 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 894E872E for ; Mon, 11 Nov 2013 13:08:17 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1048825E0 for ; Mon, 11 Nov 2013 13:08:16 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rABD8Ff6034292 for ; Mon, 11 Nov 2013 13:08: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 rABD8AP9033102 for freebsd-gecko@freebsd.org; Mon, 11 Nov 2013 13:08:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 11 Nov 2013 13:08:10 GMT Message-Id: <201311111308.rABD8AP9033102@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 Subject: [SVN-Commit] r1379 - in trunk: mail/linux-thunderbird www/firefox www/linux-seamonkey www/seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2013 13:08:17 -0000 Author: flo Date: Mon Nov 11 13:08:10 2013 New Revision: 1379 Log: sync some more with ports Modified: trunk/mail/linux-thunderbird/pkg-plist trunk/www/firefox/Makefile trunk/www/linux-seamonkey/Makefile.common trunk/www/linux-seamonkey/pkg-plist trunk/www/seamonkey/Makefile Modified: trunk/mail/linux-thunderbird/pkg-plist ============================================================================== --- trunk/mail/linux-thunderbird/pkg-plist Sun Nov 10 18:21:34 2013 (r1378) +++ trunk/mail/linux-thunderbird/pkg-plist Mon Nov 11 13:08:10 2013 (r1379) @@ -90,4 +90,3 @@ @dirrm lib/%%APP_NAME%%/plugins @dirrm lib/%%APP_NAME%%/searchplugins @dirrm lib/%%APP_NAME%% -@dirrmtry share/applications Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sun Nov 10 18:21:34 2013 (r1378) +++ trunk/www/firefox/Makefile Mon Nov 11 13:08:10 2013 (r1379) @@ -52,6 +52,10 @@ WRKSRC:= ${WRKDIR}/mozilla-beta +.if ${ARCH} == i386 && ${OSVERSION} < 1000000 +USE_GCC?= yes +.endif + post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Sun Nov 10 18:21:34 2013 (r1378) +++ trunk/www/linux-seamonkey/Makefile.common Mon Nov 11 13:08:10 2013 (r1379) @@ -69,7 +69,6 @@ .if !target(do-install) do-install: - @${INSTALL} -d ${FDIR} ${PREFIX}/share/applications @${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/ @${CP} -pR ${WRKSRC}/ ${FDIR}/ @${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/ @@ -116,7 +115,6 @@ -depth 1 -type l -delete ${_Q}' >> ${PLIST} cd ${WRKSRC} && ${FIND} -sd . -type d | \ ${SED} -e "s#^\.#@dirrm lib/%%APP_NAME%%#" >> ${PLIST} - ${ECHO_CMD} @dirrmtry share/applications >> ${PLIST} snatch-desktop: ${SED} -E -e 's/${PORTNAME}/${APP_NAME}/' \ Modified: trunk/www/linux-seamonkey/pkg-plist ============================================================================== --- trunk/www/linux-seamonkey/pkg-plist Sun Nov 10 18:21:34 2013 (r1378) +++ trunk/www/linux-seamonkey/pkg-plist Mon Nov 11 13:08:10 2013 (r1379) @@ -140,4 +140,3 @@ @dirrm lib/%%APP_NAME%%/plugins @dirrm lib/%%APP_NAME%%/searchplugins @dirrm lib/%%APP_NAME%% -@dirrmtry share/applications Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sun Nov 10 18:21:34 2013 (r1378) +++ trunk/www/seamonkey/Makefile Mon Nov 11 13:08:10 2013 (r1379) @@ -23,6 +23,7 @@ EM_VERSION= 1.6 L_VERSION= 2.7b1 +SSP_UNSAFE= yes USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=-2.7 OBJDIR_BUILD= # in-tree build broken after bug 789837 From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 14 08:39:09 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65BC493E for ; Thu, 14 Nov 2013 08:39:09 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D16B126D9 for ; Thu, 14 Nov 2013 08:39:08 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAE8d5n8091751 for ; Thu, 14 Nov 2013 08:39:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAE8d0mA089373 for freebsd-gecko@freebsd.org; Thu, 14 Nov 2013 08:39:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 14 Nov 2013 08:39:00 GMT Message-Id: <201311140839.rAE8d0mA089373@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 Subject: [SVN-Commit] r1380 - in trunk: . www/linux-tor-browser www/linux-tor-browser/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 08:39:09 -0000 Author: jbeich Date: Thu Nov 14 08:39:00 2013 New Revision: 1380 Log: add linux TorBrowserBundle linux-c6- dependencies haven't landed yet, so read http://lists.freebsd.org/pipermail/freebsd-emulation/2013-November/010958.html Added: trunk/www/linux-tor-browser/ trunk/www/linux-tor-browser/Makefile trunk/www/linux-tor-browser/distinfo trunk/www/linux-tor-browser/files/ trunk/www/linux-tor-browser/files/freebsd.js trunk/www/linux-tor-browser/files/patch-start-tor-browser trunk/www/linux-tor-browser/files/pkg-message.in trunk/www/linux-tor-browser/pkg-descr trunk/www/linux-tor-browser/pkg-plist Modified: trunk/Gecko_TODO Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Mon Nov 11 13:08:10 2013 (r1379) +++ trunk/Gecko_TODO Thu Nov 14 08:39:00 2013 (r1380) @@ -14,9 +14,8 @@ unassigned (ports): - add BlueGriffon to replace www/kompozer -- add TorBrowserBundle: - * linux version requires newer glibc/gtk - * native needs privacy audit of our build glue +- add native TorBrowserBundle, may need privacy audit of our build glue +- add more languages to www/linux-tor-browser - switch to system libxul (needs slaves with common patches); a Debian patch to reduce configure time can be useful - move duplicated `>=' deps into bsd.gecko.mk (system libxul?) Added: trunk/www/linux-tor-browser/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/linux-tor-browser/Makefile Thu Nov 14 08:39:00 2013 (r1380) @@ -0,0 +1,106 @@ +# $FreeBSD$ + +PORTNAME= tor-browser +DISTVERSIONPREFIX=gnu-linux-i686- +DISTVERSION= 2.3.25-14 +DISTVERSIONSUFFIX=-dev-en-US +CATEGORIES= www linux +# XXX copied from security/tor, move to bsd.sites.mk +MASTER_SITES= https://www.torproject.org/dist/torbrowser/linux/ \ + ftp://ftp.bit.nl/mirror/tor/torbrowser/linux/ \ + http://cyberside.net.ee/tor/torbrowser/linux/ \ + http://ftp.bit.nl/mirror/tor/torbrowser/linux/ \ + http://mirror.hessmo.com/tor/dist/torbrowser/linux/ \ + http://mirror.host4site.co.il/torproject.org/dist/torbrowser/linux/ \ + http://mirror.open-networx.org/torproject.org/dist/torbrowser/linux/ \ + http://mirror.tor.hu/dist/torbrowser/linux/ \ + https://mirror.torland.me/torproject.org/dist/torbrowser/linux/ \ + http://mirrors.chaos-darmstadt.de/tor-mirror/dist/torbrowser/linux/ \ + http://theonionrouter.com/dist/torbrowser/linux/ \ + http://tor.amorphis.eu/dist/torbrowser/linux/ \ + http://tor.askapache.com/dist/torbrowser/linux/ \ + http://tor.beme-it.de/dist/torbrowser/linux/ \ + http://tor.blingblingsquad.net/dist/torbrowser/linux/ \ + http://tor.borgmann.tv/dist/torbrowser/linux/ \ + http://tor.ccc.de/dist/torbrowser/linux/ \ + http://tor.cyberarmy.at/dist/torbrowser/linux/ \ + http://tor.dont-know-me.at/dist/torbrowser/linux/ \ + http://tor.factor.cc/dist/torbrowser/linux/ \ + http://tor.homosu.net/dist/torbrowser/linux/ \ + http://tor.idnr.ws/dist/torbrowser/linux/ \ + http://tor.myrl.net/dist/torbrowser/linux/ \ + http://tor.kamagurka.org/dist/torbrowser/linux/ \ + http://tor.spline.de/dist/torbrowser/linux/ \ + http://tor.taiga-san.net/dist/torbrowser/linux/ \ + http://tor.vesta.nu/dist/torbrowser/linux/ \ + http://torproj.xpdm.us/dist/torbrowser/linux/ \ + https://torproject.antagonism.org/dist/torbrowser/linux/ \ + https://torproject.crypto.is/dist/torbrowser/linux/ \ + http://torproject.is/dist/torbrowser/linux/ \ + http://torproject.jcsh.it/dist/torbrowser/linux/ \ + http://torproject.nwlinux.us/dist/torbrowser/linux/ \ + http://torproject.ph3x.at/dist/torbrowser/linux/ \ + https://www.coevoet.nl/tor/dist/torbrowser/linux/ \ + http://www.oignon.net/dist/torbrowser/linux/ \ + http://www.torproject.nl/dist/torbrowser/linux/ \ + http://www.torproject.org.nyud.net/dist/torbrowser/linux/ \ + http://www.torproject.us/dist/torbrowser/linux/ \ + http://www.torservers.net/mirrors/torproject.org/dist/torbrowser/linux/ +PKGNAMEPREFIX= linux- + +MAINTAINER= gecko@FreeBSD.org +COMMENT= Privacy-oriented web browser + +# XXX weak protection for make makesum, should be in bsd.port.mk +FETCH_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +FETCH_ENV= SSL_CA_CERT_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt + +ONLY_FOR_ARCHS= i386 amd64 +CONFLICTS= tor-browser-[0-9]* + +USE_DOS2UNIX= yes +DOS2UNIX_REGEX= .*/torrc +USE_LINUX= c6 +USE_LINUX_APPS= atk fontconfig gtk2 pango \ + dbusglib dbuslibs alsalib alsa-plugins-oss +NO_BUILD= yes + +SUB_FILES= pkg-message +WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSIONSUFFIX:S/-dev-/_/} +DATADIR?= /tmp/${UNIQUENAME} + +DESKTOP_ENTRIES="Tor Browser Bundle" \ + "${COMMENT}" \ + "${PREFIX}/lib/${UNIQUENAME}/App/Firefox/icons/mozicon128.png" \ + "start-tor-browser" \ + "Network;WebBrowser;" \ + true + +post-extract: + @${CHMOD} -R +rX ${WRKSRC} + + @${RMDIR} ${WRKSRC}/tmp + @${MKDIR} ${WRKSRC}/.mozilla/firefox + + @${MV} ${WRKSRC}/Data ${WRKSRC}/Skel + @${LN} -sf ${DATADIR} ${WRKSRC}/Data + + @${LN} -sf ${LOCALBASE}/lib/npapi/symlinks/linux-firefox \ + ${WRKSRC}/App/Firefox/plugins + + @${MKDIR} ${WRKSRC}/App/Firefox/defaults/preferences + @${CP} ${FILESDIR}/freebsd.js \ + ${WRKSRC}/App/Firefox/defaults/preferences/ + +post-patch: + @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${WRKSRC}/start-tor-browser + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${UNIQUENAME} + ${TAR} cf - -C${WRKSRC} --exclude '*.orig' --exclude '*.bak' . | \ + ${TAR} xof - -C${STAGEDIR}${PREFIX}/lib/${UNIQUENAME} + ${LN} -sf ${PREFIX}/lib/${UNIQUENAME}/start-tor-browser \ + ${STAGEDIR}${PREFIX}/bin + +.include Added: trunk/www/linux-tor-browser/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/linux-tor-browser/distinfo Thu Nov 14 08:39:00 2013 (r1380) @@ -0,0 +1,2 @@ +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-en-US.tar.gz) = de19ddb3a3a7300f30394e6aae622ab5238b4de7217af97293ee4cb01bb6e54a +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-en-US.tar.gz) = 36739654 Added: trunk/www/linux-tor-browser/files/freebsd.js ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/linux-tor-browser/files/freebsd.js Thu Nov 14 08:39:00 2013 (r1380) @@ -0,0 +1,2 @@ +// no AFMT_FLOAT support in kernel (firefox bug 780531) +pref("media.use_cubeb", false); Added: trunk/www/linux-tor-browser/files/patch-start-tor-browser ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/linux-tor-browser/files/patch-start-tor-browser Thu Nov 14 08:39:00 2013 (r1380) @@ -0,0 +1,15 @@ +--- start-tor-browser~ ++++ start-tor-browser +@@ -208,6 +208,12 @@ LDPATH="${HOME}/Lib/" + export LDPATH + export LD_LIBRARY_PATH + ++# FreeBSD port stores live Data under /tmp, copied from skeleton ++printf "\nCopying skeleton profile to %%DATADIR%%\n" ++cd "${HOME}" ++umask 077 ++cp -nR Skel/ %%DATADIR%% ++ + if [ "$debug" -eq 1 ]; then + printf "\nStarting Vidalia now\n" + cd "${HOME}" Added: trunk/www/linux-tor-browser/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/linux-tor-browser/files/pkg-message.in Thu Nov 14 08:39:00 2013 (r1380) @@ -0,0 +1,3 @@ +Unlike vendor-provided TorBrowserBundle, the port stores temporary +data under %%DATADIR%%. If you wish to start from a clean profile +either remove the directory or reinstall the package. Added: trunk/www/linux-tor-browser/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/linux-tor-browser/pkg-descr Thu Nov 14 08:39:00 2013 (r1380) @@ -0,0 +1,4 @@ +Tor Browser Bundle is a bundle of Tor, Vidalia and patched Firefox ESR, +pre-configured to protect users' privacy and anonymity on the web. + +WWW: https://www.torproject.org/projects/torbrowser.html.en Added: trunk/www/linux-tor-browser/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/linux-tor-browser/pkg-plist Thu Nov 14 08:39:00 2013 (r1380) @@ -0,0 +1,348 @@ +@unexec rm -rf %%DATADIR%% +bin/start-tor-browser +lib/linux-tor-browser/App/Firefox/application.ini +lib/linux-tor-browser/App/Firefox/blocklist.xml +lib/linux-tor-browser/App/Firefox/chrome.manifest +lib/linux-tor-browser/App/Firefox/components/binary.manifest +lib/linux-tor-browser/App/Firefox/components/libbrowsercomps.so +lib/linux-tor-browser/App/Firefox/components/libdbusservice.so +lib/linux-tor-browser/App/Firefox/defaults/pref/channel-prefs.js +lib/linux-tor-browser/App/Firefox/defaults/preferences/freebsd.js +lib/linux-tor-browser/App/Firefox/defaults/profile/bookmarks.html +lib/linux-tor-browser/App/Firefox/defaults/profile/preferences/extension-overrides.js +lib/linux-tor-browser/App/Firefox/dependentlibs.list +lib/linux-tor-browser/App/Firefox/dictionaries/en-US.aff +lib/linux-tor-browser/App/Firefox/dictionaries/en-US.dic +lib/linux-tor-browser/App/Firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png +lib/linux-tor-browser/App/Firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +lib/linux-tor-browser/App/Firefox/firefox +lib/linux-tor-browser/App/Firefox/firefox-bin +lib/linux-tor-browser/App/Firefox/icons/mozicon128.png +lib/linux-tor-browser/App/Firefox/icons/updater.png +lib/linux-tor-browser/App/Firefox/libfreebl3.chk +lib/linux-tor-browser/App/Firefox/libfreebl3.so +lib/linux-tor-browser/App/Firefox/libmozalloc.so +lib/linux-tor-browser/App/Firefox/libmozsqlite3.so +lib/linux-tor-browser/App/Firefox/libnspr4.so +lib/linux-tor-browser/App/Firefox/libnss3.so +lib/linux-tor-browser/App/Firefox/libnssckbi.so +lib/linux-tor-browser/App/Firefox/libnssdbm3.chk +lib/linux-tor-browser/App/Firefox/libnssdbm3.so +lib/linux-tor-browser/App/Firefox/libnssutil3.so +lib/linux-tor-browser/App/Firefox/libplc4.so +lib/linux-tor-browser/App/Firefox/libplds4.so +lib/linux-tor-browser/App/Firefox/libsmime3.so +lib/linux-tor-browser/App/Firefox/libsoftokn3.chk +lib/linux-tor-browser/App/Firefox/libsoftokn3.so +lib/linux-tor-browser/App/Firefox/libssl3.so +lib/linux-tor-browser/App/Firefox/libxpcom.so +lib/linux-tor-browser/App/Firefox/libxul.so +lib/linux-tor-browser/App/Firefox/modules/services-aitc/.mkdir.done +lib/linux-tor-browser/App/Firefox/modules/services-common/.mkdir.done +lib/linux-tor-browser/App/Firefox/modules/services-crypto/.mkdir.done +lib/linux-tor-browser/App/Firefox/modules/services-notifications/.mkdir.done +lib/linux-tor-browser/App/Firefox/modules/services-sync/.mkdir.done +lib/linux-tor-browser/App/Firefox/modules/services-sync/engines/.mkdir.done +lib/linux-tor-browser/App/Firefox/modules/sessionstore/.mkdir.done +lib/linux-tor-browser/App/Firefox/mozilla-xremote-client +lib/linux-tor-browser/App/Firefox/omni.ja +lib/linux-tor-browser/App/Firefox/platform.ini +lib/linux-tor-browser/App/Firefox/plugin-container +lib/linux-tor-browser/App/Firefox/plugins +lib/linux-tor-browser/App/Firefox/precomplete +lib/linux-tor-browser/App/Firefox/removed-files +lib/linux-tor-browser/App/Firefox/run-mozilla.sh +lib/linux-tor-browser/App/Firefox/searchplugins/amazondotcom.xml +lib/linux-tor-browser/App/Firefox/searchplugins/bing.xml +lib/linux-tor-browser/App/Firefox/searchplugins/duckduckgo.xml +lib/linux-tor-browser/App/Firefox/searchplugins/eBay.xml +lib/linux-tor-browser/App/Firefox/searchplugins/google.xml +lib/linux-tor-browser/App/Firefox/searchplugins/startpage.xml +lib/linux-tor-browser/App/Firefox/searchplugins/twitter.xml +lib/linux-tor-browser/App/Firefox/searchplugins/wikipedia.xml +lib/linux-tor-browser/App/Firefox/searchplugins/yahoo.xml +lib/linux-tor-browser/App/Firefox/update-settings.ini +lib/linux-tor-browser/App/Firefox/updater +lib/linux-tor-browser/App/Firefox/updater.ini +lib/linux-tor-browser/App/Firefox/webapprt-stub +lib/linux-tor-browser/App/Firefox/webapprt/omni.ja +lib/linux-tor-browser/App/Firefox/webapprt/webapprt.ini +lib/linux-tor-browser/App/tor +lib/linux-tor-browser/App/vidalia +lib/linux-tor-browser/Data +lib/linux-tor-browser/Docs/Qt/LICENSE.GPL3 +lib/linux-tor-browser/Docs/Qt/LICENSE.LGPL +lib/linux-tor-browser/Docs/README-TorBrowserBundle +lib/linux-tor-browser/Docs/Tor/LICENSE +lib/linux-tor-browser/Docs/Tor/README +lib/linux-tor-browser/Docs/Vidalia/CREDITS +lib/linux-tor-browser/Docs/Vidalia/LICENSE +lib/linux-tor-browser/Docs/Vidalia/LICENSE-GPLV2 +lib/linux-tor-browser/Docs/Vidalia/LICENSE-GPLV3 +lib/linux-tor-browser/Docs/Vidalia/LICENSE-LGPLV3 +lib/linux-tor-browser/Docs/changelog +lib/linux-tor-browser/Lib/.shared-library-name-list +lib/linux-tor-browser/Lib/.shared-library-rename-action-list +lib/linux-tor-browser/Lib/libQtCore.so.4 +lib/linux-tor-browser/Lib/libQtGui.so.4 +lib/linux-tor-browser/Lib/libQtNetwork.so.4 +lib/linux-tor-browser/Lib/libQtXml.so.4 +lib/linux-tor-browser/Lib/libcrypto.so.1.0.0 +lib/linux-tor-browser/Lib/libevent-2.0.so.5 +lib/linux-tor-browser/Lib/libpng16.so.16 +lib/linux-tor-browser/Lib/libssl.so.1.0.0 +lib/linux-tor-browser/Lib/libz/.shared-library-name-list +lib/linux-tor-browser/Lib/libz/.shared-library-rename-action-list +lib/linux-tor-browser/Lib/libz/libz.so.1 +lib/linux-tor-browser/Skel/Tor/geoip +lib/linux-tor-browser/Skel/Tor/torrc +lib/linux-tor-browser/Skel/Vidalia/vidalia.conf +lib/linux-tor-browser/Skel/profile/bookmarks.html +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/Changelog +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/LICENSE.txt +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome.manifest +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/about.xul +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/ApplicableList.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/Cookie.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/HTTPS.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/HTTPSRules.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/IOUtil.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/NSS.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/Root-CAs.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/STS.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/Thread.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/X509ChainWhitelist.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code/sha256.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/fetch-source.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/fetch-source.xul +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/meta-preferences.xul +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/observatory-popup.xul +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/observatory-preferences.xul +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/observatory-warning.xul +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/observatory-xul.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/preferences.css +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/preferences.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/preferences.xul +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/rules/00README +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/rules/default.rulesets +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/toolbar_button.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/toolbar_button.xul +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/toolbar_button_binding.xml +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ar/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ar/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ar/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/bg/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/bg/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/bg/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/cs/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/cs/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/cs/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/da/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/da/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/da/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/de/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/de/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/de/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/el/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/el/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/el/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/en/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/en/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/en/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/es/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/es/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/es/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/eu/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/eu/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/eu/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fa/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fa/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fa/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fi/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fi/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fi/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fr/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fr/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fr/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/he/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/he/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/he/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/hr/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/hr/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/hr/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/hu/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/hu/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/hu/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/it/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/it/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/it/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ja/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ja/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ja/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ko/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ko/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ko/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/lt/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/lt/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/lt/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/lv/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/lv/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/lv/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ms/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ms/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ms/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/nb/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/nb/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/nb/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/nl/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/nl/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/nl/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/pl/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/pl/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/pl/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/pt/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/pt/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/pt/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ru/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ru/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ru/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/si/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/si/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/si/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sk/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sk/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sk/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sl/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sl/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sl/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sv/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sv/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sv/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/tr/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/tr/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/tr/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh-CN/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh-CN/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh-CN/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh-TW/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh-TW/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh-TW/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh_TW/https-everywhere.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh_TW/https-everywhere.properties +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh_TW/ssl-observatory.dtd +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/cross.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/https-everywhere-16-gray.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/https-everywhere-16.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/https-everywhere-24-gray.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/https-everywhere-24.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/https-everywhere-half-24.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/https-everywhere.css +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/https-everywhere.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/loop.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/ssl-observatory-messy.jpg +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/tick-moot.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin/tick.png +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/components/https-everywhere.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/components/ssl-observatory.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/defaults/preferences/preferences.js +lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/install.rdf +lib/linux-tor-browser/Skel/profile/extensions/torbutton@torproject.org.xpi +lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/GPL.txt +lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/NoScript_License.txt +lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/chrome.manifest +lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/chrome/noscript.jar +lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/components/noscriptService.js +lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/defaults/preferences/noscript.js +lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/install.rdf +lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/mozilla.cfg +lib/linux-tor-browser/Skel/profile/preferences/extension-overrides.js +lib/linux-tor-browser/Skel/profiles.ini +lib/linux-tor-browser/start-tor-browser +@dirrm lib/linux-tor-browser/Skel/profile/preferences +@dirrm lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/defaults/preferences +@dirrm lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/defaults +@dirrm lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/components +@dirrm lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/chrome +@dirrm lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232} +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/defaults/preferences +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/defaults +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/components +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/skin +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh_TW +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh-TW +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/zh-CN +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/tr +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sv +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sl +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/sk +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/si +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ru +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/pt +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/pl +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/nl +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/nb +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ms +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/lv +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/lt +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ko +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ja +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/it +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/hu +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/hr +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/he +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fr +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fi +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/fa +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/eu +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/es +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/en +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/el +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/de +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/da +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/cs +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/bg +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale/ar +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/locale +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/rules +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content/code +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome/content +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/chrome +@dirrm lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org +@dirrm lib/linux-tor-browser/Skel/profile/extensions +@dirrm lib/linux-tor-browser/Skel/profile +@dirrm lib/linux-tor-browser/Skel/Vidalia +@dirrm lib/linux-tor-browser/Skel/Tor +@dirrm lib/linux-tor-browser/Skel +@dirrm lib/linux-tor-browser/Lib/libz +@dirrm lib/linux-tor-browser/Lib +@dirrm lib/linux-tor-browser/Docs/Vidalia +@dirrm lib/linux-tor-browser/Docs/Tor +@dirrm lib/linux-tor-browser/Docs/Qt +@dirrm lib/linux-tor-browser/Docs +@dirrm lib/linux-tor-browser/App/Firefox/webapprt/components +@dirrm lib/linux-tor-browser/App/Firefox/webapprt +@dirrm lib/linux-tor-browser/App/Firefox/searchplugins +@dirrm lib/linux-tor-browser/App/Firefox/modules/sessionstore +@dirrm lib/linux-tor-browser/App/Firefox/modules/services-sync/engines +@dirrm lib/linux-tor-browser/App/Firefox/modules/services-sync +@dirrm lib/linux-tor-browser/App/Firefox/modules/services-notifications +@dirrm lib/linux-tor-browser/App/Firefox/modules/services-crypto +@dirrm lib/linux-tor-browser/App/Firefox/modules/services-common +@dirrm lib/linux-tor-browser/App/Firefox/modules/services-aitc +@dirrm lib/linux-tor-browser/App/Firefox/modules +@dirrm lib/linux-tor-browser/App/Firefox/icons +@dirrm lib/linux-tor-browser/App/Firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +@dirrm lib/linux-tor-browser/App/Firefox/extensions +@dirrm lib/linux-tor-browser/App/Firefox/dictionaries +@dirrm lib/linux-tor-browser/App/Firefox/defaults/profile/preferences +@dirrm lib/linux-tor-browser/App/Firefox/defaults/profile +@dirrm lib/linux-tor-browser/App/Firefox/defaults/preferences +@dirrm lib/linux-tor-browser/App/Firefox/defaults/pref +@dirrm lib/linux-tor-browser/App/Firefox/defaults +@dirrm lib/linux-tor-browser/App/Firefox/components +@dirrm lib/linux-tor-browser/App/Firefox +@dirrm lib/linux-tor-browser/App +@dirrm lib/linux-tor-browser/.mozilla/firefox +@dirrm lib/linux-tor-browser/.mozilla +@dirrm lib/linux-tor-browser From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 14 09:12:52 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 150B8827; Thu, 14 Nov 2013 09:12:52 +0000 (UTC) Received: from lena.kiev.ua (lena.kiev.ua [82.146.52.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D97C62950; Thu, 14 Nov 2013 09:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lena.kiev.ua; s=3; h=Content-Type:Mime-Version:Message-ID:Subject:To:From:Date; bh=9/9SFNnReWdC4OsmL5EsRdeZHOUPnopRozVBRWg9j8s=; b=Z0uNFX5yyNS/9EmTZsgLzPH12Rjm31PyH05XqXjPaeUiSs2UstE+O8BHC6VXDvqetcabLjiqcSUpSGsfhQP7Vj96t6MUKW6gXUZtbvnOW49ry7meNnrMBbVerO5TotT66bpvexJ+vnXeyZevleGtNA5DvZnvkbBsq4g7hYyy3zc=; Received: from ip-384c.rusanovka-net.kiev.ua ([94.244.56.76] helo=bedside.lena.kiev.ua) by lena.kiev.ua with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1Vgsyn-000Bxj-Tb; Thu, 14 Nov 2013 11:12:50 +0200 Received: from bedside.lena.kiev.ua (localhost.lena.kiev.ua [127.0.0.1]) by bedside.lena.kiev.ua (8.14.7/8.14.7) with ESMTP id rAE9CaFL016998; Thu, 14 Nov 2013 11:12:36 +0200 (EET) (envelope-from Lena@lena.kiev.ua) Received: (from lena@localhost) by bedside.lena.kiev.ua (8.14.7/8.14.7/Submit) id rAE9CaOL016997; Thu, 14 Nov 2013 11:12:36 +0200 (EET) (envelope-from Lena@lena.kiev.ua) Date: Thu, 14 Nov 2013 11:12:36 +0200 From: Lena@lena.kiev.ua To: freebsd-gecko@freebsd.org, bapt@freebsd.org, eadler@freebsd.org Subject: Firefox hangs after r333650 (stagify linux-f10-flashplugin11) Message-ID: <20131114091236.GA787@lena.kiev> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 09:12:52 -0000 8.4-RELEASE-p4 i386, ports tree and all ports freshly updated. www/firefox hangs on (perhaps any) webpage with Flash. Debug: using svn, I downgraded the directory /usr/ports/www/linux-mplayer-plugin to r327776 (in order to de-delete Makefile.npapi used previously by linux-f10-flashplugin11/Makefile), downgraded www/linux-f10-flashplugin11 to r331411, `portupgrade -f www/linux-f10-flashplugin11`, restarted Firefox - Flash works OK, for example http://www.adobe.com/software/flash/about/ Then I updated www/linux-f10-flashplugin11 to the next revision r333650 ("Stagify linux-f10-flashplayer. This makes all my ports STAGEDIR safe!"), `portupgrade -f www/linux-f10-flashplugin11`, restarted Firefox, then I go to a webpage with Flash - Firefox hangs for 90 sec or longer (waits for something - doesn't eat CPU), then a "Warning: Unresponsive script" pop-up may appear. Flash doesn't play. Then I downgrade www/linux-f10-flashplugin11 back to r331411, `portupgrade -f www/linux-f10-flashplugin11` - Flash now works even without Firefox restart. May be, after stagifying the new packing list lacks some file? From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 14 10:24:16 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 90A3A785 for ; Thu, 14 Nov 2013 10:24:16 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 259032DB4 for ; Thu, 14 Nov 2013 10:24:15 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAEAODqB079019 for ; Thu, 14 Nov 2013 10:24:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAEAO8qE078457 for freebsd-gecko@freebsd.org; Thu, 14 Nov 2013 10:24:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 14 Nov 2013 10:24:08 GMT Message-Id: <201311141024.rAEAO8qE078457@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 Subject: [SVN-Commit] r1381 - in trunk: Mk/Uses www/firefox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 10:24:16 -0000 Author: jbeich Date: Thu Nov 14 10:24:08 2013 New Revision: 1381 Log: chase rename and sync Makefile.webplugins Added: trunk/Mk/Uses/ trunk/Mk/Uses/webplugin.mk Deleted: trunk/www/firefox/Makefile.webplugins Added: trunk/Mk/Uses/webplugin.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/Mk/Uses/webplugin.mk Thu Nov 14 10:24:08 2013 (r1381) @@ -0,0 +1,186 @@ +# $FreeBSD: head/Mk/Uses/webplugin.mk 333595 2013-11-12 18:01:39Z bapt $ +# +# MAINTAINER= gecko@FreeBSD.org +# +# Documentation and examples: +# +# Feature: webplugin +# Usage: USES=webplugin or USES=webplugin:ARGS +# Valid ARGS: gecko: Support geko based plugings +# native: Support gecko, opera, webkit-gtk* +# linux: Support linux plugins +# [list of indivudual engines]: specify browsers to use +# all: All browser (implicit, default) +# +# USES=webplugin will create symlinks automatically for each supported +# application that supports the webplugin framework. Also, it will remove +# these symlinks when the plug-in port is uninstalled. +# +# WEBPLUGIN_NAME - If your port installs files in ${WEBPLUGIN_DIR}, +# then you can tweak WEBPLUGIN_NAME to change the +# name of the directory +# (lib/browser_plugins/symlinks/WEBPLUGIN_NAME). +# Default: WEBPLUGIN_NAME=${PKGBASE} +# +# WEBPLUGIN_FILES - The plug-in files that are going to be linked +# in lib/browser_plugins/symlinks/*/. It cannot +# be empty or the port will set IGNORE. +# +# WEBPLUGIN_DIR - The directory where the plug-in file(s) can be +# found. Each plug-in file in WEBPLUGIN_FILES +# must be found in WEBPLUGIN_DIR. If your port +# does not install in WEBPLUGIN_DIR, but in its own +# path, you will need to specify that here or +# symlinks will be created to non-existent files. +# Default: WEBPLUGIN_DIR=${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME} +# +# Makefile: +# ------------------------------------------------------ +# USES= webplugin:gecko +# [...] +# WEBPLUGIN_FILES=fooplugin.so fooplugin.xpi +# +# post-install: +# ${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} +# ${INSTALL_DATA} ${WEBPLUGIN_FILES:S,^,${WRKSRC}/plugins/,} \ +# ${STAGEDIR}${WEBPLUGIN_DIR} +# +# .include +# ------------------------------------------------------ +# +# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks +# in pkg-plist, because they will be removed automatically. +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# %%WEBPLUGIN_DIR%%/fooplugin.so +# %%WEBPLUGIN_DIR%%/fooplugin.xpi +# @dirrmtry %%WEBPLUGIN_DIR%% +# ------------------------------------------------------ +# +# Here is what it will look like when it creates the symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi +# ------------------------------------------------------ +# +# If your port uses libtool, and installs any *.a and *.la files, do not add +# these files to WEBPLUGIN_FILES. WEBPLUGIN_FILES should be *.so or/and +# *.xpi ONLY. +# +# Example to add in Makefile and pkg-plist if your port installs plug-ins in +# its own directory, and you need to set WEBPLUGIN_DIR. +# +# Makefile: +# ------------------------------------------------------ +# [...] +# USES= webplugin:gecko +# WEBPLUGIN_DIR=${PREFIX}/lib/application +# WEBPLUGIN_FILES=fooplugin.so fooplugin.xpi +# +# [...] +# +# .include +# ------------------------------------------------------ +# +# As for the pkg-plist, it should only include the actual files your +# port installs: +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# lib/application/fooplugin.a +# lib/application/fooplugin.la +# lib/application/fooplugin.so +# lib/application/fooplugin.xpi +# @dirrm lib/application +# ------------------------------------------------------ +# +# Here is what it will look like when it creates symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi +# ------------------------------------------------------ + +.if !defined(_INCLUDE_USES_WEBPLUGIN_MK) +_INCLUDE_USES_WEBPLUGIN_MK= yes + +WEBPLUGIN_NAME?= ${PKGBASE} +_WEBPLUGIN_APPS_ALL_LINUX= linux-firefox linux-opera linux-opera-devel \ + linux-seamonkey +_WEBPLUGIN_APPS_ALL_NATIVE= gecko opera opera-devel webkit-gtk2 +_WEBPLUGIN_APPS_ALL= ${_WEBPLUGIN_APPS_ALL_LINUX} \ + ${_WEBPLUGIN_APPS_ALL_NATIVE} + +webplugin_ARGS?= all +_WEBPLUGIN_ARGS= ${webplugin_ARGS:C/,/ /} +_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL} +.if ${_WEBPLUGIN_ARGS} == all +_WEBPLUGIN_PATTERN= * +.elif ${_WEBPLUGIN_ARGS} == native +_WEBPLUGIN_PATTERN= * +_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_NATIVE} +.elif ${_WEBPLUGIN_ARGS} == linux +_WEBPLUGIN_PATTERN= * +_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_LINUX} +.else +_WEBPLUGIN_PATTERN= ${_WEBPLUGIN_ARGS} +.endif + +.if !defined(WEBPLUGIN_FILES) +IGNORE= Cannot be installed: WEBPLUGIN_FILES is empty. Please, add plug-in files to it +.endif + +.for _TEMP_APP__ in ${_WEBPLUGIN_APPS_ALL} +_TEMP_APP_=${_TEMP_APP__} +_TEMP_FLAG_=0 +. for _TEMP_USE__ in ${USE_webplugin} +_TEMP_USE_=${_TEMP_USE__} +. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ + ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ + ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) +_TEMP_FLAG_=1 +. endif +. endfor +. if ${_TEMP_FLAG_} +USE_WEBPLUGIN_EXP+= ${_TEMP_APP__} +. endif +.endfor + +.for p in ${_WEBPLUGIN_PATTERN} +_WEBPLUGIN_MATCHED+= ${_WEBPLUGIN_TEST:M${p}} +.endfor + +_WEBPLUGIN_LIBDIR= ${LOCALBASE}/lib/browser_plugins +_WEBPLUGIN_SLDIR= ${_WEBPLUGIN_LIBDIR}/symlinks + +_WEBPLUGIN_SLDIRS= ${_WEBPLUGIN_MATCHED:S.^.${_WEBPLUGIN_SLDIR}/.} + +_WEBPLUGIN_APPS= ${USE_WEBPLUGIN_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} +_WEBPLUGIN_LINKFARMS= ${_WEBPLUGIN_APPS} ${_WEBPLUGIN_SLDIRS} + +WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME} + +PLIST_SUB+= WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}" + +_LNWF= ${WEBPLUGIN_FILES:S,^,${WEBPLUGIN_DIR}/,} + +webplugin-post-install: + @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} +.for d in ${_WEBPLUGIN_LINKFARMS} + ${INSTALL} -d ${STAGEDIR}${d} +.for l in ${_LNWF} + ${LN} -sf ${l} ${STAGEDIR}${d}/ + @${ECHO_CMD} "${d:S,^${LOCALBASE}/,,}/${l:T}" >> ${TMPPLIST} +.endfor + @${ECHO_CMD} "@unexec rmdir ${d:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} +.endfor + @${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_SLDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST} + +post-install: webplugin-post-install + +.endif Deleted: trunk/www/firefox/Makefile.webplugins ============================================================================== --- trunk/www/firefox/Makefile.webplugins Thu Nov 14 10:24:08 2013 (r1380) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,222 +0,0 @@ -# Created by: Andrew Pantyukhin -# $FreeBSD: head/www/firefox/Makefile.webplugins 310207 2013-01-10 22:29:23Z flo $ - -# MAINTAINER= gecko@FreeBSD.org -# -# Documentation and examples: -# -# Makefile.webplugins will create symlinks automatically for each supported -# application that supports the webplugins framework. Also, it will remove -# these symlinks when the plug-in port is uninstalled. -# -# USE_WEBPLUGINS - Specify a list of applications that this plug-in -# port supports. For each of these applications, a -# symlink will be created in -# lib/browser_plugins/symlinks. See -# WEBPLUGINS_APPS_ALL_* below for the list of -# supported applications. -# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all -# applications) -# -# WEBPLUGINS_NAME - If your port installs files in ${WEBPLUGINS_DIR}, -# then you can tweak WEBPLUGINS_NAME to change the -# name of the directory -# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). -# Default: WEBPLUGINS_NAME=${PKGBASE} -# -# WEBPLUGINS_FILES - The plug-in files that are going to be linked -# in lib/browser_plugins/symlinks/*/. It cannot -# be empty or the port will set IGNORE. -# -# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be -# found. Each plug-in file in WEBPLUGINS_FILES -# must be found in WEBPLUGINS_DIR. If your port -# does not install in WEBPLUGINS_DIR, but in its own -# path, you will need to specify that here or -# symlinks will be created to non-existent files. -# Default: WEBPLUGINS_DIR=${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} -# -# -# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any -# of the following: -# -# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) -# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) -# USE_WEBPLUGINS=linux (Supports linux-*) -# USE_WEBPLUGINS=opera webkit-gtk2 -# -# Example to add in Makefile and pkg-plist if the plug-in files are installled -# to WEBPLUGINS_DIR, and if your port does this manually: -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# post-install: -# ${MKDIR} ${WEBPLUGINS_DIR} -# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ -# ${WEBPLUGINS_DIR} -# -# .include -# ------------------------------------------------------ -# -# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks -# in pkg-plist, because they will be removed automatically. -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# %%WEBPLUGINS_DIR%%/fooplugin.so -# %%WEBPLUGINS_DIR%%/fooplugin.xpi -# @dirrmtry %%WEBPLUGINS_DIR%% -# ------------------------------------------------------ -# -# Here is what it will look like when it creates the symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# ------------------------------------------------------ -# -# If your port uses libtool, and installs any *.a and *.la files, do not add -# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and -# *.xpi ONLY. -# -# Example to add in Makefile and pkg-plist if your port installs plug-ins in -# its own directory, and you need to set WEBPLUGINS_DIR. -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_DIR=${PREFIX}/lib/application -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# [...] -# -# .include -# ------------------------------------------------------ -# -# As for the pkg-plist, it should only include the actual files your -# port installs: -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# lib/application/fooplugin.a -# lib/application/fooplugin.la -# lib/application/fooplugin.so -# lib/application/fooplugin.xpi -# @dirrm lib/application -# ------------------------------------------------------ -# -# Here is what it will look like when it creates symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# ------------------------------------------------------ - -WEBPLUGINS_NAME?= ${PKGBASE} -WEBPLUGINS_FILES?= empty -WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ - linux-flock-devel linux-mozilla \ - linux-nvu linux-opera linux-opera-devel \ - linux-seamonkey linux-seamonkey-devel \ - linux-sunbird linux-sunbird-devel -WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 -WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ - ${WEBPLUGINS_APPS_ALL_NATIVE} - -.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ - ${USE_WEBPLUGINS} == "*" -USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} -.endif - -.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ - ${WEBPLUGINS_FILES} == "" -IGNORE= can't be installed: WEBPLUGINS_FILES is empty. Please, add plug-in files to it and check www/firefox/Makefile.webplugins for documentation -.endif - -.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} -_TEMP_APP_=${_TEMP_APP__} -_TEMP_FLAG_=0 -. for _TEMP_USE__ in ${USE_WEBPLUGINS} -_TEMP_USE_=${_TEMP_USE__} -. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ - ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ - ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) -_TEMP_FLAG_=1 -. endif -. endfor -. if ${_TEMP_FLAG_} -USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} -. endif -.endfor - -WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} -WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} -WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} - -WEBPLUGINS_LIBDIR= ${LOCALBASE}/lib/browser_plugins -WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks -WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} - -PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" - -_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} -_Q= 2>/dev/null || true -_WLD= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE},%D,} -_WLF= ${WEBPLUGINS_LINKFARMS:S,${LOCALBASE},%D,} -_WSD= ${WEBPLUGINS_SLDIR:S,^${LOCALBASE},%D,} - -webplugins-post-install: - @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - else \ - for _f in ${WEBPLUGINS_FILES}; do \ - if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - fi; \ - done; \ - fi; \ - for _d in ${WEBPLUGINS_LINKFARMS}; do \ - ${INSTALL} -d $${_d}; \ - for _l in ${_LNWF}; do \ - ${LN} -sf $${_l} $${_d}/ ${_Q}; \ - done; \ - done; \ - if [ "${PREFIX}" != "${LOCALBASE}" ]; then \ - ${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST}; \ - fi; \ - ${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}; \ - for _d in ${_WLF}; do \ - ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ - for _l in ${_LNWF}; do \ - ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ - done; \ - for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ - ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ - done; \ - ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} - -post-install: webplugins-post-install From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 14 10:24:26 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2E0179D for ; Thu, 14 Nov 2013 10:24:25 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A7B92DB6 for ; Thu, 14 Nov 2013 10:24:25 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAEAON4e082141 for ; Thu, 14 Nov 2013 10:24:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAEAOINf079820 for freebsd-gecko@freebsd.org; Thu, 14 Nov 2013 10:24:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 14 Nov 2013 10:24:18 GMT Message-Id: <201311141024.rAEAOINf079820@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 Subject: [SVN-Commit] r1382 - in trunk: mail/linux-thunderbird mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/linux-firefox www/linux-seamonkey www/linux-tor-browser www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 10:24:26 -0000 Author: jbeich Date: Thu Nov 14 10:24:18 2013 New Revision: 1382 Log: fixup bitrot Modified: trunk/mail/linux-thunderbird/pkg-plist trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp trunk/www/libxul/files/patch-build_unix_run-mozilla.sh trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp trunk/www/linux-firefox/pkg-plist trunk/www/linux-seamonkey/Makefile.common trunk/www/linux-seamonkey/pkg-plist trunk/www/linux-tor-browser/Makefile trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Modified: trunk/mail/linux-thunderbird/pkg-plist ============================================================================== --- trunk/mail/linux-thunderbird/pkg-plist Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/mail/linux-thunderbird/pkg-plist Thu Nov 14 10:24:18 2013 (r1382) @@ -71,7 +71,7 @@ lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true +@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true Modified: trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/thunderbird", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/thunderbird", 0); nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) { Output("Couldn't calculate the application directory.\n"); Modified: trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/libxul/files/patch-build_unix_run-mozilla.sh ============================================================================== --- trunk/www/libxul/files/patch-build_unix_run-mozilla.sh Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/libxul/files/patch-build_unix_run-mozilla.sh Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ export MOZILLA_FIVE_HOME LD_LIBRARY_PATH export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox ++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox +export MOZ_PLUGIN_PATH + if [ $moz_debug -eq 1 ] Modified: trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp ============================================================================== --- trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -4,7 +4,7 @@ char greDir[MAXPATHLEN]; bool greFound = false; -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/xulrunner", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/xulrunner", 0); + #if defined(XP_MACOSX) CFBundleRef appBundle = CFBundleGetMainBundle(); Modified: trunk/www/linux-firefox/pkg-plist ============================================================================== --- trunk/www/linux-firefox/pkg-plist Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/linux-firefox/pkg-plist Thu Nov 14 10:24:18 2013 (r1382) @@ -68,7 +68,7 @@ lib/%%APP_NAME%%/webapprt-stub lib/%%APP_NAME%%/webapprt/omni.ja lib/%%APP_NAME%%/webapprt/webapprt.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/plugins/ 2>/dev/null || true +@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/extensions/ -depth 1 -type l -delete 2>/dev/null || true Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/linux-seamonkey/Makefile.common Thu Nov 14 10:24:18 2013 (r1382) @@ -73,7 +73,7 @@ @${CP} -pR ${WRKSRC}/ ${FDIR}/ @${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/ @${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME} - @${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \ + @${CP} -R ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME}/ \ ${FDIR}/${APP_SUBDIR}plugins/ ${_Q} @${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \ ${FDIR}/${APP_SUBDIR}extensions/ ${_Q} @@ -105,7 +105,7 @@ ${ECHO_CMD} share/applications/%%APP_NAME%%.desktop >> ${PLIST} cd ${WRKSRC} && ${FIND} -s . -type f -or -type l | \ ${SED} -e "s#^\.#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST} - ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ \ + ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ \ %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ ${_Q}' >> ${PLIST} ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \ %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ ${_Q}' >> ${PLIST} Modified: trunk/www/linux-seamonkey/pkg-plist ============================================================================== --- trunk/www/linux-seamonkey/pkg-plist Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/linux-seamonkey/pkg-plist Thu Nov 14 10:24:18 2013 (r1382) @@ -119,7 +119,7 @@ lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true +@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true Modified: trunk/www/linux-tor-browser/Makefile ============================================================================== --- trunk/www/linux-tor-browser/Makefile Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/linux-tor-browser/Makefile Thu Nov 14 10:24:18 2013 (r1382) @@ -85,7 +85,7 @@ @${MV} ${WRKSRC}/Data ${WRKSRC}/Skel @${LN} -sf ${DATADIR} ${WRKSRC}/Data - @${LN} -sf ${LOCALBASE}/lib/npapi/symlinks/linux-firefox \ + @${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/linux-firefox \ ${WRKSRC}/App/Firefox/plugins @${MKDIR} ${WRKSRC}/App/Firefox/defaults/preferences Modified: trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Thu Nov 14 10:24:08 2013 (r1381) +++ trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Thu Nov 14 10:24:18 2013 (r1382) @@ -5,7 +5,7 @@ TriggerQuirks(); #endif + -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/seamonkey", 0); nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) { From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 14 10:34:44 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2C026B30 for ; Thu, 14 Nov 2013 10:34:44 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AB84D2E57 for ; Thu, 14 Nov 2013 10:34:43 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAEAYfYd009051 for ; Thu, 14 Nov 2013 10:34:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAEAYavd007185 for freebsd-gecko@freebsd.org; Thu, 14 Nov 2013 10:34:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 14 Nov 2013 10:34:36 GMT Message-Id: <201311141034.rAEAYavd007185@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 Subject: [SVN-Commit] r1383 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 10:34:44 -0000 Author: jbeich Date: Thu Nov 14 10:34:36 2013 New Revision: 1383 Log: app-specific directories for native plugins existed only with Makefile.npapi Modified: trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Modified: trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Thu Nov 14 10:24:18 2013 (r1382) +++ trunk/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp Thu Nov 14 10:34:36 2013 (r1383) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/thunderbird", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) { Output("Couldn't calculate the application directory.\n"); Modified: trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) +++ trunk/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:34:36 2013 (r1383) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) +++ trunk/www/firefox-nightly/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:34:36 2013 (r1383) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp ============================================================================== --- trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:24:18 2013 (r1382) +++ trunk/www/firefox/files/patch-browser-app-nsBrowserApp.cpp Thu Nov 14 10:34:36 2013 (r1383) @@ -4,7 +4,7 @@ TriggerQuirks(); #endif -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/firefox", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); int gotCounters; #if defined(XP_UNIX) struct rusage initialRUsage; Modified: trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp ============================================================================== --- trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Thu Nov 14 10:24:18 2013 (r1382) +++ trunk/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp Thu Nov 14 10:34:36 2013 (r1383) @@ -4,7 +4,7 @@ char greDir[MAXPATHLEN]; bool greFound = false; -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/xulrunner", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); + #if defined(XP_MACOSX) CFBundleRef appBundle = CFBundleGetMainBundle(); Modified: trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Thu Nov 14 10:24:18 2013 (r1382) +++ trunk/www/seamonkey/files/patch-suite-app-nsSuiteApp.cpp Thu Nov 14 10:34:36 2013 (r1383) @@ -5,7 +5,7 @@ TriggerQuirks(); #endif + -+ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko:%%LOCALBASE%%/lib/browser_plugins/symlinks/seamonkey", 0); ++ setenv("MOZ_PLUGIN_PATH", "%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko", 0); nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); if (NS_FAILED(rv)) { From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 14 12:35:55 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2586E7F9; Thu, 14 Nov 2013 12:35:55 +0000 (UTC) Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:4f8:162:1142::2]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DC9FD2774; Thu, 14 Nov 2013 12:35:54 +0000 (UTC) Received: from cpos1.nexxtmobile.de (localhost [127.0.0.1]) by mail.solomo.de (Postfix) with ESMTP id 8BC592E9C; Thu, 14 Nov 2013 13:35:52 +0100 (CET) X-Virus-Scanned: amavisd-new at nexxtmobile.de Received: from mail.solomo.de ([127.0.0.1]) by cpos1.nexxtmobile.de (cpos1.nexxtmobile.de [127.0.0.1]) (amavisd-new, port 10024) with LMTP id fZ-xsoPhkTou; Thu, 14 Nov 2013 13:35:50 +0100 (CET) Received: from zoidberg.smeets.im (zoidberg.smeets.im [IPv6:2a01:238:42f9:3600:926e:e77c:f0f2:d8fc]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.solomo.de (Postfix) with ESMTPS id 134D62E8E; Thu, 14 Nov 2013 13:35:50 +0100 (CET) Received: by zoidberg.smeets.im (Postfix, from userid 1001) id C8BCA134B9; Thu, 14 Nov 2013 13:35:49 +0100 (CET) Date: Thu, 14 Nov 2013 13:35:49 +0100 From: Florian Smeets To: gecko@freebsd.org Subject: Mk/bsd.gecko.mk -> Mk/Uses/gecko.mk Message-ID: <20131114123549.GD85510@zoidberg.smeets.im> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="m51xatjYGsM+13rf" Content-Disposition: inline User-Agent: Mutt/1.5.22 (2013-10-16) Cc: bapt@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 12:35:55 -0000 --m51xatjYGsM+13rf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, bapt rewrote bsd.gecko.mk. I haven't committed it to gecko svn yet, because I'll be offline for 3 weeks soon. Uses: http://people.freebsd.org/~bapt/gecko.mk.diff Converted firefox: http://people.freebsd.org/~bapt/firefoxng.diff Sample usage of USES= gecko http://people.freebsd.org/~bapt/geckong.diff Florian --m51xatjYGsM+13rf Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iQJ8BAEBCgBmBQJShMOkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNzAxMDMyMDNCQ0FCNDRBOThGRUM4NDRF NzA1M0RGOUZGODZGMDc2AAoJEOcFPfn/hvB26a8P/ixIZjKtIKYUF7jml0aEd7X1 QbEa6YtA2sGqyMsDsq880M8oQuMciNb7UPFuBeSPEHUyeXkudyNlgr6J+H5yp11e 7Pen1mprWLxshqHuCK7U5+ShKK/Xc7jtNMkI8Fa+q2OIowUQNkXMiBB1Mww8ioPX cORKUZkNl4UktOkf79K4JifOJB1DJStbtL35a9gdgZAoVdK9E8Wvlc3vLo729MOK uWJPt6wFFWqmmWmCuXcwyoC1Yt7iiopl3CbKfhA9vkWX6JTvIU3euBiK5s/Ey59/ Rj8+jf82/d7HKS24M8DYNXpJCW4YVZHRKtHtVdBw6XiwnyrPwrzJyaQq1lh0oOed oC53VwtzZrYPD+sPU0xt8YDLQmpSMu6rT1tRtFzuVuZl9wAPgfbMaocKIe4s50Ii GcT6Dyh8WnGHZfhZJAPtOQ82R6OEwh/S8Hgq6VeA/JWCXcmsgeNbqadvxjXlgU0U 9Xh39p036ACkqdUEdJj7bxl737fMbE3uIs0AhdGkRAjMRxjTnMxvKEegL5tGX4I6 d8Rg0DQBBXSpjWw2Cup0RhkjiPvrC62n8YF4c5cKNXpw65RRq9cXcyp7f8bXTryw s3DJ/VhVJUtixOLswibJTtiJr2sTTjCgcBC2p2HSxIBNoF0aCBRuQPwq58ZTAP9P LF+900Gho9wwsDWUZqHJ =FWuq -----END PGP SIGNATURE----- --m51xatjYGsM+13rf-- From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 14 19:13:27 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 724E9E1A for ; Thu, 14 Nov 2013 19:13:27 +0000 (UTC) Received: from mail-pa0-x244.google.com (mail-pa0-x244.google.com [IPv6:2607:f8b0:400e:c03::244]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 511E6267A for ; Thu, 14 Nov 2013 19:13:27 +0000 (UTC) Received: by mail-pa0-f68.google.com with SMTP id kx10so459553pab.7 for ; Thu, 14 Nov 2013 11:13:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:from:to:reply-to:subject:date; bh=b/Cn7yK28bd6p/x3Sa562gJonOfBrm6PnC+/NheJ3ec=; b=cKEhIaSTjRq604XQCFmnEPnibTFmrpgCdmU1hh0jJHoCkJELPaveVKCwSVepnf/AaI naj6H56/yFtljbFI8rHip5TFK9S9gYUhE5YACIc/6X3fwu4Rs6I/ltIdHdiGvF86HxLZ ItxlUlJPjh6QaTHOOdkozJ2OZswdAbeaLffvxVO3NCcnObsRXU9OwY+2A07E87x9nNfb j0O5JQK1v7XaCbL7yWMhLjSVzQ5hDbEWKhZlQn7RvM//dNbuRbbuXnayfhTWJROJxiGS u4eiN0uBWpCOU8eOcYXSU2WmuXww1Twzgzwc3ql8X/1cusUYHpdJ2Hv7qWw93u/gwB52 /nMA== X-Received: by 10.66.6.40 with SMTP id x8mr2834564pax.97.1384456406989; Thu, 14 Nov 2013 11:13:26 -0800 (PST) Received: from localhost.localdomain ([124.253.29.188]) by mx.google.com with ESMTPSA id at4sm53227555pbc.30.2013.11.14.11.13.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Nov 2013 11:13:26 -0800 (PST) Message-ID: <528520d6.64ab440a.4e8d.0b56@mx.google.com> From: inhabiting22741@gmail.com To: freebsd-gecko@freebsd.org Subject: Re: Guaranteed Top 10 Google Placements mail-archive.com In 100 Days Date: Fri, 15 Nov 2013 00:43:29 +0530 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: DIANA68371@gmail.com List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 19:13:27 -0000 Hello Sir / Mam, We would like to have a chance to work on your website and get it positioned top 10 on major search engines around the world ( Google & Bing ). We are presently working with 500+ clients world wide and we have made sure all our clients rank top 10 for their best keywords. None of our clients have been caught in any of the recent google updates. We only use ethical white hat methods to deliver rankings. Our search engine packages include both onsite & off optimization, we provide complete SEO solution to our clients and not just link building packages. We understand there are many SEO Scam companies mailing you each day over and over again and I am also sure you have been robbed off a few times in past with no results at all. To make sure you we show you our WORTH, we have launched 15 DAY FREE SEO TRIAL service. We want to build your faith in our service and make sure you see results before paying for our service. Is 15 days Enough time to deliver results ? 15 days is good enough a time to show you huge movements in rankings for all your keywords. We start with A) choosing the best keywords for your website, B) Approve a final list of keywords, C) Make onsite changes D) Build links for your website. If in these 15 days you are not happy with our performance, you can cancel or decide to opt-out. You will not be billed a single dime for these 15 days. Post Trial Pricing & Package In the 15 days trial, we only work for 10 keywords so that we can show best possible results in the time span. Once the trial is over you pick one of the packages listed below : Package A ) $99 / month (10 keywords optimized ) Package B ) $149 / month ( 20 keywords optimized ) Package C ) $199 / month ( 30 keywords optimized ) To Sign up for our free trial email us back with the information below so we can send you our sign up link. 1) " Website You Want To Optimize " 2) Keywords ( Optional ) 3) SEO Done Before ( Yes / No ) Looking forward working with you, let us know if you would like to have more information about our company and procedures. Regards Vince G SEO Manager : T.O.B 7 B Green Avenue, Amritsar Punjab ---------------------------------------------------------------------------------------------------------------- Our email above is not intended to waste your time or fill your inbox with spam. If you would not like to hear from us, email us back with NOT INTERESTED. We will never email you again. From owner-freebsd-gecko@FreeBSD.ORG Fri Nov 15 08:36:04 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A590582 for ; Fri, 15 Nov 2013 08:36:04 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C0D952775 for ; Fri, 15 Nov 2013 08:36:03 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAF8Zt3L001098 for ; Fri, 15 Nov 2013 08:35:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAF8Zo1H000325 for freebsd-gecko@freebsd.org; Fri, 15 Nov 2013 08:35:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 15 Nov 2013 08:35:50 GMT Message-Id: <201311150835.rAF8Zo1H000325@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 Subject: [SVN-Commit] r1384 - in trunk: . www/linux-tor-browser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 08:36:04 -0000 Author: jbeich Date: Fri Nov 15 08:35:49 2013 New Revision: 1384 Log: add non-english locales Modified: trunk/Gecko_TODO trunk/www/linux-tor-browser/Makefile trunk/www/linux-tor-browser/distinfo trunk/www/linux-tor-browser/pkg-plist Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Thu Nov 14 10:34:36 2013 (r1383) +++ trunk/Gecko_TODO Fri Nov 15 08:35:49 2013 (r1384) @@ -15,7 +15,6 @@ unassigned (ports): - add BlueGriffon to replace www/kompozer - add native TorBrowserBundle, may need privacy audit of our build glue -- add more languages to www/linux-tor-browser - switch to system libxul (needs slaves with common patches); a Debian patch to reduce configure time can be useful - move duplicated `>=' deps into bsd.gecko.mk (system libxul?) Modified: trunk/www/linux-tor-browser/Makefile ============================================================================== --- trunk/www/linux-tor-browser/Makefile Thu Nov 14 10:34:36 2013 (r1383) +++ trunk/www/linux-tor-browser/Makefile Fri Nov 15 08:35:49 2013 (r1384) @@ -3,7 +3,7 @@ PORTNAME= tor-browser DISTVERSIONPREFIX=gnu-linux-i686- DISTVERSION= 2.3.25-14 -DISTVERSIONSUFFIX=-dev-en-US +DISTVERSIONSUFFIX=-dev-${LOCALE} CATEGORIES= www linux # XXX copied from security/tor, move to bsd.sites.mk MASTER_SITES= https://www.torproject.org/dist/torbrowser/linux/ \ @@ -66,7 +66,7 @@ NO_BUILD= yes SUB_FILES= pkg-message -WRKSRC= ${WRKDIR}/${PORTNAME}${DISTVERSIONSUFFIX:S/-dev-/_/} +WRKSRC= ${WRKDIR}/${PORTNAME}_${LOCALE} DATADIR?= /tmp/${UNIQUENAME} DESKTOP_ENTRIES="Tor Browser Bundle" \ @@ -76,6 +76,29 @@ "Network;WebBrowser;" \ true +ALL_LOCALES= ar de en-US es-ES fa fr it ko nl pl pt-PT ru vi zh-CN +LOCALE= ${${PORT_OPTIONS:MLANG_*}} + +OPTIONS_DEFAULT=LANG_US +OPTIONS_SINGLE= I18N + +.MAKE.FreeBSD_UL= yes +.for l in ${ALL_LOCALES} +OPTIONS_SINGLE_I18N+=LANG_${l:U:C/.*-//} +LANG_${l:U:C/.*-//}= ${l} +. if defined(FETCH_ALL) +DISTFILES+= ${DISTNAME:S/${LOCALE}/${l}/}${EXTRACT_SUFX} +. endif +.endfor + +.include + +.if ${PORT_OPTIONS:MLANG_US} +PLIST_SUB+= I18N="@comment " +.else +PLIST_SUB+= I18N="" LOCALE="${LOCALE}" +.endif + post-extract: @${CHMOD} -R +rX ${WRKSRC} Modified: trunk/www/linux-tor-browser/distinfo ============================================================================== --- trunk/www/linux-tor-browser/distinfo Thu Nov 14 10:34:36 2013 (r1383) +++ trunk/www/linux-tor-browser/distinfo Fri Nov 15 08:35:49 2013 (r1384) @@ -1,2 +1,28 @@ +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-ar.tar.gz) = 35a28605d9966ffac55097531d19ce8921b9a3db96b3bbaf73c40f80ffc92c86 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-ar.tar.gz) = 37010763 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-de.tar.gz) = 7cd0b8fe65bda30b11e38059fae106d9cde4f93e4ec1df73ba65bb16487786f3 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-de.tar.gz) = 36972606 SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-en-US.tar.gz) = de19ddb3a3a7300f30394e6aae622ab5238b4de7217af97293ee4cb01bb6e54a SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-en-US.tar.gz) = 36739654 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-es-ES.tar.gz) = 5c40d475d5adefc1af10d01a1ad25f9db1bd8c566c939364e8fb2056f2f7ece4 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-es-ES.tar.gz) = 36942404 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-fa.tar.gz) = 552e84c995bb5c678f2c0181d796af7f405ee237280449e892a64e1e1694a370 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-fa.tar.gz) = 37018440 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-fr.tar.gz) = 071c8c80417a14eeb1cc34ac7b76b35a059d642b92618d7c75ff1646f90a024f +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-fr.tar.gz) = 36997191 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-it.tar.gz) = f35bfc416a4eba47414c0b0d1bcbaf4cd4e5e61e404fa04ca0795813c1b3e8aa +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-it.tar.gz) = 36934809 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-ko.tar.gz) = a8fbed328be3fee2a366679af9be64af0c59ea097475789f5faeca2ed03af487 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-ko.tar.gz) = 36992698 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-nl.tar.gz) = 1abb6596637c35362e13a8a847e113ccbe470d0462ba4749a28e041e2c8d2806 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-nl.tar.gz) = 36985983 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-pl.tar.gz) = 1bf6b548e96b83204608a80a0a9b7351eaa99a5b7750f62b1002f41b1e38eb75 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-pl.tar.gz) = 37004962 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-pt-PT.tar.gz) = 9e9e7c4548e62bbace946a8c1f9d5d242cd575f0e3591a4075dcfb1f25805c81 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-pt-PT.tar.gz) = 36987990 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-ru.tar.gz) = aaf4a906aa3854ffa61b7d6e17ddab25de3a0f1e6eb503a843f91f56a1b89734 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-ru.tar.gz) = 36988291 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-vi.tar.gz) = 0b5f049aa2d5eb2117017ff0e08f89574def3a4a9ad49c39cc7646b3dc153ffe +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-vi.tar.gz) = 37014371 +SHA256 (tor-browser-gnu-linux-i686-2.3.25-14-dev-zh-CN.tar.gz) = bd98cb770fc19be171dcf4047e16584d6d505a1a3283bbaa474fe9bea0b82f94 +SIZE (tor-browser-gnu-linux-i686-2.3.25-14-dev-zh-CN.tar.gz) = 37004814 Modified: trunk/www/linux-tor-browser/pkg-plist ============================================================================== --- trunk/www/linux-tor-browser/pkg-plist Thu Nov 14 10:34:36 2013 (r1383) +++ trunk/www/linux-tor-browser/pkg-plist Fri Nov 15 08:35:49 2013 (r1384) @@ -247,6 +247,7 @@ lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/components/ssl-observatory.js lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/defaults/preferences/preferences.js lib/linux-tor-browser/Skel/profile/extensions/https-everywhere@eff.org/install.rdf +%%I18N%%lib/linux-tor-browser/Skel/profile/extensions/langpack-%%LOCALE%%@firefox.mozilla.org.xpi lib/linux-tor-browser/Skel/profile/extensions/torbutton@torproject.org.xpi lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/GPL.txt lib/linux-tor-browser/Skel/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}/NoScript_License.txt From owner-freebsd-gecko@FreeBSD.ORG Fri Nov 15 09:44:57 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08AFCC89; Fri, 15 Nov 2013 09:44:57 +0000 (UTC) Received: from mail1.sysgo.com (mail1.sysgo.com [176.9.26.183]) by mx1.freebsd.org (Postfix) with ESMTP id 504AF2BD9; Fri, 15 Nov 2013 09:44:56 +0000 (UTC) Date: Fri, 15 Nov 2013 10:35:37 +0100 From: Thomas Mueller To: Lena@lena.kiev.ua Subject: Re: Firefox hangs after r333650 (stagify linux-f10-flashplugin11) Message-ID: <20131115103537.2a545b3e@tmu.ulm.sysgo.com> In-Reply-To: <20131114091236.GA787@lena.kiev> References: <20131114091236.GA787@lena.kiev> Organization: SYSGO AG X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd9.2) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: bapt@freebsd.org, freebsd-gecko@freebsd.org, eadler@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 09:44:57 -0000 On Thu, 14 Nov 2013 11:12:36 +0200, Lena@lena.kiev.ua wrote: > 8.4-RELEASE-p4 i386, ports tree and all ports freshly updated. > www/firefox hangs on (perhaps any) webpage with Flash. > [...] > Then I updated www/linux-f10-flashplugin11 to the next revision r333650 > ("Stagify linux-f10-flashplayer. This makes all my ports STAGEDIR safe!"), > `portupgrade -f www/linux-f10-flashplugin11`, restarted Firefox, > then I go to a webpage with Flash - Firefox hangs for 90 sec or longer > (waits for something - doesn't eat CPU), > then a "Warning: Unresponsive script" pop-up may appear. > Flash doesn't play. I've seen the same on 9.2-STABLE amd64. > Then I downgrade www/linux-f10-flashplugin11 back to r331411, > `portupgrade -f www/linux-f10-flashplugin11` - Flash now works > even without Firefox restart. > > May be, after stagifying the new packing list lacks some file? Plugin files seem to installed at different location now. Running nspluginwrapper -v -a -i solved the problem for me. -- Thomas Mueller From owner-freebsd-gecko@FreeBSD.ORG Fri Nov 15 14:23:48 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A17A2C8 for ; Fri, 15 Nov 2013 14:23:48 +0000 (UTC) Received: from mail-qc0-x22c.google.com (mail-qc0-x22c.google.com [IPv6:2607:f8b0:400d:c01::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DDA232C13 for ; Fri, 15 Nov 2013 14:23:47 +0000 (UTC) Received: by mail-qc0-f172.google.com with SMTP id q4so1903170qcx.17 for ; Fri, 15 Nov 2013 06:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=N9BFmJ+Ad2X0521M0C7+LDFlD0UfiPWMdq4AI1ioJvA=; b=ru0Nv4PjVLzALRObMh2dS6lbeBiHElZhH669VhkmxYDl5YuWlMYOn6qVooG/c9e8x1 8Z02pNrQe0iC31vHLD+kcSi6VdTB74SOf6DZvR6BNwoInDxTCdvLDCeZpLKlMG0dofSa gZO/haczl+dtpMuDbIdBv1xhaSpqZjnzecp+I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=N9BFmJ+Ad2X0521M0C7+LDFlD0UfiPWMdq4AI1ioJvA=; b=JBXVwX4QHGtOq/bslcMyS9IpZrUogilfGTDazmL3C4CvE2XGX+SfT0vNPvfzE9MF0d zFDz/KbaOHKvNYzXzk9LHuqOuDnvCsib3F5BU/MLUAd70dOgbf0siasGV/a/nxsvE4T7 Nm2S/WNr8jCo2buve0ZTzSQtqdB6QAyOadWctWn5BBJwWZozEXUggGdk55UMAWNbGvwp fjDv7j13QVdycZp0uWm5QLjjhECgFHCEWDF+9a3MvPxnv9ya2XMCRdMd0caqD3b8fD1A 9Q/GTZuNQ9oYICjfM1OymfVgk7fyz9Pko3VFTE8+2LUMeLWi/a6gT1vqTgsTteSuCgPv iEuw== X-Gm-Message-State: ALoCoQlO9xWn+cNGYL8ibzyTXOyrVz6srvbZUAvsMoJuMSCoLutooMLDaljAJVcrpNFvP70XZhcD X-Received: by 10.49.24.161 with SMTP id v1mr10893488qef.75.1384525426893; Fri, 15 Nov 2013 06:23:46 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.96.63.101 with HTTP; Fri, 15 Nov 2013 06:23:16 -0800 (PST) In-Reply-To: <20131115103537.2a545b3e@tmu.ulm.sysgo.com> References: <20131114091236.GA787@lena.kiev> <20131115103537.2a545b3e@tmu.ulm.sysgo.com> From: Eitan Adler Date: Fri, 15 Nov 2013 09:23:16 -0500 X-Google-Sender-Auth: zmcZbEE52GK6IRzwz_A2g7iP2n0 Message-ID: Subject: Re: Firefox hangs after r333650 (stagify linux-f10-flashplugin11) To: Thomas Mueller , Jung-uk Kim Content-Type: text/plain; charset=UTF-8 Cc: Lena@lena.kiev.ua, Baptiste Daroussin , freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 14:23:48 -0000 >> May be, after stagifying the new packing list lacks some file? > > Plugin files seem to installed at different location now. > Running > nspluginwrapper -v -a -i > solved the problem for me. Yes, the plugin moved recently. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-freebsd-gecko@FreeBSD.ORG Fri Nov 15 20:25:39 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3452E780 for ; Fri, 15 Nov 2013 20:25:39 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B1EB62311 for ; Fri, 15 Nov 2013 20:25:38 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAFKPZQk053972 for ; Fri, 15 Nov 2013 20:25: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 rAFKPUIa051871 for freebsd-gecko@freebsd.org; Fri, 15 Nov 2013 20:25:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 15 Nov 2013 20:25:30 GMT Message-Id: <201311152025.rAFKPUIa051871@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 Subject: [SVN-Commit] r1385 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/linux-tor-browser www/linux-tor-browser/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 20:25:39 -0000 Author: jbeich Date: Fri Nov 15 20:25:30 2013 New Revision: 1385 Log: just let alsa convert float samples Unlike the workaround from bug 780531 always using S16 samples, ALSA can convert them to S32 if ARIFF_OSS option is enabled (ports/183861). PR: ports/184006 Deleted: trunk/mail/thunderbird/files/extra-bug780531 trunk/www/firefox-esr/files/extra-bug780531 trunk/www/firefox-nightly/files/extra-bug780531 trunk/www/firefox/files/extra-bug780531 trunk/www/libxul/files/extra-bug780531 trunk/www/linux-tor-browser/files/freebsd.js Modified: trunk/www/linux-tor-browser/Makefile trunk/www/linux-tor-browser/pkg-plist Deleted: trunk/mail/thunderbird/files/extra-bug780531 ============================================================================== --- trunk/mail/thunderbird/files/extra-bug780531 Fri Nov 15 20:25:30 2013 (r1384) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- mozilla/configure.in~ -+++ mozilla/configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code Deleted: trunk/www/firefox-esr/files/extra-bug780531 ============================================================================== --- trunk/www/firefox-esr/files/extra-bug780531 Fri Nov 15 20:25:30 2013 (r1384) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code Deleted: trunk/www/firefox-nightly/files/extra-bug780531 ============================================================================== --- trunk/www/firefox-nightly/files/extra-bug780531 Fri Nov 15 20:25:30 2013 (r1384) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code Deleted: trunk/www/firefox/files/extra-bug780531 ============================================================================== --- trunk/www/firefox/files/extra-bug780531 Fri Nov 15 20:25:30 2013 (r1384) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code Deleted: trunk/www/libxul/files/extra-bug780531 ============================================================================== --- trunk/www/libxul/files/extra-bug780531 Fri Nov 15 20:25:30 2013 (r1384) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,24 +0,0 @@ ---- configure.in~ -+++ configure.in -@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) - - dnl Use integers over floats for audio on B2G and Android, because audio - dnl backends for those platforms don't support floats. --if test "$OS_TARGET" = "Android"; then -+case "$target" in -+*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) --else -+;; -+*) - MOZ_SAMPLE_TYPE_FLOAT32=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) - AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) --fi -+;; -+esac - - dnl ======================================================== - dnl = Disable Speech API code Modified: trunk/www/linux-tor-browser/Makefile ============================================================================== --- trunk/www/linux-tor-browser/Makefile Fri Nov 15 08:35:49 2013 (r1384) +++ trunk/www/linux-tor-browser/Makefile Fri Nov 15 20:25:30 2013 (r1385) @@ -111,10 +111,6 @@ @${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/linux-firefox \ ${WRKSRC}/App/Firefox/plugins - @${MKDIR} ${WRKSRC}/App/Firefox/defaults/preferences - @${CP} ${FILESDIR}/freebsd.js \ - ${WRKSRC}/App/Firefox/defaults/preferences/ - post-patch: @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/start-tor-browser Deleted: trunk/www/linux-tor-browser/files/freebsd.js ============================================================================== --- trunk/www/linux-tor-browser/files/freebsd.js Fri Nov 15 20:25:30 2013 (r1384) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,2 +0,0 @@ -// no AFMT_FLOAT support in kernel (firefox bug 780531) -pref("media.use_cubeb", false); Modified: trunk/www/linux-tor-browser/pkg-plist ============================================================================== --- trunk/www/linux-tor-browser/pkg-plist Fri Nov 15 08:35:49 2013 (r1384) +++ trunk/www/linux-tor-browser/pkg-plist Fri Nov 15 20:25:30 2013 (r1385) @@ -7,7 +7,6 @@ lib/linux-tor-browser/App/Firefox/components/libbrowsercomps.so lib/linux-tor-browser/App/Firefox/components/libdbusservice.so lib/linux-tor-browser/App/Firefox/defaults/pref/channel-prefs.js -lib/linux-tor-browser/App/Firefox/defaults/preferences/freebsd.js lib/linux-tor-browser/App/Firefox/defaults/profile/bookmarks.html lib/linux-tor-browser/App/Firefox/defaults/profile/preferences/extension-overrides.js lib/linux-tor-browser/App/Firefox/dependentlibs.list @@ -338,7 +337,6 @@ @dirrm lib/linux-tor-browser/App/Firefox/dictionaries @dirrm lib/linux-tor-browser/App/Firefox/defaults/profile/preferences @dirrm lib/linux-tor-browser/App/Firefox/defaults/profile -@dirrm lib/linux-tor-browser/App/Firefox/defaults/preferences @dirrm lib/linux-tor-browser/App/Firefox/defaults/pref @dirrm lib/linux-tor-browser/App/Firefox/defaults @dirrm lib/linux-tor-browser/App/Firefox/components From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 16 05:06:53 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3CEFDA59 for ; Sat, 16 Nov 2013 05:06:53 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ACC2D2C7E for ; Sat, 16 Nov 2013 05:06:52 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAG56nw3031215 for ; Sat, 16 Nov 2013 05:06:50 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAG56i7p030716 for freebsd-gecko@freebsd.org; Sat, 16 Nov 2013 05:06:44 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 16 Nov 2013 05:06:44 GMT Message-Id: <201311160506.rAG56i7p030716@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 Subject: [SVN-Commit] r1386 - in trunk/www: linux-firefox linux-seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 05:06:53 -0000 Author: jbeich Date: Sat Nov 16 05:06:44 2013 New Revision: 1386 Log: don't replace libxul.so with linux_base-c6 Modified: trunk/www/linux-firefox/pkg-plist trunk/www/linux-seamonkey/Makefile.common Modified: trunk/www/linux-firefox/pkg-plist ============================================================================== --- trunk/www/linux-firefox/pkg-plist Fri Nov 15 20:25:30 2013 (r1385) +++ trunk/www/linux-firefox/pkg-plist Sat Nov 16 05:06:44 2013 (r1386) @@ -37,8 +37,8 @@ lib/%%APP_NAME%%/icons/updater.png lib/%%APP_NAME%%/libfreebl3.chk lib/%%APP_NAME%%/libfreebl3.so -lib/%%APP_NAME%%/libldap60.so -lib/%%APP_NAME%%/libldif60.so +%%REPLACE_GRE%%lib/%%APP_NAME%%/libldap60.so +%%REPLACE_GRE%%lib/%%APP_NAME%%/libldif60.so lib/%%APP_NAME%%/libmozalloc.so lib/%%APP_NAME%%/libmozsqlite3.so lib/%%APP_NAME%%/libnspr4.so @@ -49,7 +49,7 @@ lib/%%APP_NAME%%/libnssutil3.so lib/%%APP_NAME%%/libplc4.so lib/%%APP_NAME%%/libplds4.so -lib/%%APP_NAME%%/libprldap60.so +%%REPLACE_GRE%%lib/%%APP_NAME%%/libprldap60.so lib/%%APP_NAME%%/libsmime3.so lib/%%APP_NAME%%/libsoftokn3.chk lib/%%APP_NAME%%/libsoftokn3.so Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Fri Nov 15 20:25:30 2013 (r1385) +++ trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 05:06:44 2013 (r1386) @@ -1,6 +1,11 @@ # Created by: Andrew Pantyukhin # $FreeBSD: head/www/linux-seamonkey/Makefile.common 310165 2013-01-09 23:28:19Z flo $ +.if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \ + ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10" +.undef REPLACE_GRE +.endif + CATEGORIES+= linux MASTER_SITES?= MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US PKGNAMEPREFIX?= linux- @@ -28,6 +33,12 @@ .endif DESKTOP_SUFFIX?= (Linux) +.if defined(REPLACE_GRE) +PLIST_SUB+= REPLACE_GRE="" +.else +PLIST_SUB+= REPLACE_GRE="@comment " +.endif + _A= >> ${TMPPLIST} _Q= 2>/dev/null || true From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 16 06:00:07 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBFE4EE for ; Sat, 16 Nov 2013 06:00:07 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 638082E81 for ; Sat, 16 Nov 2013 06:00:06 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAG605IP059735 for ; Sat, 16 Nov 2013 06:00:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAG600Ms059620 for freebsd-gecko@freebsd.org; Sat, 16 Nov 2013 06:00:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 16 Nov 2013 06:00:00 GMT Message-Id: <201311160600.rAG600Ms059620@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 Subject: [SVN-Commit] r1387 - trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 06:00:07 -0000 Author: jbeich Date: Sat Nov 16 06:00:00 2013 New Revision: 1387 Log: note issues preventing BlueGriffon port Wine version seems to work fine. Modified: trunk/Gecko_TODO Modified: trunk/Gecko_TODO ============================================================================== --- trunk/Gecko_TODO Sat Nov 16 05:06:44 2013 (r1386) +++ trunk/Gecko_TODO Sat Nov 16 06:00:00 2013 (r1387) @@ -13,7 +13,10 @@ - push patch-sysdb unassigned (ports): -- add BlueGriffon to replace www/kompozer +- add BlueGriffon to replace www/kompozer: + * linux version requires GLIBC_2.15 > GLIBC_2.12 (c6) > GLIBC_2.9 (f10) + * native version needs hunting for exact hg revision where content.patch + applies cleanly or source tarball with it already applied - add native TorBrowserBundle, may need privacy audit of our build glue - switch to system libxul (needs slaves with common patches); a Debian patch to reduce configure time can be useful From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 16 08:41:23 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B7E6452 for ; Sat, 16 Nov 2013 08:41:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C56E2245E for ; Sat, 16 Nov 2013 08:41:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAG8fECY053247 for ; Sat, 16 Nov 2013 08:41: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 rAG8f9cr052928 for freebsd-gecko@freebsd.org; Sat, 16 Nov 2013 08:41:09 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 16 Nov 2013 08:41:09 GMT Message-Id: <201311160841.rAG8f9cr052928@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 Subject: [SVN-Commit] r1388 - trunk/www/linux-seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 08:41:23 -0000 Author: jbeich Date: Sat Nov 16 08:41:08 2013 New Revision: 1388 Log: linux plugin-container actually works, but not with crashreporter Modified: trunk/www/linux-seamonkey/Makefile.common Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 06:00:00 2013 (r1387) +++ trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 08:41:08 2013 (r1388) @@ -24,6 +24,8 @@ FDIR= ${PREFIX}/lib/${APP_NAME} COMMON_DIR= ${.CURDIR}/../../www/linux-seamonkey +GECKO_ENV+= MOZ_CRASHREPORTER_DISABLE=1 + PLIST_SUB+= APP_NAME=${APP_NAME} SUB_LIST+= APP_NAME=${APP_NAME} SUB_FILES= ${APP_NAME}.desktop @@ -74,8 +76,8 @@ post-patch: @${MKDIR} ${PREFS_FILE:H} - # out-of-process plugins don't work with linuxulator (ports/170402) - ${ECHO} 'pref("dom.ipc.plugins.enabled", false);' >> ${PREFS_FILE} + # empty port preferences + @${DO_NADA} >>${PREFS_FILE} .endif .if !target(do-install) @@ -83,7 +85,9 @@ @${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/ @${CP} -pR ${WRKSRC}/ ${FDIR}/ @${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/ - @${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME} + @${PRINTF} '#! /bin/sh\n${GECKO_ENV} ${FDIR}/${BIN_NAME} "$$@"\n' \ + >>${PREFIX}/bin/${APP_NAME} + @${CHMOD} +x ${PREFIX}/bin/${APP_NAME} @${CP} -R ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME}/ \ ${FDIR}/${APP_SUBDIR}plugins/ ${_Q} @${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \ From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 16 08:41:23 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4D50454 for ; Sat, 16 Nov 2013 08:41:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 67A3B245F for ; Sat, 16 Nov 2013 08:41:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAG8fLFU054892 for ; Sat, 16 Nov 2013 08:41:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAG8fGgA054303 for freebsd-gecko@freebsd.org; Sat, 16 Nov 2013 08:41:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 16 Nov 2013 08:41:16 GMT Message-Id: <201311160841.rAG8fGgA054303@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 Subject: [SVN-Commit] r1389 - in trunk: mail/linux-thunderbird www/linux-firefox www/linux-seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 08:41:23 -0000 Author: jbeich Date: Sat Nov 16 08:41:16 2013 New Revision: 1389 Log: avoid having to reinstall after plugin Modified: trunk/mail/linux-thunderbird/pkg-plist trunk/www/linux-firefox/pkg-plist trunk/www/linux-seamonkey/Makefile.common trunk/www/linux-seamonkey/pkg-plist Modified: trunk/mail/linux-thunderbird/pkg-plist ============================================================================== --- trunk/mail/linux-thunderbird/pkg-plist Sat Nov 16 08:41:08 2013 (r1388) +++ trunk/mail/linux-thunderbird/pkg-plist Sat Nov 16 08:41:16 2013 (r1389) @@ -56,6 +56,7 @@ lib/%%APP_NAME%%/omni.ja lib/%%APP_NAME%%/platform.ini lib/%%APP_NAME%%/plugin-container +lib/%%APP_NAME%%/plugins lib/%%APP_NAME%%/precomplete lib/%%APP_NAME%%/removed-files lib/%%APP_NAME%%/run-mozilla.sh @@ -71,9 +72,7 @@ lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true @dirrm lib/%%APP_NAME%%/chrome/icons/default @dirrm lib/%%APP_NAME%%/chrome/icons @@ -87,6 +86,5 @@ @dirrm lib/%%APP_NAME%%/extensions @dirrm lib/%%APP_NAME%%/icons @dirrm lib/%%APP_NAME%%/isp -@dirrm lib/%%APP_NAME%%/plugins @dirrm lib/%%APP_NAME%%/searchplugins @dirrm lib/%%APP_NAME%% Modified: trunk/www/linux-firefox/pkg-plist ============================================================================== --- trunk/www/linux-firefox/pkg-plist Sat Nov 16 08:41:08 2013 (r1388) +++ trunk/www/linux-firefox/pkg-plist Sat Nov 16 08:41:16 2013 (r1389) @@ -15,6 +15,7 @@ lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf lib/%%APP_NAME%%/browser/icons/mozicon128.png lib/%%APP_NAME%%/browser/omni.ja +lib/%%APP_NAME%%/browser/plugins lib/%%APP_NAME%%/browser/searchplugins/amazondotcom.xml lib/%%APP_NAME%%/browser/searchplugins/bing.xml lib/%%APP_NAME%%/browser/searchplugins/eBay.xml @@ -68,9 +69,7 @@ lib/%%APP_NAME%%/webapprt-stub lib/%%APP_NAME%%/webapprt/omni.ja lib/%%APP_NAME%%/webapprt/webapprt.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/extensions/ 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/extensions/ -depth 1 -type l -delete 2>/dev/null || true @dirrm lib/%%APP_NAME%%/browser/chrome/icons/default @dirrm lib/%%APP_NAME%%/browser/chrome/icons @@ -81,7 +80,6 @@ @dirrm lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} @dirrm lib/%%APP_NAME%%/browser/extensions @dirrm lib/%%APP_NAME%%/browser/icons -@dirrm lib/%%APP_NAME%%/browser/plugins @dirrm lib/%%APP_NAME%%/browser/searchplugins @dirrm lib/%%APP_NAME%%/browser @dirrm lib/%%APP_NAME%%/components Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 08:41:08 2013 (r1388) +++ trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 08:41:16 2013 (r1389) @@ -47,8 +47,9 @@ .if !target(post-extract) post-extract: @${RM} -rf ${WRKSRC}/updates - @${MKDIR} ${WRKSRC}/${APP_SUBDIR}plugins @${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions + @${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME} \ + ${WRKSRC}/${APP_SUBDIR}plugins .endif .if defined(REPLACE_GRE) @@ -88,8 +89,6 @@ @${PRINTF} '#! /bin/sh\n${GECKO_ENV} ${FDIR}/${BIN_NAME} "$$@"\n' \ >>${PREFIX}/bin/${APP_NAME} @${CHMOD} +x ${PREFIX}/bin/${APP_NAME} - @${CP} -R ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME}/ \ - ${FDIR}/${APP_SUBDIR}plugins/ ${_Q} @${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \ ${FDIR}/${APP_SUBDIR}extensions/ ${_Q} .endif @@ -120,12 +119,8 @@ ${ECHO_CMD} share/applications/%%APP_NAME%%.desktop >> ${PLIST} cd ${WRKSRC} && ${FIND} -s . -type f -or -type l | \ ${SED} -e "s#^\.#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST} - ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ \ - %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ ${_Q}' >> ${PLIST} ${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \ %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ ${_Q}' >> ${PLIST} - ${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ \ - -depth 1 -type l -delete ${_Q}' >> ${PLIST} ${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ \ -depth 1 -type l -delete ${_Q}' >> ${PLIST} cd ${WRKSRC} && ${FIND} -sd . -type d | \ Modified: trunk/www/linux-seamonkey/pkg-plist ============================================================================== --- trunk/www/linux-seamonkey/pkg-plist Sat Nov 16 08:41:08 2013 (r1388) +++ trunk/www/linux-seamonkey/pkg-plist Sat Nov 16 08:41:16 2013 (r1389) @@ -107,6 +107,7 @@ lib/%%APP_NAME%%/omni.ja lib/%%APP_NAME%%/platform.ini lib/%%APP_NAME%%/plugin-container +lib/%%APP_NAME%%/plugins lib/%%APP_NAME%%/precomplete lib/%%APP_NAME%%/removed-files lib/%%APP_NAME%%/run-mozilla.sh @@ -119,9 +120,7 @@ lib/%%APP_NAME%%/update-settings.ini lib/%%APP_NAME%%/updater lib/%%APP_NAME%%/updater.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true @dirrm lib/%%APP_NAME%%/chrome/icons/default @dirrm lib/%%APP_NAME%%/chrome/icons @@ -137,6 +136,5 @@ @dirrm lib/%%APP_NAME%%/extensions @dirrm lib/%%APP_NAME%%/icons @dirrm lib/%%APP_NAME%%/isp -@dirrm lib/%%APP_NAME%%/plugins @dirrm lib/%%APP_NAME%%/searchplugins @dirrm lib/%%APP_NAME%% From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 16 08:46:54 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6926E5F7 for ; Sat, 16 Nov 2013 08:46:54 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F316124C3 for ; Sat, 16 Nov 2013 08:46:53 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAG8kpaR076079 for ; Sat, 16 Nov 2013 08:46:51 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAG8kkJg075423 for freebsd-gecko@freebsd.org; Sat, 16 Nov 2013 08:46:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 16 Nov 2013 08:46:46 GMT Message-Id: <201311160846.rAG8kkJg075423@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 Subject: [SVN-Commit] r1390 - trunk/www/linux-seamonkey MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 08:46:54 -0000 Author: jbeich Date: Sat Nov 16 08:46:46 2013 New Revision: 1390 Log: /ENV/s/GECKO_/APP_/ to match the rest of the file Modified: trunk/www/linux-seamonkey/Makefile.common Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 08:41:16 2013 (r1389) +++ trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 08:46:46 2013 (r1390) @@ -24,7 +24,7 @@ FDIR= ${PREFIX}/lib/${APP_NAME} COMMON_DIR= ${.CURDIR}/../../www/linux-seamonkey -GECKO_ENV+= MOZ_CRASHREPORTER_DISABLE=1 +APP_ENV+= MOZ_CRASHREPORTER_DISABLE=1 PLIST_SUB+= APP_NAME=${APP_NAME} SUB_LIST+= APP_NAME=${APP_NAME} @@ -86,7 +86,7 @@ @${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/ @${CP} -pR ${WRKSRC}/ ${FDIR}/ @${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/ - @${PRINTF} '#! /bin/sh\n${GECKO_ENV} ${FDIR}/${BIN_NAME} "$$@"\n' \ + @${PRINTF} '#! /bin/sh\n${APP_ENV} ${FDIR}/${BIN_NAME} "$$@"\n' \ >>${PREFIX}/bin/${APP_NAME} @${CHMOD} +x ${PREFIX}/bin/${APP_NAME} @${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \