Date: Thu, 9 Oct 2014 10:58:42 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r370514 - in branches/2014Q4/www/chromium: . files Message-ID: <201410091058.s99Awg5c011651@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Thu Oct 9 10:58:41 2014 New Revision: 370514 URL: https://svnweb.freebsd.org/changeset/ports/370514 QAT: https://qat.redports.org/buildarchive/r370514/ Log: MFH: r370512 www/chromium: Add back some patches lost in the 37 -> 38 update. Bump PORTREVISION Submitted by: tomek@apostata.org Approved by: ports-secteam (rea) Added: branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc - copied unchanged from r370512, head/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd - copied unchanged from r370512, head/www/chromium/files/patch-ui__resources__ui_resources.grd Modified: branches/2014Q4/www/chromium/Makefile Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/chromium/Makefile ============================================================================== --- branches/2014Q4/www/chromium/Makefile Thu Oct 9 10:39:02 2014 (r370513) +++ branches/2014Q4/www/chromium/Makefile Thu Oct 9 10:58:41 2014 (r370514) @@ -3,6 +3,7 @@ PORTNAME= chromium PORTVERSION= 38.0.2125.101 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Copied: branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc (from r370512, head/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc Thu Oct 9 10:58:41 2014 (r370514, copy of r370512, head/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2014-09-10 01:47:12.000000000 +0200 ++++ chrome/browser/notifications/message_center_notification_manager.cc 2014-09-18 14:21:16.000000000 +0200 +@@ -84,7 +84,7 @@ + blockers_.push_back(new FullscreenNotificationBlocker(message_center)); + + #if defined(OS_WIN) || defined(OS_MACOSX) \ +- || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // On Windows, Linux and Mac, the notification manager owns the tray icon and + // views.Other platforms have global ownership and Create will return NULL. + tray_.reset(message_center::CreateMessageCenterTray()); Copied: branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd (from r370512, head/www/chromium/files/patch-ui__resources__ui_resources.grd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd Thu Oct 9 10:58:41 2014 (r370514, copy of r370512, head/www/chromium/files/patch-ui__resources__ui_resources.grd) @@ -0,0 +1,11 @@ +--- ui/resources/ui_resources.grd.orig 2014-09-10 01:47:14.000000000 +0200 ++++ ui/resources/ui_resources.grd 2014-09-17 13:51:43.000000000 +0200 +@@ -39,7 +39,7 @@ + <structure type="chrome_scaled_image" name="IDR_APP_TOP_LEFT" file="app_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_TOP_RIGHT" file="app_top_right.png" /> + </if> +- <if expr="is_linux and use_aura"> ++ <if expr="(is_linux or is_bsd) and use_aura"> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_ALIAS" file="common/pointers/alias_big.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_CELL" file="common/pointers/cell_big.png" /> + <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_COL_RESIZE" file="common/pointers/sb_h_double_arrow_big.png" />
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410091058.s99Awg5c011651>