From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 26 06:54:14 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7902980D; Sun, 26 Apr 2015 06:54:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 669811E93; Sun, 26 Apr 2015 06:54:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3Q6sEfE034510; Sun, 26 Apr 2015 06:54:14 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3Q6sDBB034508; Sun, 26 Apr 2015 06:54:13 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504260654.t3Q6sDBB034508@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sun, 26 Apr 2015 06:54:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384758 - branches/2015Q2/lang/php5 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Apr 2015 06:54:14 -0000 Author: delphij Date: Sun Apr 26 06:54:13 2015 New Revision: 384758 URL: https://svnweb.freebsd.org/changeset/ports/384758 Log: MFH: r384756 Security update to 5.4.40. Submitted by: Bernard Spil with changes. Approved by: ports-secteam Modified: branches/2015Q2/lang/php5/Makefile branches/2015Q2/lang/php5/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/php5/Makefile ============================================================================== --- branches/2015Q2/lang/php5/Makefile Sun Apr 26 06:53:37 2015 (r384757) +++ branches/2015Q2/lang/php5/Makefile Sun Apr 26 06:54:13 2015 (r384758) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php5 -PORTVERSION= 5.4.39 +PORTVERSION= 5.4.40 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q2/lang/php5/distinfo ============================================================================== --- branches/2015Q2/lang/php5/distinfo Sun Apr 26 06:53:37 2015 (r384757) +++ branches/2015Q2/lang/php5/distinfo Sun Apr 26 06:54:13 2015 (r384758) @@ -1,4 +1,4 @@ -SHA256 (php-5.4.39.tar.bz2) = 7ceb76538e709c74533210ae41148d5c01c330ac8a73220954bbc4fcae69d77e -SIZE (php-5.4.39.tar.bz2) = 12271717 +SHA256 (php-5.4.40.tar.bz2) = 4898ffe8ac3ccb2d8cc94f7d76a9ea0414d954f5d4479895ddfccdc2e158a51a +SIZE (php-5.4.40.tar.bz2) = 12272787 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344 SIZE (php-5.4.x-mail-header.patch) = 3379 From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 26 06:54:39 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22A868F1; Sun, 26 Apr 2015 06:54:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 100F11E99; Sun, 26 Apr 2015 06:54:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3Q6scrM034719; Sun, 26 Apr 2015 06:54:38 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3Q6scfr034717; Sun, 26 Apr 2015 06:54:38 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504260654.t3Q6scfr034717@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sun, 26 Apr 2015 06:54:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384759 - branches/2015Q2/lang/php55 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Apr 2015 06:54:39 -0000 Author: delphij Date: Sun Apr 26 06:54:38 2015 New Revision: 384759 URL: https://svnweb.freebsd.org/changeset/ports/384759 Log: MFH: r384757 Security update to 5.5.24. With hat: ports-secteam Submitted by: Bernard Spil (with changes) Approved by: ports-secteam Modified: branches/2015Q2/lang/php55/Makefile branches/2015Q2/lang/php55/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/php55/Makefile ============================================================================== --- branches/2015Q2/lang/php55/Makefile Sun Apr 26 06:54:13 2015 (r384758) +++ branches/2015Q2/lang/php55/Makefile Sun Apr 26 06:54:38 2015 (r384759) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.23 +PORTVERSION= 5.5.24 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q2/lang/php55/distinfo ============================================================================== --- branches/2015Q2/lang/php55/distinfo Sun Apr 26 06:54:13 2015 (r384758) +++ branches/2015Q2/lang/php55/distinfo Sun Apr 26 06:54:38 2015 (r384759) @@ -1,4 +1,4 @@ -SHA256 (php-5.5.23.tar.bz2) = a99ab264dcd40181baa9defeaa4b21eb2c20d4e9316b904cc05f628762e6ada7 -SIZE (php-5.5.23.tar.bz2) = 13308115 +SHA256 (php-5.5.24.tar.bz2) = 801b5cf2e0c01b07314d4ac3c8a7c28d524bdd8263ebdd0e33a99008251316a2 +SIZE (php-5.5.24.tar.bz2) = 13337043 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 26 09:34:38 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B25E35C2; Sun, 26 Apr 2015 09:34:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F9281E26; Sun, 26 Apr 2015 09:34:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3Q9YcSv013979; Sun, 26 Apr 2015 09:34:38 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3Q9Yb4Z013972; Sun, 26 Apr 2015 09:34:37 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201504260934.t3Q9Yb4Z013972@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 26 Apr 2015 09:34:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384768 - branches/2015Q2/devel/glog/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Apr 2015 09:34:38 -0000 Author: sunpoet Date: Sun Apr 26 09:34:36 2015 New Revision: 384768 URL: https://svnweb.freebsd.org/changeset/ports/384768 Log: MFH: r384740 - Fix build on i386 - Regenerate patch files with makepatch: Approved by: ports-secteam (delphij) Modified: branches/2015Q2/devel/glog/files/patch-src-glog-stl_logging.h.in branches/2015Q2/devel/glog/files/patch-src-googletest.h branches/2015Q2/devel/glog/files/patch-src-logging_unittest.cc branches/2015Q2/devel/glog/files/patch-src-stl_logging_unittest.cc Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/glog/files/patch-src-glog-stl_logging.h.in ============================================================================== --- branches/2015Q2/devel/glog/files/patch-src-glog-stl_logging.h.in Sun Apr 26 09:31:23 2015 (r384767) +++ branches/2015Q2/devel/glog/files/patch-src-glog-stl_logging.h.in Sun Apr 26 09:34:36 2015 (r384768) @@ -1,5 +1,5 @@ ---- src/glog/stl_logging.h.in.orig 2015-03-11 12:02:27.000000000 +0800 -+++ src/glog/stl_logging.h.in 2015-03-22 01:13:41.132580961 +0800 +--- src/glog/stl_logging.h.in.orig 2015-03-11 04:02:27 UTC ++++ src/glog/stl_logging.h.in @@ -76,6 +76,9 @@ #ifdef GLOG_STL_LOGGING_FOR_EXT_SLIST # include @@ -10,7 +10,7 @@ // Forward declare these two, and define them after all the container streams // operators so that we can recurse from pair -> container -> container -> pair -@@ -101,9 +104,13 @@ +@@ -101,9 +104,13 @@ inline std::ostream& operator<<(std::ost OUTPUT_TWO_ARG_CONTAINER(std::vector) OUTPUT_TWO_ARG_CONTAINER(std::deque) OUTPUT_TWO_ARG_CONTAINER(std::list) Modified: branches/2015Q2/devel/glog/files/patch-src-googletest.h ============================================================================== --- branches/2015Q2/devel/glog/files/patch-src-googletest.h Sun Apr 26 09:31:23 2015 (r384767) +++ branches/2015Q2/devel/glog/files/patch-src-googletest.h Sun Apr 26 09:34:36 2015 (r384768) @@ -1,5 +1,5 @@ ---- src/googletest.h.orig 2015-03-11 12:02:27.000000000 +0800 -+++ src/googletest.h 2015-03-22 00:56:38.711647313 +0800 +--- src/googletest.h.orig 2015-03-11 04:02:27 UTC ++++ src/googletest.h @@ -58,6 +58,7 @@ #include "base/commandlineflags.h" Modified: branches/2015Q2/devel/glog/files/patch-src-logging_unittest.cc ============================================================================== --- branches/2015Q2/devel/glog/files/patch-src-logging_unittest.cc Sun Apr 26 09:31:23 2015 (r384767) +++ branches/2015Q2/devel/glog/files/patch-src-logging_unittest.cc Sun Apr 26 09:34:36 2015 (r384768) @@ -1,6 +1,6 @@ ---- src/logging_unittest.cc.orig 2015-03-11 12:02:27.000000000 +0800 -+++ src/logging_unittest.cc 2015-03-22 00:54:39.798664493 +0800 -@@ -78,6 +78,7 @@ +--- src/logging_unittest.cc.orig 2015-03-11 04:02:27 UTC ++++ src/logging_unittest.cc +@@ -78,6 +78,7 @@ using GOOGLE_NAMESPACE::glog_testing::Sc #endif using namespace std; @@ -8,3 +8,94 @@ using namespace GOOGLE_NAMESPACE; // Some non-advertised functions that we want to test or use. +@@ -239,9 +240,9 @@ int main(int argc, char **argv) { + } + + void TestLogging(bool check_counts) { +- int64 base_num_infos = LogMessage::num_messages(GLOG_INFO); +- int64 base_num_warning = LogMessage::num_messages(GLOG_WARNING); +- int64 base_num_errors = LogMessage::num_messages(GLOG_ERROR); ++ gflags::int64 base_num_infos = LogMessage::num_messages(GLOG_INFO); ++ gflags::int64 base_num_warning = LogMessage::num_messages(GLOG_WARNING); ++ gflags::int64 base_num_errors = LogMessage::num_messages(GLOG_ERROR); + + LOG(INFO) << string("foo ") << "bar " << 10 << ' ' << 3.4; + for ( int i = 0; i < 10; ++i ) { +@@ -564,8 +565,8 @@ void TestDCHECK() { + DCHECK_GT(2, 1); + DCHECK_LT(1, 2); + +- auto_ptr sptr(new int64); +- int64* ptr = DCHECK_NOTNULL(sptr.get()); ++ auto_ptr sptr(new gflags::int64); ++ gflags::int64* ptr = DCHECK_NOTNULL(sptr.get()); + CHECK_EQ(ptr, sptr.get()); + } + +@@ -594,14 +595,14 @@ TEST(DeathSTREQ, logging) { + } + + TEST(CheckNOTNULL, Simple) { +- int64 t; ++ gflags::int64 t; + void *ptr = static_cast(&t); + void *ref = CHECK_NOTNULL(ptr); + EXPECT_EQ(ptr, ref); + CHECK_NOTNULL(reinterpret_cast(ptr)); + CHECK_NOTNULL(reinterpret_cast(ptr)); + CHECK_NOTNULL(reinterpret_cast(ptr)); +- CHECK_NOTNULL(reinterpret_cast(ptr)); ++ CHECK_NOTNULL(reinterpret_cast(ptr)); + } + + TEST(DeathCheckNN, Simple) { +@@ -736,7 +737,7 @@ struct MyLogger : public base::Logger { + + virtual void Flush() { } + +- virtual uint32 LogSize() { return data.length(); } ++ virtual gflags::uint32 LogSize() { return data.length(); } + }; + + static void TestWrapper() { +@@ -760,23 +761,23 @@ static void TestErrno() { + CHECK_EQ(errno, ENOENT); + } + +-static void TestOneTruncate(const char *path, int64 limit, int64 keep, +- int64 dsize, int64 ksize, int64 expect) { ++static void TestOneTruncate(const char *path, gflags::int64 limit, gflags::int64 keep, ++ gflags::int64 dsize, gflags::int64 ksize, gflags::int64 expect) { + int fd; + CHECK_ERR(fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0600)); + + const char *discardstr = "DISCARDME!", *keepstr = "KEEPME!"; + + // Fill the file with the requested data; first discard data, then kept data +- int64 written = 0; ++ gflags::int64 written = 0; + while (written < dsize) { +- int bytes = min(dsize - written, strlen(discardstr)); ++ int bytes = min(dsize - written, strlen(discardstr)); + CHECK_ERR(write(fd, discardstr, bytes)); + written += bytes; + } + written = 0; + while (written < ksize) { +- int bytes = min(ksize - written, strlen(keepstr)); ++ int bytes = min(ksize - written, strlen(keepstr)); + CHECK_ERR(write(fd, keepstr, bytes)); + written += bytes; + } +@@ -796,9 +797,9 @@ static void TestOneTruncate(const char * + CHECK_ERR(read(fd, buf, buf_size)); + + const char *p = buf; +- int64 checked = 0; ++ gflags::int64 checked = 0; + while (checked < expect) { +- int bytes = min(expect - checked, strlen(keepstr)); ++ int bytes = min(expect - checked, strlen(keepstr)); + CHECK(!memcmp(p, keepstr, bytes)); + checked += bytes; + } Modified: branches/2015Q2/devel/glog/files/patch-src-stl_logging_unittest.cc ============================================================================== --- branches/2015Q2/devel/glog/files/patch-src-stl_logging_unittest.cc Sun Apr 26 09:31:23 2015 (r384767) +++ branches/2015Q2/devel/glog/files/patch-src-stl_logging_unittest.cc Sun Apr 26 09:34:36 2015 (r384768) @@ -1,5 +1,5 @@ ---- src/stl_logging_unittest.cc.orig 2015-03-11 12:02:27.000000000 +0800 -+++ src/stl_logging_unittest.cc 2015-03-22 01:03:23.871621079 +0800 +--- src/stl_logging_unittest.cc.orig 2015-03-11 04:02:27 UTC ++++ src/stl_logging_unittest.cc @@ -41,6 +41,7 @@ // C++0x isn't enabled by default in GCC and libc++ does not have // non-standard ext/* and tr1/unordered_*. From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 26 11:27:57 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03CC7C4A; Sun, 26 Apr 2015 11:27:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CBC3418E3; Sun, 26 Apr 2015 11:27:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3QBRueD069748; Sun, 26 Apr 2015 11:27:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3QBRuwQ069744; Sun, 26 Apr 2015 11:27:56 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201504261127.t3QBRuwQ069744@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 26 Apr 2015 11:27:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384773 - branches/2015Q2/devel/rlvm X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Apr 2015 11:27:57 -0000 Author: jbeich Date: Sun Apr 26 11:27:55 2015 New Revision: 384773 URL: https://svnweb.freebsd.org/changeset/ports/384773 Log: MFH: r384751 Update to 20150425 snapshot to unbreak gcc5 build src/systems/base/koepac_voice_archive.cc:142:27: error: narrowing conversion of '255' from 'int' to 'int8_t {aka signed char}' inside { } 0x7e, 0x81, 0x7f, 0x80}; ^ Changes: https://github.com/eglaysher/rlvm/compare/589e3d2...373a3db Reported by: DPorts Approved by: ports-secteam (delphij) Modified: branches/2015Q2/devel/rlvm/Makefile branches/2015Q2/devel/rlvm/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/rlvm/Makefile ============================================================================== --- branches/2015Q2/devel/rlvm/Makefile Sun Apr 26 11:14:54 2015 (r384772) +++ branches/2015Q2/devel/rlvm/Makefile Sun Apr 26 11:27:55 2015 (r384773) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= rlvm -PORTVERSION= 0.14.0.20150223 -PORTREVISION= 1 +PORTVERSION= 0.14.0.20150425 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org @@ -20,8 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/de USE_GITHUB= yes GH_ACCOUNT= eglaysher -GH_TAGNAME= ${GH_COMMIT} # release-${PORTVERSION} -GH_COMMIT= 589e3d2 +GH_TAGNAME= 373a3db # release-${PORTVERSION} USES= compiler:c++11-lib pkgconfig scons USE_GL= yes Modified: branches/2015Q2/devel/rlvm/distinfo ============================================================================== --- branches/2015Q2/devel/rlvm/distinfo Sun Apr 26 11:14:54 2015 (r384772) +++ branches/2015Q2/devel/rlvm/distinfo Sun Apr 26 11:27:55 2015 (r384773) @@ -1,2 +1,2 @@ -SHA256 (rlvm-0.14.0.20150223.tar.gz) = 3480e72a84cdea492c0bf74126567182dfbef4361324ce3c373a4698379a7de4 -SIZE (rlvm-0.14.0.20150223.tar.gz) = 1930018 +SHA256 (eglaysher-rlvm-0.14.0.20150425-373a3db_GH0.tar.gz) = 35fdabf1ded01f397a6736bd60ac13ccb614d88dcbec8192fbe4510f5b80b7aa +SIZE (eglaysher-rlvm-0.14.0.20150425-373a3db_GH0.tar.gz) = 1929198 From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 26 11:31:33 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 25CE0EA5; Sun, 26 Apr 2015 11:31:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 14F411916; Sun, 26 Apr 2015 11:31:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3QBVWOO073546; Sun, 26 Apr 2015 11:31:32 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3QBVWOJ073545; Sun, 26 Apr 2015 11:31:32 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201504261131.t3QBVWOJ073545@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 26 Apr 2015 11:31:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384774 - in branches/2015Q2/chinese/ibus-libpinyin: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Apr 2015 11:31:33 -0000 Author: jbeich Date: Sun Apr 26 11:31:32 2015 New Revision: 384774 URL: https://svnweb.freebsd.org/changeset/ports/384774 Log: MFH: r384747 Unbreak build on FreeBSD 8.x/9.x and DragonFly ./PYSignal.h:35:22: error: expected namespace name using namespace std::placeholders; ~~~~~^ ./PYSignal.h:49:18: error: no type named 'function' in namespace 'std' typedef std::function func_type; ~~~~~^ ./PYEditor.h:37:14: error: no type named 'shared_ptr' in namespace 'std' typedef std::shared_ptr EditorPtr; ~~~~~^ PYLibPinyin.cc:223:54: error: 'getline' was not declared in this scope while ((read = getline (&linebuf, &size, dictfile)) != -1) { ^ PR: 199408 Reported by: pkg-fallout, DPorts Submitted by: Henry Hu (maintainer) Approved by: ports-secteam (delphij) Added: branches/2015Q2/chinese/ibus-libpinyin/files/ - copied from r384747, head/chinese/ibus-libpinyin/files/ Modified: branches/2015Q2/chinese/ibus-libpinyin/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/chinese/ibus-libpinyin/Makefile ============================================================================== --- branches/2015Q2/chinese/ibus-libpinyin/Makefile Sun Apr 26 11:27:55 2015 (r384773) +++ branches/2015Q2/chinese/ibus-libpinyin/Makefile Sun Apr 26 11:31:32 2015 (r384774) @@ -15,7 +15,7 @@ LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/d libibus-1.0.so:${PORTSDIR}/textproc/ibus \ libpinyin.so:${PORTSDIR}/chinese/libpinyin -USES= compiler:c++0x gmake python pkgconfig gettext +USES= compiler:c++11-lib gmake python pkgconfig gettext USE_GNOME= glib20 WRKSRC= ${WRKDIR}/${DISTNAME} From owner-svn-ports-branches@FreeBSD.ORG Sun Apr 26 11:39:02 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D42D360E; Sun, 26 Apr 2015 11:39:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C31C01A22; Sun, 26 Apr 2015 11:39:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3QBd2BE075447; Sun, 26 Apr 2015 11:39:02 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3QBd254075446; Sun, 26 Apr 2015 11:39:02 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201504261139.t3QBd254075446@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 26 Apr 2015 11:39:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384776 - branches/2015Q2/devel/pig X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Apr 2015 11:39:02 -0000 Author: antoine Date: Sun Apr 26 11:39:01 2015 New Revision: 384776 URL: https://svnweb.freebsd.org/changeset/ports/384776 Log: MFH: r384775 Mark BROKEN: tries to fetch distfiles during build phase Reported by: pkg-fallout Modified: branches/2015Q2/devel/pig/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/pig/Makefile ============================================================================== --- branches/2015Q2/devel/pig/Makefile Sun Apr 26 11:38:03 2015 (r384775) +++ branches/2015Q2/devel/pig/Makefile Sun Apr 26 11:39:01 2015 (r384776) @@ -18,6 +18,8 @@ COMMENT= Engine for executing data flows LICENSE= APACHE20 +BROKEN= tries to fetch distfiles during build phase + BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ yarn:${PORTSDIR}/devel/hadoop2 From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 27 06:16:07 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99C382BE; Mon, 27 Apr 2015 06:16:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8805C1482; Mon, 27 Apr 2015 06:16:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3R6G7II038767; Mon, 27 Apr 2015 06:16:07 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3R6G7DV038762; Mon, 27 Apr 2015 06:16:07 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201504270616.t3R6G7DV038762@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 27 Apr 2015 06:16:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384816 - branches/2015Q2/graphics/grads X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 06:16:07 -0000 Author: antoine Date: Mon Apr 27 06:16:06 2015 New Revision: 384816 URL: https://svnweb.freebsd.org/changeset/ports/384816 Log: MFH: r383690 . Add additional MASTER_SITE. . Fix checksum and size for example.tar.gz dist file. PR: 199284 Submitted by: Rainer Hurling Modified: branches/2015Q2/graphics/grads/Makefile branches/2015Q2/graphics/grads/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/graphics/grads/Makefile ============================================================================== --- branches/2015Q2/graphics/grads/Makefile Mon Apr 27 04:50:20 2015 (r384815) +++ branches/2015Q2/graphics/grads/Makefile Mon Apr 27 06:16:06 2015 (r384816) @@ -6,7 +6,9 @@ PORTVERSION= 1.9b4 PORTREVISION= 10 CATEGORIES= graphics science math MASTER_SITES= ftp://grads.iges.org/grads/1.9/:src \ - ftp://grads.iges.org/grads/:other + ftp://cola.gmu.edu/grads/1.9/:src \ + ftp://grads.iges.org/grads/:other \ + ftp://cola.gmu.edu/grads/:other DISTFILES= ${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX}:src \ example.tar.gz:other EXTRACT_ONLY= ${PORTNAME}-src-${PORTVERSION}${EXTRACT_SUFX} Modified: branches/2015Q2/graphics/grads/distinfo ============================================================================== --- branches/2015Q2/graphics/grads/distinfo Mon Apr 27 04:50:20 2015 (r384815) +++ branches/2015Q2/graphics/grads/distinfo Mon Apr 27 06:16:06 2015 (r384816) @@ -1,4 +1,4 @@ SHA256 (grads-src-1.9b4.tar.gz) = d7dde5bec1e9d0223073043a948faeb02c1b1f8ab4274294cc40419274811933 SIZE (grads-src-1.9b4.tar.gz) = 2844584 -SHA256 (example.tar.gz) = c14427b22911c20aae3c3fca8e52796f61c7a0e2d0071614b56bbc6c307e345c -SIZE (example.tar.gz) = 1647527 +SHA256 (example.tar.gz) = 1d744696d3f5722b755786da7bc1b87c2217734a2848643dce20660ebe7a5723 +SIZE (example.tar.gz) = 1647733 From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 27 11:18:52 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C2F19D14; Mon, 27 Apr 2015 11:18:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE67914AF; Mon, 27 Apr 2015 11:18:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RBIqix093580; Mon, 27 Apr 2015 11:18:52 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RBIlfk093553; Mon, 27 Apr 2015 11:18:47 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201504271118.t3RBIlfk093553@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 27 Apr 2015 11:18:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384826 - in branches/2015Q2/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 11:18:53 -0000 Author: rene Date: Mon Apr 27 11:18:46 2015 New Revision: 384826 URL: https://svnweb.freebsd.org/changeset/ports/384826 Log: MFH: r384824 www/chromium: update to 42.0.2311.90 There were two updates submitted as Github pull requests: - one for 41.0.2272.118 - one for 42.0.2311.90, based on the first update. Submitted by: Timothy Vaccarelli (41.0.2272.118) Submitted by: Christoph Moench-Tegeder (42.0.2311.90) Security: http://vuxml.freebsd.org/freebsd/b57f690e-ecc9-11e4-876c-00262d5ed8ee.html Approved by: portmgr (erwin) Added: branches/2015Q2/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc - copied unchanged from r384824, head/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc branches/2015Q2/www/chromium/files/patch-chrome__chrome_exe.gypi - copied unchanged from r384824, head/www/chromium/files/patch-chrome__chrome_exe.gypi branches/2015Q2/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h - copied unchanged from r384824, head/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h branches/2015Q2/www/chromium/files/patch-components__update_client__update_query_params.cc - copied unchanged from r384824, head/www/chromium/files/patch-components__update_client__update_query_params.cc branches/2015Q2/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc - copied unchanged from r384824, head/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc branches/2015Q2/www/chromium/files/patch-device__usb__usb_service_impl.h - copied unchanged from r384824, head/www/chromium/files/patch-device__usb__usb_service_impl.h branches/2015Q2/www/chromium/files/patch-net__base__address_tracker_linux.cc - copied unchanged from r384824, head/www/chromium/files/patch-net__base__address_tracker_linux.cc branches/2015Q2/www/chromium/files/patch-net__base__net_util_linux.cc - copied unchanged from r384824, head/www/chromium/files/patch-net__base__net_util_linux.cc branches/2015Q2/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp - copied unchanged from r384824, head/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp branches/2015Q2/www/chromium/files/patch-third_party__WebKit__Source__bindings__core__v8__V8ScriptRunner.cpp - copied unchanged from r384824, head/www/chromium/files/patch-third_party__WebKit__Source__bindings__core__v8__V8ScriptRunner.cpp branches/2015Q2/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__StackFrameDepth.cpp - copied unchanged from r384824, head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__StackFrameDepth.cpp branches/2015Q2/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__Visitor.cpp - copied unchanged from r384824, head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__Visitor.cpp branches/2015Q2/www/chromium/files/patch-third_party__pdfium__third_party__base__logging.h - copied unchanged from r384824, head/www/chromium/files/patch-third_party__pdfium__third_party__base__logging.h branches/2015Q2/www/chromium/files/patch-third_party__skia__src__core__SkVarAlloc.cpp - copied unchanged from r384824, head/www/chromium/files/patch-third_party__skia__src__core__SkVarAlloc.cpp branches/2015Q2/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc - copied unchanged from r384824, head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc branches/2015Q2/www/chromium/files/patch-ui__gfx__render_text.cc - copied unchanged from r384824, head/www/chromium/files/patch-ui__gfx__render_text.cc branches/2015Q2/www/chromium/files/patch-v8__src__debug.cc - copied unchanged from r384824, head/www/chromium/files/patch-v8__src__debug.cc Deleted: branches/2015Q2/www/chromium/files/patch-breakpad__breakpad.gyp branches/2015Q2/www/chromium/files/patch-build__linux__unbundle__openssl.gyp branches/2015Q2/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h branches/2015Q2/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc branches/2015Q2/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc branches/2015Q2/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh branches/2015Q2/www/chromium/files/patch-third_party__pdfium__third_party__logging.h branches/2015Q2/www/chromium/files/patch-v8__src__preparser.h Modified: branches/2015Q2/www/chromium/Makefile branches/2015Q2/www/chromium/distinfo branches/2015Q2/www/chromium/files/extra-patch-clang branches/2015Q2/www/chromium/files/patch-base__process__launch.cc branches/2015Q2/www/chromium/files/patch-base__process__launch.h branches/2015Q2/www/chromium/files/patch-build__common.gypi branches/2015Q2/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2015Q2/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc branches/2015Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2015Q2/www/chromium/files/patch-content__app__content_main_runner.cc branches/2015Q2/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2015Q2/www/chromium/files/patch-content__gpu__gpu_main.cc branches/2015Q2/www/chromium/files/patch-device__usb__usb_service_impl.cc branches/2015Q2/www/chromium/files/patch-gpu__config__gpu_util.cc branches/2015Q2/www/chromium/files/patch-gpu__gpu_config.gypi branches/2015Q2/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc branches/2015Q2/www/chromium/files/patch-net__base__address_tracker_linux.h branches/2015Q2/www/chromium/files/patch-net__base__net_util_posix.cc branches/2015Q2/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc branches/2015Q2/www/chromium/files/patch-remoting__remoting_host.gypi branches/2015Q2/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2015Q2/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc branches/2015Q2/www/chromium/files/patch-ui__base__ime__input_method_factory.cc branches/2015Q2/www/chromium/files/patch-ui__views__views.gyp branches/2015Q2/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc branches/2015Q2/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc branches/2015Q2/www/chromium/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/chromium/Makefile ============================================================================== --- branches/2015Q2/www/chromium/Makefile Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/Makefile Mon Apr 27 11:18:46 2015 (r384826) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 40.0.2214.115 +PORTVERSION= 42.0.2311.90 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -20,7 +20,9 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${ yasm:${PORTSDIR}/devel/yasm \ flock:${PORTSDIR}/sysutils/flock \ ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ - ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids + ${LOCALBASE}/share/usbids/usb.ids:${PORTSDIR}/misc/usbids \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:${PORTSDIR}/devel/py-Jinja2 \ + ${PYTHON_PKGNAMEPREFIX}ply>0:${PORTSDIR}/devel/py-ply LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libdbus-1.so:${PORTSDIR}/devel/dbus \ @@ -110,7 +112,8 @@ GYP_DEFINES+= \ use_system_snappy=1 \ use_system_speex=1 \ use_system_xdg_utils=1 \ - use_system_yasm=1 + use_system_yasm=1 \ + v8_use_external_startup_data=0 # allow removal of third_party/adobe GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h' @@ -259,6 +262,7 @@ pre-configure: 'net/third_party/mozilla_security_manager' \ 'net/third_party/nss' \ 'third_party/WebKit' \ + 'third_party/analytics' \ 'third_party/angle' \ 'third_party/angle/src/third_party' \ 'third_party/blanketjs' \ @@ -289,7 +293,6 @@ pre-configure: 'third_party/libsrtp' \ 'third_party/libvpx' \ 'third_party/libvpx/source/libvpx/third_party/x86inc' \ - 'third_party/libwebm' \ 'third_party/libxml/chromium' \ 'third_party/libXNVCtrl' \ 'third_party/libyuv' \ @@ -297,6 +300,7 @@ pre-configure: 'third_party/lzma_sdk' \ 'third_party/markupsafe' \ 'third_party/mesa' \ + 'third_party/mojo' \ 'third_party/modp_b64' \ 'third_party/mt19937ar' \ 'third_party/npapi' \ @@ -324,6 +328,7 @@ pre-configure: 'third_party/trace-viewer/third_party/tvcm/third_party' \ 'third_party/undoview' \ 'third_party/usrsctp' \ + 'third_party/web-animations-js' \ 'third_party/webdriver' \ 'third_party/webrtc' \ 'third_party/widevine' \ @@ -368,8 +373,6 @@ do-install: ${STAGEDIR}${DATADIR} ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libffmpegsumo.so \ ${STAGEDIR}${DATADIR} - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libpdf.so \ - ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} Modified: branches/2015Q2/www/chromium/distinfo ============================================================================== --- branches/2015Q2/www/chromium/distinfo Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/distinfo Mon Apr 27 11:18:46 2015 (r384826) @@ -1,4 +1,4 @@ -SHA256 (chromium-40.0.2214.115.tar.xz) = 2261b96dba5747b52512e2391956c54f4e36b9bbaa310b16c7fb0f1e4efba6a5 -SIZE (chromium-40.0.2214.115.tar.xz) = 284973228 -SHA256 (chromium-40.0.2214.115-testdata.tar.xz) = 862a2d2b1afeb7b458f39b65ef1fd4062415dbb7f948d5f463ec31a845369300 -SIZE (chromium-40.0.2214.115-testdata.tar.xz) = 115348788 +SHA256 (chromium-42.0.2311.90.tar.xz) = 60b0eb38c1c3d0cc998dae70b7333e53b715cff2847c1652e03d1723300db4c9 +SIZE (chromium-42.0.2311.90.tar.xz) = 306502344 +SHA256 (chromium-42.0.2311.90-testdata.tar.xz) = 79bb822e879862bee121ea3b8e42e06623790552bc63689beecce680fc018163 +SIZE (chromium-42.0.2311.90-testdata.tar.xz) = 115728192 Modified: branches/2015Q2/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q2/www/chromium/files/extra-patch-clang Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/extra-patch-clang Mon Apr 27 11:18:46 2015 (r384826) @@ -1,5 +1,5 @@ ---- base/allocator/allocator_extension.cc 2013-07-03 23:39:54.000000000 -0400 -+++ base/allocator/allocator_extension.cc 2013-07-19 00:39:26.000000000 -0400 +--- base/allocator/allocator_extension.cc 2015-04-15 00:18:47.000000000 +0200 ++++ base/allocator/allocator_extension.cc 2015-04-18 21:44:25.000000000 +0200 @@ -35,20 +35,20 @@ void SetGetAllocatorWasteSizeFunction( thunks::GetAllocatorWasteSizeFunction get_allocator_waste_size_function) { @@ -24,19 +24,25 @@ thunks::SetReleaseFreeMemoryFunction(release_free_memory_function); } ---- base/profiler/alternate_timer.cc 2013-07-03 23:39:54.000000000 -0400 -+++ base/profiler/alternate_timer.cc 2013-07-19 00:41:06.000000000 -0400 -@@ -21,7 +21,7 @@ - // Set an alternate timer function to replace the OS time function when - // profiling. - void SetAlternateTimeSource(NowFunction* now_function, TimeSourceType type) { -- DCHECK_EQ(reinterpret_cast(NULL), g_time_function); -+ DCHECK_EQ(static_cast(NULL), g_time_function); - g_time_function = now_function; - g_time_source_type = type; - } ---- base/threading/thread_local_storage_unittest.cc.orig 2013-08-30 23:06:21.000000000 +0300 -+++ base/threading/thread_local_storage_unittest.cc 2013-08-30 23:06:50.000000000 +0300 +--- base/strings/safe_sprintf_unittest.cc 2015-04-15 00:18:48.000000000 +0200 ++++ base/strings/safe_sprintf_unittest.cc 2015-04-18 22:08:45.000000000 +0200 +@@ -729,12 +729,14 @@ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wconversion-null" + #endif ++/* Avoid compiler error: http://pastebin.com/1edWUE84 + EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL)); + EXPECT_EQ("0", std::string(buf)); + EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL)); + EXPECT_EQ("0x0", std::string(buf)); + EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); + EXPECT_EQ("", std::string(buf)); ++*/ + #if defined(__GCC__) + #pragma GCC diagnostic pop + #endif +--- base/threading/thread_local_storage_unittest.cc 2015-04-15 00:18:48.000000000 +0200 ++++ base/threading/thread_local_storage_unittest.cc 2015-04-18 21:45:40.000000000 +0200 @@ -60,7 +60,7 @@ void ThreadLocalStorageCleanup(void *value) { int *ptr = reinterpret_cast(value); @@ -46,9 +52,9 @@ if (*ptr == kFinalTlsValue) return; // We've been called enough times. ASSERT_LT(kFinalTlsValue, *ptr); ---- base/tracked_objects.cc 2013-07-03 23:39:54.000000000 -0400 -+++ base/tracked_objects.cc 2013-07-19 00:42:10.000000000 -0400 -@@ -378,7 +378,7 @@ +--- base/tracked_objects.cc 2015-04-15 00:31:20.000000000 +0200 ++++ base/tracked_objects.cc 2015-04-18 21:57:33.000000000 +0200 +@@ -393,7 +393,7 @@ } // We must NOT do any allocations during this callback. // Using the simple linked lists avoids all allocations. @@ -57,11 +63,11 @@ this->next_retired_worker_ = first_retired_worker_; first_retired_worker_ = this; } ---- base/tracked_objects_unittest.cc.orig 2013-08-30 23:09:01.000000000 +0300 -+++ base/tracked_objects_unittest.cc 2013-08-30 23:10:14.000000000 +0300 -@@ -53,9 +53,9 @@ +--- base/tracked_objects_unittest.cc 2015-04-15 00:31:20.000000000 +0200 ++++ base/tracked_objects_unittest.cc 2015-04-18 22:01:28.000000000 +0200 +@@ -58,9 +58,9 @@ Births* birth = ThreadData::TallyABirthIfActive(location); - + if (ThreadData::status() == ThreadData::DEACTIVATED) - EXPECT_EQ(reinterpret_cast(NULL), birth); + EXPECT_EQ(static_cast(NULL), birth); @@ -69,50 +75,66 @@ - EXPECT_NE(reinterpret_cast(NULL), birth); + EXPECT_NE(static_cast(NULL), birth); } - + // Helper function to verify the most common test expectations. -@@ -234,7 +234,7 @@ - return; - +@@ -271,7 +271,7 @@ + } + scoped_ptr data(new DeathData()); - ASSERT_NE(data, reinterpret_cast(NULL)); + ASSERT_NE(data, static_cast(NULL)); EXPECT_EQ(data->run_duration_sum(), 0); EXPECT_EQ(data->run_duration_sample(), 0); EXPECT_EQ(data->queue_duration_sum(), 0); -@@ -435,7 +435,7 @@ +@@ -489,7 +489,7 @@ Location location(kFunction, kFile, kLineNumber, NULL); // Do not delete |birth|. We don't own it. Births* birth = ThreadData::TallyABirthIfActive(location); - EXPECT_NE(reinterpret_cast(NULL), birth); + EXPECT_NE(static_cast(NULL), birth); - - const TrackedTime kTimePosted = TrackedTime() + Duration::FromMilliseconds(1); - const TrackedTime kStartOfRun = TrackedTime() + ---- chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-03 23:46:07.000000000 -0400 -+++ chrome/browser/sync/glue/synced_session_tracker.cc 2013-07-19 01:50:13.000000000 -0400 + + const unsigned int kTimePosted = 1; + const unsigned int kStartOfRun = 5; +--- chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-15 00:18:50.000000000 +0200 ++++ chrome/browser/sync/glue/synced_session_tracker.cc 2015-04-18 22:02:15.000000000 +0200 @@ -260,7 +260,7 @@ } DCHECK(window_ptr); DCHECK_EQ(window_ptr->window_id.id(), window_id); -- DCHECK_EQ(reinterpret_cast(NULL), -+ DCHECK_EQ(static_cast(NULL), +- DCHECK_EQ(reinterpret_cast(NULL), ++ DCHECK_EQ(static_cast(NULL), GetSession(session_tag)->windows[window_id]); GetSession(session_tag)->windows[window_id] = window_ptr; } ---- media/audio/audio_output_proxy_unittest.cc.orig 2013-08-30 23:23:03.000000000 +0300 -+++ media/audio/audio_output_proxy_unittest.cc 2013-08-30 23:23:54.000000000 +0300 -@@ -392,7 +392,7 @@ +--- content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-15 00:31:22.000000000 +0200 ++++ content/browser/frame_host/render_widget_host_view_guest.cc 2015-04-18 22:10:28.000000000 +0200 +@@ -241,11 +241,11 @@ + + gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { + if (!guest_) +- return static_cast(NULL); ++ return reinterpret_cast(NULL); + + RenderWidgetHostView* rwhv = guest_->GetOwnerRenderWidgetHostView(); + if (!rwhv) +- return static_cast(NULL); ++ return reinterpret_cast(NULL); + return rwhv->GetNativeViewId(); + } + +--- media/audio/audio_output_proxy_unittest.cc 2015-04-15 00:18:55.000000000 +0200 ++++ media/audio/audio_output_proxy_unittest.cc 2015-04-18 22:02:38.000000000 +0200 +@@ -387,7 +387,7 @@ // |stream| is closed at this point. Start() should reopen it again. EXPECT_CALL(manager(), MakeAudioOutputStream(_, _)) .Times(2) - .WillRepeatedly(Return(reinterpret_cast(NULL))); + .WillRepeatedly(Return(static_cast(NULL))); - + EXPECT_CALL(callback_, OnError(_)) .Times(2); ---- media/filters/decrypting_video_decoder_unittest.cc.orig 2014-09-04 02:04:17.000000000 +0200 -+++ media/filters/decrypting_video_decoder_unittest.cc 2014-09-08 20:51:21.000000000 +0200 +--- media/filters/decrypting_video_decoder_unittest.cc 2015-04-15 00:31:22.000000000 +0200 ++++ media/filters/decrypting_video_decoder_unittest.cc 2015-04-18 22:03:40.000000000 +0200 @@ -420,7 +420,7 @@ // NULL callback to cancel the |decryptor_ready_cb|. EXPECT_CALL(*this, RequestDecryptorNotification(IsNullCallback())).WillOnce( @@ -122,8 +144,8 @@ base::Bind(&DecryptingVideoDecoderTest::DecryptorSet, base::Unretained(this)))); EXPECT_CALL(*this, DecryptorSet(_)).Times(0); ---- third_party/hunspell/src/hunspell/affentry.hxx 2013-07-03 23:52:32.000000000 -0400 -+++ third_party/hunspell/src/hunspell/affentry.hxx 2013-07-19 01:31:57.000000000 -0400 +--- third_party/hunspell/src/hunspell/affentry.hxx 2015-04-15 00:31:35.000000000 +0200 ++++ third_party/hunspell/src/hunspell/affentry.hxx 2015-04-18 22:04:39.000000000 +0200 @@ -27,7 +27,7 @@ struct hentry * checkword(const char * word, int len, char in_compound, const FLAG needflag = FLAG_NULL); @@ -142,8 +164,8 @@ char * check_twosfx_morph(const char * word, int len, int optflags, PfxEntry* ppfx, const FLAG needflag = FLAG_NULL); ---- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-03 23:54:15.000000000 -0400 -+++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2013-07-19 00:44:09.000000000 -0400 +--- third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-15 00:31:48.000000000 +0200 ++++ third_party/sfntly/cpp/src/sfntly/table/core/cmap_table.cc 2015-04-18 22:05:41.000000000 +0200 @@ -439,7 +439,7 @@ } @@ -188,54 +210,9 @@ + : CMap::Builder(static_cast(NULL), CMapFormat::kFormat4, cmap_id) { } - ---- v8/src/runtime/runtime-i18n.cc.orig 2015-01-25 15:08:31.732972197 +0100 -+++ v8/src/runtime/runtime-i18n.cc 2015-01-25 15:09:04.260951597 +0100 -@@ -626,7 +626,7 @@ - - local_object->SetInternalField(0, reinterpret_cast(break_iterator)); - // Make sure that the pointer to adopted text is NULL. -- local_object->SetInternalField(1, reinterpret_cast(NULL)); -+ local_object->SetInternalField(1, static_cast(NULL)); - - Factory* factory = isolate->factory(); - Handle key = factory->NewStringFromStaticChars("breakIterator"); ---- base/strings/safe_sprintf_unittest.cc.orig 2013-11-08 07:42:08.000000000 +0100 -+++ base/strings/safe_sprintf_unittest.cc 2013-11-15 15:04:45.000000000 +0100 -@@ -721,12 +721,14 @@ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wconversion-null" - #endif -+/* Avoid compiler error: http://pastebin.com/1edWUE84 - EXPECT_EQ(1, SafeSPrintf(buf, "%d", NULL)); - EXPECT_EQ("0", std::string(buf)); - EXPECT_EQ(3, SafeSPrintf(buf, "%p", NULL)); - EXPECT_EQ("0x0", std::string(buf)); - EXPECT_EQ(6, SafeSPrintf(buf, "%s", NULL)); - EXPECT_EQ("", std::string(buf)); -+*/ - #if defined(__GCC__) - #pragma GCC diagnostic pop - #endif ---- content/browser/frame_host/render_widget_host_view_guest.cc.orig 2014-03-05 22:24:07.000000000 +0100 -+++ content/browser/frame_host/render_widget_host_view_guest.cc 2014-03-09 20:01:20.000000000 +0100 -@@ -258,11 +258,11 @@ - - gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const { - if (!guest_) -- return static_cast(NULL); -+ return reinterpret_cast(NULL); - - RenderWidgetHostView* rwhv = guest_->GetEmbedderRenderWidgetHostView(); - if (!rwhv) -- return static_cast(NULL); -+ return reinterpret_cast(NULL); - return rwhv->GetNativeViewId(); - } -- ---- ./third_party/webrtc/base/taskrunner.cc.orig 2014-08-20 21:04:28.000000000 +0200 -+++ ./third_party/webrtc/base/taskrunner.cc 2014-08-22 18:55:46.000000000 +0200 +--- third_party/webrtc/base/taskrunner.cc 2015-04-15 00:32:17.000000000 +0200 ++++ third_party/webrtc/base/taskrunner.cc 2015-04-18 22:10:53.000000000 +0200 @@ -102,7 +102,7 @@ std::vector::iterator it; it = std::remove(tasks_.begin(), @@ -245,20 +222,9 @@ tasks_.erase(it, tasks_.end()); ---- v8/src/unique.h.orig 2014-10-10 11:16:50.000000000 +0200 -+++ v8/src/unique.h 2014-10-13 18:55:35.000000000 +0200 -@@ -110,7 +110,7 @@ - - // TODO(titzer): this is a hack to migrate to Unique incrementally. - static Unique CreateUninitialized(Handle handle) { -- return Unique(reinterpret_cast
(NULL), handle); -+ return Unique(static_cast
(NULL), handle); - } - - static Unique CreateImmovable(Handle handle) { ---- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-01-25 14:52:44 UTC -+++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc -@@ -2072,7 +2072,7 @@ +--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-15 00:32:17.000000000 +0200 ++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc 2015-04-18 22:13:27.000000000 +0200 +@@ -1754,7 +1754,7 @@ const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { FATAL() << "Not implemented yet."; @@ -267,7 +233,7 @@ } const CodecInst* AudioCodingImpl::GetSenderCodecInst() { -@@ -2091,7 +2091,7 @@ +@@ -1773,7 +1773,7 @@ const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { FATAL() << "Not implemented yet."; @@ -276,14 +242,25 @@ } bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { ---- v8/src/debug.cc.orig 2015-01-25 14:39:37 UTC -+++ v8/src/debug.cc -@@ -565,7 +565,7 @@ +--- v8/src/debug.cc 2015-04-15 00:32:36.000000000 +0200 ++++ v8/src/debug.cc 2015-04-18 22:14:03.000000000 +0200 +@@ -573,7 +573,7 @@ thread_local_.step_out_fp_ = 0; // TODO(isolates): frames_are_dropped_? base::NoBarrier_Store(&thread_local_.current_debug_scope_, -- static_cast(NULL)); -+ reinterpret_cast(NULL)); +- static_cast(0)); ++ reinterpret_cast(0)); thread_local_.restarter_frame_function_pointer_ = NULL; } +--- v8/src/runtime/runtime-i18n.cc 2015-04-15 00:32:37.000000000 +0200 ++++ v8/src/runtime/runtime-i18n.cc 2015-04-18 22:06:17.000000000 +0200 +@@ -627,7 +627,7 @@ + + local_object->SetInternalField(0, reinterpret_cast(break_iterator)); + // Make sure that the pointer to adopted text is NULL. +- local_object->SetInternalField(1, reinterpret_cast(NULL)); ++ local_object->SetInternalField(1, static_cast(NULL)); + + Factory* factory = isolate->factory(); + Handle key = factory->NewStringFromStaticChars("breakIterator"); Modified: branches/2015Q2/www/chromium/files/patch-base__process__launch.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-base__process__launch.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-base__process__launch.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,5 +1,5 @@ ---- base/process/launch.cc.orig 2014-10-10 08:54:09 UTC -+++ base/process/launch.cc +--- base/process/launch.cc.orig 2015-04-18 22:25:46.000000000 +0200 ++++ base/process/launch.cc 2015-04-18 22:26:32.000000000 +0200 @@ -24,10 +24,10 @@ fds_to_remap(NULL), maximize_rlimits(NULL), @@ -10,6 +10,6 @@ , allow_new_privs(false) -#endif // OS_LINUX +#endif // OS_LINUX || OS_FREEBSD - #if defined(OS_CHROMEOS) - , ctrl_terminal_fd(-1) - #endif // OS_CHROMEOS + #if defined(OS_POSIX) + , pre_exec_delegate(NULL) + #endif // OS_POSIX Modified: branches/2015Q2/www/chromium/files/patch-base__process__launch.h ============================================================================== --- branches/2015Q2/www/chromium/files/patch-base__process__launch.h Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-base__process__launch.h Mon Apr 27 11:18:46 2015 (r384826) @@ -1,19 +1,20 @@ ---- base/process/launch.h.orig 2014-10-10 08:54:09 UTC -+++ base/process/launch.h -@@ -113,14 +113,14 @@ +--- base/process/launch.h.orig 2015-04-18 22:29:06.000000000 +0200 ++++ base/process/launch.h 2015-04-18 22:30:09.000000000 +0200 +@@ -131,7 +131,7 @@ // will be the same as its pid. bool new_process_group; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_FREEBSD) // If non-zero, start the process using clone(), using flags as provided. - int clone_flags; - + // Unlike in clone, clone_flags may not contain a custom termination signal + // that is sent to the parent when the child dies. The termination signal will +@@ -141,7 +141,7 @@ // By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If // true, then this bit will not be set in the new child process. bool allow_new_privs; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_FREEBSD) - #if defined(OS_CHROMEOS) - // If non-negative, the specified file descriptor will be set as the launched + #if defined(OS_POSIX) + // If not empty, change to this directory before execing the new process. Modified: branches/2015Q2/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2015Q2/www/chromium/files/patch-build__common.gypi Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-build__common.gypi Mon Apr 27 11:18:46 2015 (r384826) @@ -1,6 +1,6 @@ ---- build/common.gypi.orig 2014-10-10 09:15:29 UTC -+++ build/common.gypi -@@ -91,7 +91,7 @@ +--- build/common.gypi.orig 2015-04-18 22:35:23.000000000 +0200 ++++ build/common.gypi 2015-04-18 22:42:51.000000000 +0200 +@@ -94,7 +94,7 @@ 'conditions': [ # ChromeOS and Windows use Aura and Ash. @@ -9,7 +9,7 @@ 'use_ash%': 1, 'use_aura%': 1, }], -@@ -702,7 +702,7 @@ +@@ -694,7 +694,7 @@ }], # DBus usage. @@ -18,7 +18,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -952,7 +952,7 @@ +@@ -944,7 +944,7 @@ }, { 'use_openmax_dl_fft%': 0, }], @@ -27,33 +27,33 @@ 'enable_mdns%' : 1, }], -@@ -975,7 +975,7 @@ - # except when building Android WebView or Chromecast. +@@ -968,7 +968,7 @@ + # except when building Android WebView. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. -- ['android_webview_build==0 and android_webview_telemetry_build==0 and chromecast==0', { -+ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd" and android_webview_telemetry_build==0 and chromecast==0', { +- ['android_webview_build==0', { ++ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', { 'icu_use_data_file_flag%' : 1, - 'spdy_proxy_auth_origin%': '', - 'data_reduction_proxy_probe_url%': '', -@@ -1228,6 +1228,10 @@ + }, { + 'icu_use_data_file_flag%' : 0, +@@ -1216,6 +1216,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, + # XXX(rene) More options, keep them? + 'os_ver%': 0, -+ 'use_system_libjpeg%': 0, ++ 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4391,6 +4395,13 @@ +@@ -4479,6 +4483,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], + 'ldflags!': [ + '-ldl', -+ '-pie', ++ '-pie' + ], + 'libraries!': [ + '-ldl', Modified: branches/2015Q2/www/chromium/files/patch-cc__layers__layer_impl.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-cc__layers__layer_impl.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-cc__layers__layer_impl.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,7 +1,7 @@ ---- cc/layers/layer_impl.cc.orig 2015-01-20 21:28:14 UTC -+++ cc/layers/layer_impl.cc -@@ -1239,21 +1239,23 @@ - scale_factor * scaled_scroll_bounds.height()); +--- cc/layers/layer_impl.cc.orig 2015-04-18 22:47:03.000000000 +0200 ++++ cc/layers/layer_impl.cc 2015-04-18 22:52:19.000000000 +0200 +@@ -1230,13 +1230,15 @@ + gfx::ToFlooredSize(gfx::ScaleSize(BoundsForScrolling(), scale_factor)); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); - gfx::ScrollOffset max_offset( @@ -19,14 +19,4 @@ + return _max_offset; } - gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() { -- gfx::ScrollOffset max_offset = MaxScrollOffset(); -+ gfx::ScrollOffset _max_offset = MaxScrollOffset(); - gfx::ScrollOffset old_offset = TotalScrollOffset(); - gfx::ScrollOffset clamped_offset = old_offset; - -- clamped_offset.SetToMin(max_offset); -+ clamped_offset.SetToMin(_max_offset); - clamped_offset.SetToMax(gfx::ScrollOffset()); - gfx::Vector2dF delta = clamped_offset.DeltaFrom(old_offset); - if (!delta.IsZero()) + gfx::ScrollOffset LayerImpl::ClampScrollOffsetToLimits( Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-10 09:15:30 UTC -+++ chrome/browser/chrome_content_browser_client.cc -@@ -434,7 +434,7 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2015-04-18 22:54:06.000000000 +0200 ++++ chrome/browser/chrome_content_browser_client.cc 2015-04-18 22:58:13.000000000 +0200 +@@ -446,7 +446,7 @@ return false; } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -491,7 +491,7 @@ +@@ -503,7 +503,7 @@ return -1; } @@ -18,34 +18,25 @@ #if !defined(OS_CHROMEOS) GURL GetEffectiveURLForSignin(const GURL& url) { -@@ -1194,7 +1194,7 @@ - - void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( - CommandLine* command_line, int child_process_id) { --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) +@@ -1295,7 +1295,7 @@ + command_line->AppendSwitchASCII(switches::kMetricsClientID, + client_info->client_id); + } +-#elif defined(OS_POSIX) ++#elif defined(OS_POSIX) && !defined(OS_BSD) if (breakpad::IsCrashReporterEnabled()) { scoped_ptr client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -1202,7 +1202,7 @@ - client_info ? client_info->client_id - : std::string()); - } --#endif // defined(OS_POSIX) -+#endif // defined(OS_POSIX) && !defined(OS_BSD) - - if (logging::DialogsAreSuppressed()) - command_line->AppendSwitch(switches::kNoErrorDialogs); -@@ -2408,7 +2408,7 @@ +@@ -2409,7 +2409,7 @@ } } -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( - const CommandLine& command_line, + const base::CommandLine& command_line, int child_process_id, -@@ -2474,7 +2474,7 @@ +@@ -2494,7 +2494,7 @@ } #endif // defined(OS_ANDROID) } Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,5 +1,5 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-01-24 21:45:08 UTC -+++ chrome/browser/download/download_shelf_context_menu.cc +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-04-18 23:29:54.000000000 +0200 ++++ chrome/browser/download/download_shelf_context_menu.cc 2015-04-18 23:31:51.000000000 +0200 @@ -122,7 +122,7 @@ return download_item_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_item_); @@ -18,10 +18,10 @@ (defined(OS_MACOSX) && !defined(OS_IOS)) if (CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); -@@ -390,14 +390,14 @@ - #if defined(OS_WIN) - if (CanOpenPdfInSystemViewer()) - return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER; +@@ -392,14 +392,14 @@ + return IsAdobeReaderDefaultPDFViewer() + ? IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER + : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; -#elif defined(OS_MACOSX) || defined(OS_LINUX) +#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) if (CanOpenPdfInSystemViewer()) @@ -35,12 +35,3 @@ bool DownloadShelfContextMenu::IsDownloadPdf() const { base::FilePath path = download_item_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -409,7 +409,7 @@ - return IsDownloadPdf() && - (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date_ : - true); --#elif defined(OS_MACOSX) || defined(OS_LINUX) -+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - return IsDownloadPdf(); - #endif - } Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,20 +1,11 @@ ---- chrome/browser/ssl/ssl_blocking_page.cc.orig 2015-01-21 20:28:15 UTC -+++ chrome/browser/ssl/ssl_blocking_page.cc -@@ -237,7 +237,7 @@ - #elif defined(OS_IOS) +--- chrome/browser/ssl/ssl_blocking_page.cc.orig 2015-04-18 23:34:15.000000000 +0200 ++++ chrome/browser/ssl/ssl_blocking_page.cc 2015-04-18 23:40:51.000000000 +0200 +@@ -132,7 +132,7 @@ // iOS does not have a way to launch the date and time settings. NOTREACHED(); + -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) struct ClockCommand { const char* pathname; const char* argument; -@@ -289,7 +289,7 @@ - #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) - base::LaunchOptions options; - options.wait = false; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - options.allow_new_privs = true; - #endif - base::LaunchProcess(command, options, NULL); Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc (from r384824, head/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc Mon Apr 27 11:18:46 2015 (r384826, copy of r384824, head/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2015-04-20 19:15:53.000000000 +0200 ++++ chrome/browser/tracing/crash_service_uploader.cc 2015-04-20 19:16:21.000000000 +0200 +@@ -127,6 +127,8 @@ + const char product[] = "Chrome_Android"; + #elif defined(OS_CHROMEOS) + const char product[] = "Chrome_ChromeOS"; ++#elif defined(OS_FREEBSD) ++ const char product[] = "Chrome_FreeBSD"; + #else + #error Platform not supported. + #endif Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-10 08:54:11 UTC -+++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -36,7 +36,7 @@ - #include "ui/views/controls/menu/menu_runner.h" - #include "ui/views/widget/native_widget.h" - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - #include "chrome/browser/shell_integration_linux.h" +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2015-04-18 23:43:03.000000000 +0200 ++++ chrome/browser/ui/views/frame/browser_frame.cc 2015-04-18 23:46:33.000000000 +0200 +@@ -33,7 +33,7 @@ + #include "ash/shell.h" #endif -@@ -110,7 +110,7 @@ +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" #endif + +@@ -82,7 +82,7 @@ + non_client_view()->set_context_menu_controller(this); } --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - // Set up a custom WM_CLASS for some sorts of window types. This allows - // task switchers in X11 environments to distinguish between main browser - // windows and e.g app windows. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_)); + #endif + } Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,15 +1,15 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-10 09:15:30 UTC -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc -@@ -52,7 +52,7 @@ - #include "ui/views/window/frame_background.h" - #include "ui/views/window/window_shape.h" +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2015-04-18 23:48:58.000000000 +0200 ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc 2015-04-18 23:53:50.000000000 +0200 +@@ -54,7 +54,7 @@ + #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h" + #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -77,7 +77,7 @@ +@@ -79,7 +79,7 @@ // The icon never shrinks below 16 px on a side. const int kIconMinimumSize = 16; @@ -18,25 +18,16 @@ // The number of pixels to move the frame background image upwards when using // the GTK+ theme and the titlebar is condensed. const int kGTKThemeCondensedFrameTopInset = 15; -@@ -318,7 +318,7 @@ +@@ -341,7 +341,7 @@ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, const gfx::Point& point) { -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_BSD) views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), -@@ -571,7 +571,7 @@ - } - - bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - // Do not show the custom title bar if the system title bar option is enabled. - if (!frame()->UseCustomFrame()) - return false; -@@ -616,7 +616,7 @@ +@@ -637,7 +637,7 @@ frame_background_->set_theme_image(GetFrameImage()); frame_background_->set_theme_overlay_image(GetFrameOverlayImage()); frame_background_->set_top_area_height(GetTopAreaHeight()); Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,7 +1,16 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2014-10-10 09:15:30 UTC -+++ chrome/browser/ui/webui/about_ui.cc -@@ -761,7 +761,7 @@ - return data; +--- chrome/browser/ui/webui/about_ui.cc.orig 2015-04-18 23:56:37.000000000 +0200 ++++ chrome/browser/ui/webui/about_ui.cc 2015-04-20 19:06:22.000000000 +0200 +@@ -64,7 +64,7 @@ + #include "chrome/browser/ui/webui/theme_source.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "content/public/browser/zygote_host_linux.h" + #include "content/public/common/sandbox_linux.h" + #endif +@@ -659,7 +659,7 @@ + } } -#if defined(OS_LINUX) || defined(OS_OPENBSD) @@ -9,15 +18,15 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -777,6 +777,7 @@ +@@ -675,6 +675,7 @@ return data; } +#if !defined(OS_BSD) - void AboutSandboxRow(std::string* data, const std::string& prefix, int name_id, - bool good) { + void AboutSandboxRow(std::string* data, int name_id, bool good) { data->append(""); -@@ -847,6 +848,7 @@ + data->append(l10n_util::GetStringUTF8(name_id)); +@@ -742,6 +743,7 @@ return data; } #endif @@ -25,7 +34,7 @@ // AboutMemoryHandler ---------------------------------------------------------- -@@ -1019,7 +1021,7 @@ +@@ -914,7 +916,7 @@ } else if (source_name_ == chrome::kChromeUIDNSHost) { AboutDnsHandler::Start(profile(), callback); return; @@ -34,3 +43,12 @@ } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) { response = AboutLinuxProxyConfig(); #endif +@@ -928,7 +930,7 @@ + ChromeOSCreditsHandler::Start(path, callback); + return; + #endif +-#if defined(OS_LINUX) || defined(OS_OPENBSD) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_FREEBSD) + } else if (source_name_ == chrome::kChromeUISandboxHost) { + response = AboutSandbox(); + #endif Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-01-21 20:28:16 UTC -+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -511,7 +511,7 @@ +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-04-19 00:04:55.000000000 +0200 ++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc 2015-04-19 00:05:15.000000000 +0200 +@@ -249,7 +249,7 @@ #if !defined(OS_ANDROID) - || url.host() == chrome::kChromeUITermsHost + || url.host() == chrome::kChromeUITermsHost #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) - || url.host() == chrome::kChromeUILinuxProxyConfigHost - || url.host() == chrome::kChromeUISandboxHost + || url.host() == chrome::kChromeUILinuxProxyConfigHost + || url.host() == chrome::kChromeUISandboxHost #endif Modified: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,15 +1,22 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2015-01-21 20:28:16 UTC -+++ chrome/browser/ui/webui/options/browser_options_handler.cc -@@ -359,7 +359,7 @@ - { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, - { "translateEnableTranslate", - IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2015-04-19 00:13:56.000000000 +0200 ++++ chrome/browser/ui/webui/options/browser_options_handler.cc 2015-04-19 00:14:26.000000000 +0200 +@@ -470,13 +470,13 @@ + { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL }, + #endif // defined(OS_CHROMEOS) + -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_CHROMEOS) { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -692,7 +692,7 @@ + #else + { "themes", IDS_THEMES_GROUP_NAME }, +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // defined(OS_POSIX) && !defined(OS_CHROMEOS) + + #if defined(OS_CHROMEOS) && defined(USE_ASH) + { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, +@@ -718,7 +718,7 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); @@ -18,7 +25,7 @@ web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1342,7 +1342,7 @@ +@@ -1384,7 +1384,7 @@ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; @@ -27,7 +34,7 @@ bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::FundamentalValue native_theme_enabled(!is_system_theme && -@@ -1364,7 +1364,7 @@ +@@ -1406,7 +1406,7 @@ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } Copied: branches/2015Q2/www/chromium/files/patch-chrome__chrome_exe.gypi (from r384824, head/www/chromium/files/patch-chrome__chrome_exe.gypi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__chrome_exe.gypi Mon Apr 27 11:18:46 2015 (r384826, copy of r384824, head/www/chromium/files/patch-chrome__chrome_exe.gypi) @@ -0,0 +1,11 @@ +--- chrome/chrome_exe.gypi.orig 2015-04-20 20:19:42.000000000 +0200 ++++ chrome/chrome_exe.gypi 2015-04-20 20:21:17.000000000 +0200 +@@ -190,7 +190,7 @@ + '../build/linux/system.gyp:xext', + ], + }], +- ['OS=="linux" and enable_plugins==1', { ++ ['(OS=="linux" or os_bsd==1) and enable_plugins==1', { + 'dependencies': [ + '../pdf/pdf.gyp:pdf', + ], Modified: branches/2015Q2/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,5 +1,5 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2014-10-10 08:54:12 UTC -+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc +--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2015-04-19 00:16:05.000000000 +0200 ++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc 2015-04-19 00:17:03.000000000 +0200 @@ -13,7 +13,7 @@ #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/serialized_structs.h" @@ -9,10 +9,10 @@ #include "content/public/common/child_process_sandbox_support_linux.h" #endif -@@ -25,14 +25,14 @@ +@@ -24,14 +24,14 @@ + const ppapi::proxy::SerializedFontDescription& description, PP_PrivateFontCharset charset) - : ResourceHost(host->GetPpapiHost(), instance, resource), - renderer_ppapi_host_(host) { + : ResourceHost(host->GetPpapiHost(), instance, resource) { -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) fd_.reset(content::MatchFontWithFallback( @@ -26,7 +26,7 @@ } PepperFlashFontFileHost::~PepperFlashFontFileHost() {} -@@ -52,7 +52,7 @@ +@@ -51,7 +51,7 @@ uint32_t table) { std::string contents; int32_t result = PP_ERROR_FAILED; @@ -35,7 +35,7 @@ int fd = fd_.get(); if (fd != -1) { size_t length = 0; -@@ -68,7 +68,7 @@ +@@ -67,7 +67,7 @@ } } } Copied: branches/2015Q2/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h (from r384824, head/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h Mon Apr 27 11:18:46 2015 (r384826, copy of r384824, head/www/chromium/files/patch-components__printing__renderer__print_web_view_helper.h) @@ -0,0 +1,11 @@ +--- components/printing/renderer/print_web_view_helper.h.orig 2015-04-20 18:54:28.000000000 +0200 ++++ components/printing/renderer/print_web_view_helper.h 2015-04-20 18:55:05.000000000 +0200 +@@ -246,7 +246,7 @@ + void FinishFramePrinting(); + + // Prints the page listed in |params|. +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) + void PrintPageInternal(const PrintMsg_PrintPage_Params& params, + blink::WebFrame* frame, + PdfMetafileSkia* metafile); Modified: branches/2015Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc ============================================================================== --- branches/2015Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Mon Apr 27 11:11:25 2015 (r384825) +++ branches/2015Q2/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc Mon Apr 27 11:18:46 2015 (r384826) @@ -1,5 +1,5 @@ ---- components/storage_monitor/storage_monitor_freebsd.cc.orig 2014-10-13 17:11:08 UTC -+++ components/storage_monitor/storage_monitor_freebsd.cc +--- components/storage_monitor/storage_monitor_freebsd.cc.orig 1970-01-01 01:00:00.000000000 +0100 ++++ components/storage_monitor/storage_monitor_freebsd.cc 2015-04-19 19:38:05.000000000 +0200 @@ -0,0 +1,102 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -56,15 +56,15 @@ + command.push_back(path.value()); + + base::LaunchOptions options; -+ base::ProcessHandle handle; -+ if (!base::LaunchProcess(command, options, &handle)) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Mon Apr 27 15:59:45 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3D30875; Mon, 27 Apr 2015 15:59:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1D82176D; Mon, 27 Apr 2015 15:59:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RFxjmZ037332; Mon, 27 Apr 2015 15:59:45 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RFxjHX037331; Mon, 27 Apr 2015 15:59:45 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201504271559.t3RFxjHX037331@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 27 Apr 2015 15:59:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384860 - branches/2015Q2/www/aria2/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 15:59:45 -0000 Author: sunpoet Date: Mon Apr 27 15:59:45 2015 New Revision: 384860 URL: https://svnweb.freebsd.org/changeset/ports/384860 Log: MFH: r384841 - Fix build on 9.x (OpenSSL 0.9.8) Approved by: portmgr (erwin) Added: branches/2015Q2/www/aria2/files/patch-src-LibsslTLSContext.cc - copied unchanged from r384841, head/www/aria2/files/patch-src-LibsslTLSContext.cc Modified: Directory Properties: branches/2015Q2/ (props changed) Copied: branches/2015Q2/www/aria2/files/patch-src-LibsslTLSContext.cc (from r384841, head/www/aria2/files/patch-src-LibsslTLSContext.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/aria2/files/patch-src-LibsslTLSContext.cc Mon Apr 27 15:59:45 2015 (r384860, copy of r384841, head/www/aria2/files/patch-src-LibsslTLSContext.cc) @@ -0,0 +1,23 @@ +--- src/LibsslTLSContext.cc.orig 2015-02-23 14:34:01 UTC ++++ src/LibsslTLSContext.cc +@@ -103,14 +103,20 @@ OpenSSLTLSContext::OpenSSLTLSContext(TLS + + long ver_opts = 0; + switch(minVer) { ++#ifdef SSL_OP_NO_TLSv1_1 + case TLS_PROTO_TLS12: + ver_opts |= SSL_OP_NO_TLSv1_1; ++#endif // SSL_OP_NO_TLSv1_1 + // fall through ++#ifdef SSL_OP_NO_TLSv1 + case TLS_PROTO_TLS11: + ver_opts |= SSL_OP_NO_TLSv1; ++#endif // SSL_OP_NO_TLSv1 + // fall through ++#ifdef SSL_OP_NO_SSLv3 + case TLS_PROTO_TLS10: + ver_opts |= SSL_OP_NO_SSLv3; ++#endif // SSL_OP_NO_SSLv3 + default: + break; + }; From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 28 17:16:17 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B269073A; Tue, 28 Apr 2015 17:16:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A07161B09; Tue, 28 Apr 2015 17:16:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SHGHt3097490; Tue, 28 Apr 2015 17:16:17 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SHGHTI097484; Tue, 28 Apr 2015 17:16:17 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201504281716.t3SHGHTI097484@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 28 Apr 2015 17:16:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384921 - branches/2015Q2/german/wordpress X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 17:16:17 -0000 Author: sunpoet Date: Tue Apr 28 17:16:16 2015 New Revision: 384921 URL: https://svnweb.freebsd.org/changeset/ports/384921 Log: MFH: r384914 - Update to 4.2.1 Changes: https://de.wordpress.org/2015/04/27/wordpress-4-2-1-security-release/ Approved by: portmgr (erwin) Modified: branches/2015Q2/german/wordpress/Makefile branches/2015Q2/german/wordpress/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/german/wordpress/Makefile ============================================================================== --- branches/2015Q2/german/wordpress/Makefile Tue Apr 28 17:14:23 2015 (r384920) +++ branches/2015Q2/german/wordpress/Makefile Tue Apr 28 17:16:16 2015 (r384921) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.1 +PORTVERSION= 4.2.1 CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ DISTNAME= ${PORTNAME}-${PORTVERSION}-de_DE Modified: branches/2015Q2/german/wordpress/distinfo ============================================================================== --- branches/2015Q2/german/wordpress/distinfo Tue Apr 28 17:14:23 2015 (r384920) +++ branches/2015Q2/german/wordpress/distinfo Tue Apr 28 17:16:16 2015 (r384921) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.1-de_DE.tar.gz) = 7dd651026f43a4c6f767eabaa0f32677a359e9b8c078452850a723ea68f49e45 -SIZE (wordpress-4.1-de_DE.tar.gz) = 6622597 +SHA256 (wordpress-4.2.1-de_DE.tar.gz) = 01268a6b673d53265cea9f24f6e00925968d68b33b3aa7cab871974bf14707a5 +SIZE (wordpress-4.2.1-de_DE.tar.gz) = 6744594 From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 28 17:47:34 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62FC930A; Tue, 28 Apr 2015 17:47:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5142E1EC6; Tue, 28 Apr 2015 17:47:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SHlYAc013002; Tue, 28 Apr 2015 17:47:34 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SHlXS9013000; Tue, 28 Apr 2015 17:47:33 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201504281747.t3SHlXS9013000@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 28 Apr 2015 17:47:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384926 - branches/2015Q2/www/wordpress X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 17:47:34 -0000 Author: sunpoet Date: Tue Apr 28 17:47:33 2015 New Revision: 384926 URL: https://svnweb.freebsd.org/changeset/ports/384926 Log: MFH: r384923 - Update to 4.2.1 Changes: https://wordpress.org/news/2015/04/wordpress-4-2-1/ PR: 199763 Submitted by: Yuan-Chung Hsiao (maintainer) Approved by: portmgr (erwin) Modified: branches/2015Q2/www/wordpress/Makefile branches/2015Q2/www/wordpress/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/wordpress/Makefile ============================================================================== --- branches/2015Q2/www/wordpress/Makefile Tue Apr 28 17:46:25 2015 (r384925) +++ branches/2015Q2/www/wordpress/Makefile Tue Apr 28 17:47:33 2015 (r384926) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.1 +PORTVERSION= 4.2.1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ Modified: branches/2015Q2/www/wordpress/distinfo ============================================================================== --- branches/2015Q2/www/wordpress/distinfo Tue Apr 28 17:46:25 2015 (r384925) +++ branches/2015Q2/www/wordpress/distinfo Tue Apr 28 17:47:33 2015 (r384926) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.1.tar.gz) = 3743d82698571903382dc223940e712f7bb5cfd20cedba7b7c32c97d470defab -SIZE (wordpress-4.1.tar.gz) = 6183711 +SHA256 (wordpress-4.2.1.tar.gz) = 97896ce12d305813f6a07e4032ebd2a7bbb47f6e3d1622cec66c2e4884e3b1cd +SIZE (wordpress-4.2.1.tar.gz) = 6321767 From owner-svn-ports-branches@FreeBSD.ORG Tue Apr 28 20:42:45 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B84FA294; Tue, 28 Apr 2015 20:42:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6D591464; Tue, 28 Apr 2015 20:42:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SKgjTn005289; Tue, 28 Apr 2015 20:42:45 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SKgj0I005288; Tue, 28 Apr 2015 20:42:45 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201504282042.t3SKgj0I005288@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Tue, 28 Apr 2015 20:42:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384941 - branches/2015Q2/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Apr 2015 20:42:45 -0000 Author: rene Date: Tue Apr 28 20:42:44 2015 New Revision: 384941 URL: https://svnweb.freebsd.org/changeset/ports/384941 Log: MFH: r384940 www/chromium: fix patching on FreeBSD < 10 (linking still fails because of a double symbol). Submitted by: pkg-fallout, various people on chromium@ Approved by: portmgr (erwin) Deleted: branches/2015Q2/www/chromium/files/patch-v8__src__debug.cc Modified: branches/2015Q2/www/chromium/files/extra-patch-clang Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2015Q2/www/chromium/files/extra-patch-clang Tue Apr 28 20:32:08 2015 (r384940) +++ branches/2015Q2/www/chromium/files/extra-patch-clang Tue Apr 28 20:42:44 2015 (r384941) @@ -242,17 +242,6 @@ } bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { ---- v8/src/debug.cc 2015-04-15 00:32:36.000000000 +0200 -+++ v8/src/debug.cc 2015-04-18 22:14:03.000000000 +0200 -@@ -573,7 +573,7 @@ - thread_local_.step_out_fp_ = 0; - // TODO(isolates): frames_are_dropped_? - base::NoBarrier_Store(&thread_local_.current_debug_scope_, -- static_cast(0)); -+ reinterpret_cast(0)); - thread_local_.restarter_frame_function_pointer_ = NULL; - } - --- v8/src/runtime/runtime-i18n.cc 2015-04-15 00:32:37.000000000 +0200 +++ v8/src/runtime/runtime-i18n.cc 2015-04-18 22:06:17.000000000 +0200 @@ -627,7 +627,7 @@ From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 29 16:45:22 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97DD0FA9; Wed, 29 Apr 2015 16:45:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 78AAD181B; Wed, 29 Apr 2015 16:45:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TGjMPE004659; Wed, 29 Apr 2015 16:45:22 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TGjLXI004653; Wed, 29 Apr 2015 16:45:21 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201504291645.t3TGjLXI004653@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Wed, 29 Apr 2015 16:45:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384992 - in branches/2015Q2/deskutils/virt-manager: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 16:45:22 -0000 Author: jgh Date: Wed Apr 29 16:45:21 2015 New Revision: 384992 URL: https://svnweb.freebsd.org/changeset/ports/384992 Log: MFH: r383599 - fix outdated dependencies, and address old api [1] - while here address autoplist issue and sort python variables Approved by: ports-secteam With hat: ports-secteam Added: branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon.py - copied unchanged from r383599, head/deskutils/virt-manager/files/patch-virtManager_serialcon.py Modified: branches/2015Q2/deskutils/virt-manager/Makefile branches/2015Q2/deskutils/virt-manager/files/patch-setup.py Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/deskutils/virt-manager/Makefile ============================================================================== --- branches/2015Q2/deskutils/virt-manager/Makefile Wed Apr 29 16:43:40 2015 (r384991) +++ branches/2015Q2/deskutils/virt-manager/Makefile Wed Apr 29 16:45:21 2015 (r384992) @@ -2,7 +2,7 @@ PORTNAME= virt-manager PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ \ LOCAL/jgh/deskutils/${PORTNAME}/ @@ -15,20 +15,20 @@ LICENSE= LGPL3 LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \ - ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2:${PORTSDIR}/x11-toolkits/py-vte \ + vte3>=0:${PORTSDIR}/x11-toolkits/vte3 \ ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:${PORTSDIR}/www/py-urlgrabber \ ${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt \ gtk-vnc>=0.4.4:${PORTSDIR}/net/gtk-vnc \ libvirt-glib>=0.1.9:${PORTSDIR}/devel/libvirt-glib \ libosinfo>=0:${PORTSDIR}/devel/libosinfo \ - ${PYTHON_PKGNAMEPREFIX}spice-gtk>=0.26:${PORTSDIR}/deskutils/py-spice-gtk + spice-gtk>=0.26:${PORTSDIR}/deskutils/spice-gtk PYDISTUTILS_INSTALLNOSINGLE= yes PYDISTUTILS_CONFIGURE_TARGET= configure PYDISTUTILS_CONFIGUREARGS= --prefix=${PREFIX} USES= python:2.7 gettext shebangfix -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils USE_GNOME= introspection:run intltool librsvg2 pygobject3 @@ -41,4 +41,11 @@ SHEBANG_FILES= virt-manager \ GLIB_SCHEMAS= org.virt-manager.virt-manager.gschema.xml +#add workaround for two autoplist functions +post-install: + @${MKDIR} ${STAGEDIR}/${PREFIX}/share/glib-2.0/schemas/ +.for file in ${GLIB_SCHEMAS} + ${INSTALL_DATA} ${WRKSRC}/data/${file} ${STAGEDIR}/${PREFIX}/share/glib-2.0/schemas +.endfor + .include Modified: branches/2015Q2/deskutils/virt-manager/files/patch-setup.py ============================================================================== --- branches/2015Q2/deskutils/virt-manager/files/patch-setup.py Wed Apr 29 16:43:40 2015 (r384991) +++ branches/2015Q2/deskutils/virt-manager/files/patch-setup.py Wed Apr 29 16:45:21 2015 (r384992) @@ -15,8 +15,12 @@ class my_install(install): """ Error if we weren't 'configure'd with the correct install prefix -@@ -605,7 +597,7 @@ setup( - ["data/org.virt-manager.virt-manager.gschema.xml"]), +@@ -601,11 +593,9 @@ setup( + "virt-convert", + "virt-xml", + ]), +- ("share/glib-2.0/schemas", +- ["data/org.virt-manager.virt-manager.gschema.xml"]), ("share/virt-manager/ui", glob.glob("ui/*.ui")), - ("share/man/man1", [ @@ -24,7 +28,7 @@ "man/virt-manager.1", "man/virt-install.1", "man/virt-clone.1", -@@ -627,7 +619,6 @@ setup( +@@ -627,7 +617,6 @@ setup( 'sdist': my_sdist, 'install': my_install, Copied: branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon.py (from r383599, head/deskutils/virt-manager/files/patch-virtManager_serialcon.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon.py Wed Apr 29 16:45:21 2015 (r384992, copy of r383599, head/deskutils/virt-manager/files/patch-virtManager_serialcon.py) @@ -0,0 +1,10 @@ +--- virtManager/serialcon.py.orig 2014-07-28 15:11:32 UTC ++++ virtManager/serialcon.py +@@ -326,7 +326,6 @@ class vmmSerialConsole(vmmGObject): + self.terminal = Vte.Terminal() + self.terminal.set_scrollback_lines(1000) + self.terminal.set_audible_bell(False) +- self.terminal.set_visible_bell(True) + + self.terminal.connect("button-press-event", self.show_serial_rcpopup) + self.terminal.connect("commit", self.console.send_data, self.terminal) From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 29 16:46:55 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A42034F; Wed, 29 Apr 2015 16:46:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B89E183E; Wed, 29 Apr 2015 16:46:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TGks4d005017; Wed, 29 Apr 2015 16:46:54 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TGks3p005015; Wed, 29 Apr 2015 16:46:54 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201504291646.t3TGks3p005015@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Wed, 29 Apr 2015 16:46:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384993 - in branches/2015Q2/deskutils/virt-manager: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 16:46:55 -0000 Author: jgh Date: Wed Apr 29 16:46:53 2015 New Revision: 384993 URL: https://svnweb.freebsd.org/changeset/ports/384993 Log: MFH: r384986 - fix Xen text console issue Approved by: ports-secteam With hat: ports-secteam Added: branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py - copied unchanged from r384986, head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py Modified: branches/2015Q2/deskutils/virt-manager/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/deskutils/virt-manager/Makefile ============================================================================== --- branches/2015Q2/deskutils/virt-manager/Makefile Wed Apr 29 16:45:21 2015 (r384992) +++ branches/2015Q2/deskutils/virt-manager/Makefile Wed Apr 29 16:46:53 2015 (r384993) @@ -2,7 +2,7 @@ PORTNAME= virt-manager PORTVERSION= 1.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ \ LOCAL/jgh/deskutils/${PORTNAME}/ Copied: branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py (from r384986, head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py Wed Apr 29 16:46:53 2015 (r384993, copy of r384986, head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py) @@ -0,0 +1,32 @@ +From 0aeee5c449d608d75f5632e9aa47f5e433eb3879 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Sun, 26 Apr 2015 11:50:01 -0400 +Subject: serialcon: Fix opening with xen (bz 1215357) + +Apparently xen doesn't set device alias names, and OpenConsole +just opens the first device unconditionally. + +Properly handling that would be to report it in the UI that we can +only open the first console, but for now just drop the alias check. +Apparently SUSE already does this as mentioned in the RH bug + +https://bugzilla.redhat.com/show_bug.cgi?id=1215357 + +diff --git a/virtManager/serialcon.py b/virtManager/serialcon.py +index 92c2029..320811b 100644 +--- ./virtManager/serialcon.py ++++ ./virtManager/serialcon.py +@@ -205,8 +205,9 @@ class LibvirtConsoleConnection(ConsoleConnection): + name = dev and dev.alias.name or None + logging.debug("Opening console stream for dev=%s alias=%s", + dev, name) +- if not name: +- raise RuntimeError(_("Cannot open a device with no alias name")) ++ # libxl doesn't set aliases, their open_console just defaults to ++ # opening the first console device, so don't force prescence of ++ # an alias + + stream = self.conn.get_backend().newStream(libvirt.VIR_STREAM_NONBLOCK) + self.vm.open_console(name, stream) +-- +cgit v0.10.2 From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 29 19:14:29 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 84F4D845; Wed, 29 Apr 2015 19:14:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7310C1B0F; Wed, 29 Apr 2015 19:14:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TJETll079864; Wed, 29 Apr 2015 19:14:29 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TJETlf079863; Wed, 29 Apr 2015 19:14:29 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201504291914.t3TJETlf079863@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Wed, 29 Apr 2015 19:14:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385005 - branches/2015Q2/graphics/cimg/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 19:14:29 -0000 Author: thierry Date: Wed Apr 29 19:14:28 2015 New Revision: 385005 URL: https://svnweb.freebsd.org/changeset/ports/385005 Log: MFH: r384603 At some point, LDFLAGS got lost; reintroduce it, because it is required when libgfortran is linked with Gcc. Reminded by: jbeich Approved by: portmgr (fix pkg-fallout errors) Modified: branches/2015Q2/graphics/cimg/files/patch-examples__Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/graphics/cimg/files/patch-examples__Makefile ============================================================================== --- branches/2015Q2/graphics/cimg/files/patch-examples__Makefile Wed Apr 29 19:08:04 2015 (r385004) +++ branches/2015Q2/graphics/cimg/files/patch-examples__Makefile Wed Apr 29 19:14:28 2015 (r385005) @@ -107,7 +107,7 @@ CIMG_BOARD_LIBS = -lboard +# Flags to compile on FreeBSD -+CIMG_FREEBSD_LDFLAGS = -ansi -ffast-math -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib ++CIMG_FREEBSD_LDFLAGS = $(LDFLAGS) -ansi -ffast-math -I$(X11PATH)/include $(EXTRA_FLAGS) -lX11 -L$(X11PATH)/lib + # Flags to compile on Sun Solaris CIMG_SOLARIS_LIBS = -R$(X11PATH)/lib -lrt -lnsl -lsocket @@ -122,15 +122,18 @@ all olinux: -@@ -378,6 +382,7 @@ $(CIMG_ZLIB_CFLAGS) \ +@@ -378,8 +382,10 @@ $(CIMG_ZLIB_CFLAGS) \ $(CIMG_CURL_CFLAGS) \ $(CIMG_OPENCV_CFLAGS) \ $(CIMG_MAGICK_CFLAGS) \ +$(CIMG_LAPACK_CFLAGS) \ $(CIMG_FFTW3_CFLAGS)" \ "CONF_LIBS = \ ++$(CIMG_FREEBSD_LDFLAGS) \ $(CIMG_X11_LIBS) \ -@@ -389,6 +394,7 @@ $(CIMG_PNG_LIBS) \ + $(CIMG_XSHM_LIBS) \ + $(CIMG_XRANDR_LIBS) \ +@@ -389,6 +395,7 @@ $(CIMG_PNG_LIBS) \ $(CIMG_JPEG_LIBS) \ $(CIMG_ZLIB_LIBS) \ $(CIMG_CURL_LIBS) \ From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 29 21:44:01 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83BDBC5C; Wed, 29 Apr 2015 21:44:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 576781BBA; Wed, 29 Apr 2015 21:44:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TLi1gI055479; Wed, 29 Apr 2015 21:44:01 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TLi083055474; Wed, 29 Apr 2015 21:44:00 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201504292144.t3TLi083055474@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 29 Apr 2015 21:44:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385015 - in branches/2015Q2: databases/evolution-data-server mail/evolution X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 21:44:01 -0000 Author: truckman Date: Wed Apr 29 21:44:00 2015 New Revision: 385015 URL: https://svnweb.freebsd.org/changeset/ports/385015 Log: MFH: r384997 Convert databases/evolution-data-server to USES=compiler:c++11-lib so that on FreeBSD 8 and 9 it will be linked to the newer libstdc++ bundled with lang/gcc. This unbreaks the startup of mail/evolution on FreeBSD 8 and 9 because evolution is also linked to webkit-gtk3, which requires the newer libstdc++ and causes rtld to fail if the base version of libstdc++ has already been loaded. PR: 199746 Approved by: portmgr (delphij) Modified: branches/2015Q2/databases/evolution-data-server/Makefile branches/2015Q2/mail/evolution/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/databases/evolution-data-server/Makefile ============================================================================== --- branches/2015Q2/databases/evolution-data-server/Makefile Wed Apr 29 21:21:05 2015 (r385014) +++ branches/2015Q2/databases/evolution-data-server/Makefile Wed Apr 29 21:44:00 2015 (r385015) @@ -4,6 +4,7 @@ PORTNAME= evolution-data-server PORTVERSION= 3.12.11 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -26,6 +27,11 @@ LIB_DEPENDS= libsoup-gnome-2.4.so:${PORT libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring USES= bison gettext gmake gperf libtool pathfix pkgconfig tar:xz +# Unbreak mail/evolution with webkit-gtk3 on FreeBSD 8 and 9. Normally +# this change would be done there, but it is not a C++ application, so it +# does not link directly to libstdc++ and adding the libstdc++ rpath to +# the executable does not work at runtime. +USES+= compiler:c++11-lib USE_GNOME= gnomeprefix gtk30 intlhack introspection:build \ libxml2 USE_OPENLDAP= yes Modified: branches/2015Q2/mail/evolution/Makefile ============================================================================== --- branches/2015Q2/mail/evolution/Makefile Wed Apr 29 21:21:05 2015 (r385014) +++ branches/2015Q2/mail/evolution/Makefile Wed Apr 29 21:44:00 2015 (r385015) @@ -4,6 +4,7 @@ PORTNAME= evolution PORTVERSION= 3.12.11 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -106,11 +107,6 @@ CONFIGURE_ARGS+=--disable-contact-maps .include -# webkit-gtk3 needs this -.if ${OSVERSION} < 1000000 -USES+= compiler:c++11-lib -.endif - post-patch: @${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \ -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \ From owner-svn-ports-branches@FreeBSD.ORG Wed Apr 29 23:50:29 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C055E836; Wed, 29 Apr 2015 23:50:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 94D21189E; Wed, 29 Apr 2015 23:50:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TNoTQf017718; Wed, 29 Apr 2015 23:50:29 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TNoTbI017716; Wed, 29 Apr 2015 23:50:29 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201504292350.t3TNoTbI017716@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 29 Apr 2015 23:50:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385017 - in branches/2015Q2/lang: gjs spidermonkey24 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Apr 2015 23:50:29 -0000 Author: truckman Date: Wed Apr 29 23:50:28 2015 New Revision: 385017 URL: https://svnweb.freebsd.org/changeset/ports/385017 Log: MFH: r385016 Convert lang/gjs and lang/spidermonkey24 to USES=compiler:c++11-lib to unbreak x11-fm/sushi on FreeBSD 8 and 9. This change causes these libraries to link to the newer version of libstdc++ bundled with lang/gcc. This causes rtld to load this version when it is linking sushi at runtime, which is needed by webkit-gtk3, another shared library linked into sushi. PR: 196078, 199434, 199435 Approved by: portmgr (delphij) Modified: branches/2015Q2/lang/gjs/Makefile branches/2015Q2/lang/spidermonkey24/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/gjs/Makefile ============================================================================== --- branches/2015Q2/lang/gjs/Makefile Wed Apr 29 22:13:10 2015 (r385016) +++ branches/2015Q2/lang/gjs/Makefile Wed Apr 29 23:50:28 2015 (r385017) @@ -4,6 +4,7 @@ PORTNAME= gjs PORTVERSION= 1.42.0 +PORTREVISION= 1 CATEGORIES= lang gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -14,7 +15,7 @@ COMMENT= GNOME Javascript binding LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24 -USES= compiler:c11 gettext gmake libtool pathfix pkgconfig \ +USES= compiler:c++11-lib gettext gmake libtool pathfix pkgconfig \ python:build tar:xz USE_GNOME= cairo glib20 gnomeprefix introspection:build \ intlhack Modified: branches/2015Q2/lang/spidermonkey24/Makefile ============================================================================== --- branches/2015Q2/lang/spidermonkey24/Makefile Wed Apr 29 22:13:10 2015 (r385016) +++ branches/2015Q2/lang/spidermonkey24/Makefile Wed Apr 29 23:50:28 2015 (r385017) @@ -3,6 +3,7 @@ PORTNAME= spidermonkey24 PORTVERSION= 24.2.0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_MOZILLA} #http://people.mozilla.org/~sstangl/ @@ -18,7 +19,7 @@ LIB_DEPENDS= libnspr4.so:${PORTSDIR}/de CONFLICTS= njs-[0-9]* GNU_CONFIGURE= yes -USES= compiler:c11 gmake pathfix perl5 python:2,build \ +USES= compiler:c++11-lib gmake pathfix perl5 python:2,build \ readline tar:bzip2 USE_PERL5= build USE_LDCONFIG= yes From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 30 11:44:55 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1046B3FB; Thu, 30 Apr 2015 11:44:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F26A31BD9; Thu, 30 Apr 2015 11:44:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UBiscX073141; Thu, 30 Apr 2015 11:44:54 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UBisoV073138; Thu, 30 Apr 2015 11:44:54 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201504301144.t3UBisoV073138@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 30 Apr 2015 11:44:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385033 - branches/2015Q2/chinese/wordpress-zh_TW X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 11:44:55 -0000 Author: sunpoet Date: Thu Apr 30 11:44:53 2015 New Revision: 385033 URL: https://svnweb.freebsd.org/changeset/ports/385033 Log: MFH: r385032 - Update to 4.1.4 PR: 199764 Submitted by: sunpoet (myself) Approved by: Joe Horn (maintainer) Approved by: portmgr (erwin) Modified: branches/2015Q2/chinese/wordpress-zh_TW/Makefile branches/2015Q2/chinese/wordpress-zh_TW/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/chinese/wordpress-zh_TW/Makefile ============================================================================== --- branches/2015Q2/chinese/wordpress-zh_TW/Makefile Thu Apr 30 11:29:39 2015 (r385032) +++ branches/2015Q2/chinese/wordpress-zh_TW/Makefile Thu Apr 30 11:44:53 2015 (r385033) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.1 +PORTVERSION= 4.1.4 CATEGORIES= chinese www MASTER_SITES= http://tw.wordpress.org/ \ http://mirror.joehorn.idv.tw/wordpress/ Modified: branches/2015Q2/chinese/wordpress-zh_TW/distinfo ============================================================================== --- branches/2015Q2/chinese/wordpress-zh_TW/distinfo Thu Apr 30 11:29:39 2015 (r385032) +++ branches/2015Q2/chinese/wordpress-zh_TW/distinfo Thu Apr 30 11:44:53 2015 (r385033) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.1-zh_TW.tar.gz) = d329b718e059d856b71b027b07fa656cf45754d0c47fb4ad30ae61ac19c1097c -SIZE (wordpress-4.1-zh_TW.tar.gz) = 6581461 +SHA256 (wordpress-4.1.4-zh_TW.tar.gz) = b153f502d4e65efb80adc153310f3e2fd58892fa95559b3a79f0359e032d5621 +SIZE (wordpress-4.1.4-zh_TW.tar.gz) = 6580508 From owner-svn-ports-branches@FreeBSD.ORG Thu Apr 30 12:01:51 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E0D35A18; Thu, 30 Apr 2015 12:01:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CF31F1E6E; Thu, 30 Apr 2015 12:01:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3UC1pYL082229; Thu, 30 Apr 2015 12:01:51 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3UC1pR0082227; Thu, 30 Apr 2015 12:01:51 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201504301201.t3UC1pR0082227@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 30 Apr 2015 12:01:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385035 - branches/2015Q2/www/chromium X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2015 12:01:52 -0000 Author: rene Date: Thu Apr 30 12:01:50 2015 New Revision: 385035 URL: https://svnweb.freebsd.org/changeset/ports/385035 Log: MFH: r385034 www/chromium: update to 42.0.2311.135 Security: 210f80b9-ede4-11e4-81c4-00262d5ed8ee Approved by: portmgr (erwin) Modified: branches/2015Q2/www/chromium/Makefile branches/2015Q2/www/chromium/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/chromium/Makefile ============================================================================== --- branches/2015Q2/www/chromium/Makefile Thu Apr 30 11:50:38 2015 (r385034) +++ branches/2015Q2/www/chromium/Makefile Thu Apr 30 12:01:50 2015 (r385035) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 42.0.2311.90 +PORTVERSION= 42.0.2311.135 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2015Q2/www/chromium/distinfo ============================================================================== --- branches/2015Q2/www/chromium/distinfo Thu Apr 30 11:50:38 2015 (r385034) +++ branches/2015Q2/www/chromium/distinfo Thu Apr 30 12:01:50 2015 (r385035) @@ -1,4 +1,4 @@ -SHA256 (chromium-42.0.2311.90.tar.xz) = 60b0eb38c1c3d0cc998dae70b7333e53b715cff2847c1652e03d1723300db4c9 -SIZE (chromium-42.0.2311.90.tar.xz) = 306502344 -SHA256 (chromium-42.0.2311.90-testdata.tar.xz) = 79bb822e879862bee121ea3b8e42e06623790552bc63689beecce680fc018163 -SIZE (chromium-42.0.2311.90-testdata.tar.xz) = 115728192 +SHA256 (chromium-42.0.2311.135.tar.xz) = c269d40e653794c219fd3eca2922d881199af5acff5d0a55b3e79f3b6a5a2aa9 +SIZE (chromium-42.0.2311.135.tar.xz) = 306488116 +SHA256 (chromium-42.0.2311.135-testdata.tar.xz) = 357dd7bdb6365f4163b2d6e58e8677561a9f4d6c8e6f106ca95ac083a6eb0ef8 +SIZE (chromium-42.0.2311.135-testdata.tar.xz) = 115723572 From owner-svn-ports-branches@FreeBSD.ORG Fri May 1 09:32:03 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 005DAF1D; Fri, 1 May 2015 09:32:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E26F6104B; Fri, 1 May 2015 09:32:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t419W2xS030124; Fri, 1 May 2015 09:32:02 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t419W2fY030123; Fri, 1 May 2015 09:32:02 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505010932.t419W2fY030123@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 1 May 2015 09:32:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385095 - branches/2015Q2/math/fityk X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 09:32:03 -0000 Author: jbeich Date: Fri May 1 09:32:02 2015 New Revision: 385095 URL: https://svnweb.freebsd.org/changeset/ports/385095 Log: MFH: r385070 (partial) math/fityk: unbreak build on 8.x/9.x (libstdc++ 4.2+) Use same compiler as www/webkit-gtk2 and x11-toolkits/wxgtk30 to avoid /usr/local/lib/libwebkitgtk-1.0.so.0: undefined reference to `std::condition_variable::wait(std::unique_lock&)@GLIBCXX_3.4.11' /usr/local/lib/libwx_baseu-3.0.so: undefined reference to `std::ctype::_M_widen_init() const@GLIBCXX_3.4.11' /usr/local/lib/libjavascriptcoregtk-1.0.so.0: undefined reference to `std::chrono::_V2::system_clock::now()@GLIBCXX_3.4.19' /usr/local/lib/libwx_baseu-3.0.so: undefined reference to `typeinfo for __cxxabiv1::__forced_unwind@CXXABI_1.3.2' Reported by: pkg-fallout Approved by: portmgr blanket Approved by: ports-secteam (delphij) Modified: branches/2015Q2/math/fityk/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/math/fityk/Makefile ============================================================================== --- branches/2015Q2/math/fityk/Makefile Fri May 1 08:54:25 2015 (r385094) +++ branches/2015Q2/math/fityk/Makefile Fri May 1 09:32:02 2015 (r385095) @@ -19,7 +19,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boos gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot -USES= desktop-file-utils gmake libtool shared-mime-info tar:bzip2 +USES= compiler:c++11-lib desktop-file-utils gmake libtool \ + shared-mime-info tar:bzip2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} LDFLAGS+= -lbz2 -lz USE_GITHUB= yes From owner-svn-ports-branches@FreeBSD.ORG Fri May 1 09:40:05 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 899E1329; Fri, 1 May 2015 09:40:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 76B8F1093; Fri, 1 May 2015 09:40:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t419e5Gi031316; Fri, 1 May 2015 09:40:05 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t419e50u031315; Fri, 1 May 2015 09:40:05 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201505010940.t419e50u031315@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Fri, 1 May 2015 09:40:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385096 - branches/2015Q2/graphics/inkscape X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 09:40:05 -0000 Author: truckman Date: Fri May 1 09:40:04 2015 New Revision: 385096 URL: https://svnweb.freebsd.org/changeset/ports/385096 Log: MFH: r385075 Unbreak graphics/inkscape build on FreeBSD 9.3 i386. The base version of clang 3.4.1 in FreeBSD 9.3 is missing some patches that are present in clang 3.4.1 in FreeBSD 10.1. One of these patches appears to fix a code generation bug on i386 that is triggered when building graphics/inkscape. Work around this issue by building inkscape with lang/clang34 from ports on FreeBSD 9.3 i386. Approved by: portmgr (delphij) Modified: branches/2015Q2/graphics/inkscape/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/graphics/inkscape/Makefile ============================================================================== --- branches/2015Q2/graphics/inkscape/Makefile Fri May 1 09:32:02 2015 (r385095) +++ branches/2015Q2/graphics/inkscape/Makefile Fri May 1 09:40:04 2015 (r385096) @@ -71,6 +71,18 @@ WPG_LIB_DEPENDS= libwpg-0.2.so:${PORTSDI CPPFLAGS+= -Wno-mismatched-tags -Wno-unknown-attributes .endif +# Base clang 3.4.1 in FreeBSD 9.3 fails to compile this code on i386 +# but base clang 3.4.1 in FreeBSD 10.1 succeeds. The difference *appears* +# to be the patch applied in r271597 (head) / r271739 (stable/10). The +# latter happened shortly before 10.1 was branched. +.if ${ARCH} == i386 && ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000 && \ + ( ${COMPILER_TYPE} == clang || ${ALT_COMPILER_TYPE} == clang ) +BUILD_DEPENDS+= clang34:${PORTSDIR}/lang/clang34 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 +.endif + post-patch: @${REINPLACE_CMD} -e 's|-ldl||g' \ ${WRKSRC}/configure From owner-svn-ports-branches@FreeBSD.ORG Fri May 1 09:43:34 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7DE8D4B2; Fri, 1 May 2015 09:43:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6BA46116B; Fri, 1 May 2015 09:43:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t419hYRY035376; Fri, 1 May 2015 09:43:34 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t419hYOG035374; Fri, 1 May 2015 09:43:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505010943.t419hYOG035374@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 1 May 2015 09:43:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385097 - branches/2015Q2/math/hfst X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 09:43:34 -0000 Author: jbeich Date: Fri May 1 09:43:33 2015 New Revision: 385097 URL: https://svnweb.freebsd.org/changeset/ports/385097 Log: MFH: r385076 math/hfst: unbreak build on 8.x/9.x (flex 2.5.4) /bin/sh ../../../build-aux/ylwrap xre_lex.ll lex.yy.c xre_lex.cc -- flex --outfile=lex.yy.c flex: unknown flag '-'. For usage, try flex --help *** [xre_lex.cc] Error code 1 Reported by: pkg-fallout Approved by: portmgr blanket Approved by: ports-secteam (delphij) Modified: branches/2015Q2/math/hfst/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/math/hfst/Makefile ============================================================================== --- branches/2015Q2/math/hfst/Makefile Fri May 1 09:40:04 2015 (r385096) +++ branches/2015Q2/math/hfst/Makefile Fri May 1 09:43:33 2015 (r385097) @@ -19,4 +19,12 @@ CONFIGURE_ARGS= --with-readline --with-u SHEBANG_FILES= tools/src/hfst-tagger/src/hfst_tagger_compute_data_statistics.py USE_LDCONFIG= yes +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033 +BUILD_DEPENDS+= flex>2.5.33:${PORTSDIR}/textproc/flex +CONFIGURE_ENV+= LEX="${FLEX}" +FLEX= ${LOCALBASE}/bin/flex +.endif + .include From owner-svn-ports-branches@FreeBSD.ORG Fri May 1 16:52:35 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F27ECEA2; Fri, 1 May 2015 16:52:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DFCB010BF; Fri, 1 May 2015 16:52:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41GqYCh048395; Fri, 1 May 2015 16:52:34 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41GqXH0048387; Fri, 1 May 2015 16:52:33 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201505011652.t41GqXH0048387@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Fri, 1 May 2015 16:52:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385127 - in branches/2015Q2/dns: powerdns powerdns-recursor powerdns-recursor/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 16:52:35 -0000 Author: brd Date: Fri May 1 16:52:33 2015 New Revision: 385127 URL: https://svnweb.freebsd.org/changeset/ports/385127 Log: MFH: r385121 r385123 Update dns/powerdns to 3.4.4 and dns/powerdns-recursor to 3.7.2 for CVE-2015-1868. Approved by: portmgr (erwin), bdrewery (mentor) Security: 64e6006e-f009-11e4-98c6-000c292ee6b8 Deleted: branches/2015Q2/dns/powerdns-recursor/files/patch-sendmsg_fix Modified: branches/2015Q2/dns/powerdns-recursor/Makefile branches/2015Q2/dns/powerdns-recursor/distinfo branches/2015Q2/dns/powerdns/Makefile branches/2015Q2/dns/powerdns/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/dns/powerdns-recursor/Makefile ============================================================================== --- branches/2015Q2/dns/powerdns-recursor/Makefile Fri May 1 16:25:48 2015 (r385126) +++ branches/2015Q2/dns/powerdns-recursor/Makefile Fri May 1 16:52:33 2015 (r385127) @@ -1,11 +1,12 @@ # Created by: sten@blinkenlights.nl # $FreeBSD$ -PORTNAME= powerdns-recursor -PORTVERSION= 3.7.1 +PORTNAME= recursor +PORTVERSION= 3.7.2 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ -DISTNAME= pdns-recursor-${PORTVERSION} +PKGNAMEPREFIX= powerdns- +DISTNAME= pdns-${PORTNAME}-${PORTVERSION} MAINTAINER= tremere@cainites.net COMMENT= Advanced DNS recursor @@ -15,9 +16,11 @@ LICENSE= GPLv2 BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam \ ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs -USES= gmake tar:bzip2 +USES= cpe gmake tar:bzip2 GNU_CONFIGURE= YES +CPE_VENDOR= powerdns + OPTIONS_DEFINE= SETUID LUA STATIC OPTIONS_DEFAULT= SETUID SETUID_DESC= Run as pdns_recursor user Modified: branches/2015Q2/dns/powerdns-recursor/distinfo ============================================================================== --- branches/2015Q2/dns/powerdns-recursor/distinfo Fri May 1 16:25:48 2015 (r385126) +++ branches/2015Q2/dns/powerdns-recursor/distinfo Fri May 1 16:52:33 2015 (r385127) @@ -1,2 +1,2 @@ -SHA256 (pdns-recursor-3.7.1.tar.bz2) = e6b0d255a0d8cd023ebd63c50f453a305c649d04873859b4119745d64b8bd36d -SIZE (pdns-recursor-3.7.1.tar.bz2) = 245155 +SHA256 (pdns-recursor-3.7.2.tar.bz2) = 1366bc1bed7c96fbd3926cf7a9e6d365c53b8a99182642debe1b2863dd015a7e +SIZE (pdns-recursor-3.7.2.tar.bz2) = 244582 Modified: branches/2015Q2/dns/powerdns/Makefile ============================================================================== --- branches/2015Q2/dns/powerdns/Makefile Fri May 1 16:25:48 2015 (r385126) +++ branches/2015Q2/dns/powerdns/Makefile Fri May 1 16:52:33 2015 (r385127) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= powerdns -PORTVERSION= 3.4.3 +PORTVERSION= 3.4.4 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} Modified: branches/2015Q2/dns/powerdns/distinfo ============================================================================== --- branches/2015Q2/dns/powerdns/distinfo Fri May 1 16:25:48 2015 (r385126) +++ branches/2015Q2/dns/powerdns/distinfo Fri May 1 16:52:33 2015 (r385127) @@ -1,2 +1,2 @@ -SHA256 (pdns-3.4.3.tar.bz2) = 5cd9a087757066427cd0c348f546cb84b4be4bd5e06c7ce969ec2bc21dbb8ce6 -SIZE (pdns-3.4.3.tar.bz2) = 1332686 +SHA256 (pdns-3.4.4.tar.bz2) = ec49f5a0b55b69ba057bf9ce28ab81e5258fc60c8d4954d9100fe3bb3efd09c8 +SIZE (pdns-3.4.4.tar.bz2) = 1336624 From owner-svn-ports-branches@FreeBSD.ORG Fri May 1 18:30:34 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 89DE3F2; Fri, 1 May 2015 18:30:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 779B01B5A; Fri, 1 May 2015 18:30:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41IUYA3000612; Fri, 1 May 2015 18:30:34 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41IUYsI000609; Fri, 1 May 2015 18:30:34 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201505011830.t41IUYsI000609@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Fri, 1 May 2015 18:30:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r385137 - branches/2015Q2/www/chromium/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 18:30:34 -0000 Author: rene Date: Fri May 1 18:30:33 2015 New Revision: 385137 URL: https://svnweb.freebsd.org/changeset/ports/385137 Log: MFH: r385071 www/chromium: fix build with GCC (FreeBSD < 10) Submitted by: Christoph Moench-Tegeder Approved by: ports-secteam (delphhij) Added: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc - copied unchanged from r385071, head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc Modified: Directory Properties: branches/2015Q2/ (props changed) Copied: branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc (from r385071, head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc Fri May 1 18:30:33 2015 (r385137, copy of r385071, head/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc) @@ -0,0 +1,11 @@ +--- ./chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2015-04-30 16:57:02.000000000 +0200 ++++ ./chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc 2015-04-30 16:56:00.000000000 +0200 +@@ -10,7 +10,7 @@ + return false; + } + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_FREEBSD) + + // static + OpaqueBrowserFrameViewPlatformSpecific*