Date: Fri, 5 May 2017 20:44:57 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440204 - in head/www/iridium: . files Message-ID: <201705052044.v45KivCt051663@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Fri May 5 20:44:57 2017 New Revision: 440204 URL: https://svnweb.freebsd.org/changeset/ports/440204 Log: - Use HTTPS-URL in MASTER_SITES - Fix build warning: multiple rules generate base/callback_helpers.o - Remove CPE information as it is not documented for iridium browser - Remove Chromium API key since services are not used anyway - Apply patches from r440072 - Bump PORTREVISION Reported by: Fabian Keil <freebsd-listen@fabiankeil.de> via email Added: head/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc - copied unchanged from r440072, head/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc head/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc - copied unchanged from r440072, head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc head/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn - copied unchanged from r440072, head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn head/www/iridium/files/patch-components_filesystem_file__system__app.cc - copied unchanged from r440072, head/www/chromium/files/patch-components_filesystem_file__system__app.cc head/www/iridium/files/patch-v8_src_wasm_wasm-result.h - copied unchanged from r440072, head/www/chromium/files/patch-v8_src_wasm_wasm-result.h Deleted: head/www/iridium/files/patch-services_ui_BUILD.gn head/www/iridium/files/patch-services_ui_ime_BUILD.gn Modified: head/www/iridium/Makefile head/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn head/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc head/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc head/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py head/www/iridium/pkg-plist Modified: head/www/iridium/Makefile ============================================================================== --- head/www/iridium/Makefile Fri May 5 20:36:36 2017 (r440203) +++ head/www/iridium/Makefile Fri May 5 20:44:57 2017 (r440204) @@ -3,9 +3,9 @@ PORTNAME= iridium PORTVERSION= 58.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www -MASTER_SITES= http://downloads.iridiumbrowser.de/source/ +MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} @@ -64,8 +64,6 @@ ONLY_FOR_ARCHS= i386 amd64 USES= compiler bison cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz -CPE_VENDOR= google -CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst @@ -99,14 +97,6 @@ GN_ARGS+= is_clang=true \ # use_system_icu use_system_harfbuzz use_system_minigbm GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild -# FreeBSD Chromium Api Key -# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . -# Note: these are for FreeBSD use ONLY. For your own distribution, -# please get your own set of keys. -GN_ARGS+= google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \ - google_default_client_id="996322985003.apps.googleusercontent.com" \ - google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn" - SUB_FILES= iridium-browser.desktop iridium SUB_LIST+= COMMENT="${COMMENT}" @@ -228,7 +218,7 @@ do-configure: do-install: @${MKDIR} ${STAGEDIR}${DATADIR} -.for t in font_service ui +.for t in font_service test_ime_driver ui ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${t}.service \ ${STAGEDIR}${DATADIR} .endfor Copied: head/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc (from r440072, head/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc Fri May 5 20:44:57 2017 (r440204, copy of r440072, head/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/after_startup_task_utils.cc.orig 2017-05-02 19:02:47 UTC ++++ chrome/browser/after_startup_task_utils.cc +@@ -93,7 +93,7 @@ void QueueTask(std::unique_ptr<AfterStar + + void SetBrowserStartupIsComplete() { + DCHECK_CURRENTLY_ON(BrowserThread::UI); +-#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // CurrentProcessInfo::CreationTime() is not available on all platforms. + const base::Time process_creation_time = + base::CurrentProcessInfo::CreationTime(); Copied: head/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc (from r440072, head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc Fri May 5 20:44:57 2017 (r440204, copy of r440072, head/www/chromium/files/patch-chrome_browser_download_download__status__updater.cc) @@ -0,0 +1,20 @@ +--- chrome/browser/download/download_status_updater.cc.orig 2017-05-02 19:02:47 UTC ++++ chrome/browser/download/download_status_updater.cc +@@ -13,7 +13,7 @@ + #include "base/memory/ptr_util.h" + #include "build/build_config.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #include "ui/views/linux_ui/linux_ui.h" + #endif + +@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUp + #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN)) + void DownloadStatusUpdater::UpdateAppIconDownloadProgress( + content::DownloadItem* download) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + const views::LinuxUI* linux_ui = views::LinuxUI::instance(); + if (linux_ui) { + float progress = 0; Modified: head/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn ============================================================================== --- head/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn Fri May 5 20:36:36 2017 (r440203) +++ head/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn Fri May 5 20:44:57 2017 (r440204) @@ -9,6 +9,15 @@ deps += [ "//build/linux:fontconfig" ] if (use_dbus) { +@@ -1100,7 +1100,7 @@ static_library("extensions") { + ] + } + +- if (is_win || (is_linux && !is_chromeos)) { ++ if (is_win || ((is_linux || is_bsd) && !is_chromeos)) { + sources += [ + "api/input_ime/input_ime_api.cc", + "api/input_ime/input_ime_api.h", @@ -1133,6 +1133,12 @@ static_library("extensions") { defines += [ "ENABLE_HOTWORDING" ] } Modified: head/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc ============================================================================== --- head/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc Fri May 5 20:36:36 2017 (r440203) +++ head/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc Fri May 5 20:44:57 2017 (r440204) @@ -14,7 +14,7 @@ extensions::InputImeAPI::GetFactoryInstance(); extensions::InputMethodAPI::GetFactoryInstance(); -#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) && !defined(OS_BSD) ++#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) extensions::InputImeAPI::GetFactoryInstance(); #endif extensions::LanguageSettingsPrivateDelegateFactory::GetInstance(); Modified: head/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc ============================================================================== --- head/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc Fri May 5 20:36:36 2017 (r440203) +++ head/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc Fri May 5 20:44:57 2017 (r440204) @@ -9,3 +9,12 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost || url.host_piece() == chrome::kChromeUISandboxHost #endif +@@ -567,7 +567,7 @@ WebUIFactoryFunction GetWebUIFactoryFunc + if (url.host_piece() == chrome::kChromeUINaClHost) + return &NewWebUI<NaClUI>; + #endif +-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) + if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) { + return &NewWebUI<ConstrainedWebDialogUI>; + } Copied: head/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn (from r440072, head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-chrome_common_extensions_api_BUILD.gn Fri May 5 20:44:57 2017 (r440204, copy of r440072, head/www/chromium/files/patch-chrome_common_extensions_api_BUILD.gn) @@ -0,0 +1,11 @@ +--- chrome/common/extensions/api/BUILD.gn.orig 2017-05-02 19:02:48 UTC ++++ chrome/common/extensions/api/BUILD.gn +@@ -116,7 +116,7 @@ if (is_chromeos) { + "wallpaper.json", + "wallpaper_private.json", + ] +-} else if (is_linux || is_win) { ++} else if (is_linux || is_bsd || is_win) { + schema_sources += [ "input_ime.json" ] + } + if (enable_service_discovery) { Copied: head/www/iridium/files/patch-components_filesystem_file__system__app.cc (from r440072, head/www/chromium/files/patch-components_filesystem_file__system__app.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-components_filesystem_file__system__app.cc Fri May 5 20:44:57 2017 (r440204, copy of r440072, head/www/chromium/files/patch-components_filesystem_file__system__app.cc) @@ -0,0 +1,20 @@ +--- components/filesystem/file_system_app.cc.orig 2017-05-02 19:02:50 UTC ++++ components/filesystem/file_system_app.cc +@@ -23,7 +23,7 @@ + #elif defined(OS_ANDROID) + #include "base/base_paths_android.h" + #include "base/path_service.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #elif defined(OS_MACOSX) +@@ -75,7 +75,7 @@ base::FilePath FileSystemApp::GetUserDat + CHECK(PathService::Get(base::DIR_APP_DATA, &path)); + #elif defined(OS_ANDROID) + CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &path)); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr<base::Environment> env(base::Environment::Create()); + path = base::nix::GetXDGDirectory(env.get(), + base::nix::kXdgConfigHomeEnvVar, Modified: head/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py ============================================================================== --- head/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py Fri May 5 20:36:36 2017 (r440203) +++ head/www/iridium/files/patch-tools_gn_bootstrap_bootstrap.py Fri May 5 20:44:57 2017 (r440204) @@ -1,4 +1,4 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2017-04-19 19:06:54 UTC +--- tools/gn/bootstrap/bootstrap.py.orig 2017-04-24 14:40:24 UTC +++ tools/gn/bootstrap/bootstrap.py @@ -23,6 +23,7 @@ import os import shutil @@ -19,7 +19,7 @@ def check_call(cmd, **kwargs): logging.debug('Running: %s', ' '.join(cmd)) -@@ -624,6 +626,41 @@ def write_gn_ninja(path, root_gen_dir, o +@@ -625,6 +627,40 @@ def write_gn_ninja(path, root_gen_dir, o 'base/third_party/libevent/epoll.c', ]) @@ -36,7 +36,6 @@ + static_libraries['base']['sources'].extend([ + 'base/allocator/allocator_shim.cc', + 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', -+ 'base/callback_helpers.cc', + 'base/memory/shared_memory_posix.cc', + 'base/nix/xdg_util.cc', + 'base/process/memory_stubs.cc', Copied: head/www/iridium/files/patch-v8_src_wasm_wasm-result.h (from r440072, head/www/chromium/files/patch-v8_src_wasm_wasm-result.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/patch-v8_src_wasm_wasm-result.h Fri May 5 20:44:57 2017 (r440204, copy of r440072, head/www/chromium/files/patch-v8_src_wasm_wasm-result.h) @@ -0,0 +1,10 @@ +--- v8/src/wasm/wasm-result.h.orig 2017-05-02 19:04:10 UTC ++++ v8/src/wasm/wasm-result.h +@@ -5,6 +5,7 @@ + #ifndef V8_WASM_RESULT_H_ + #define V8_WASM_RESULT_H_ + ++#include <cstdarg> + #include <memory> + + #include "src/base/compiler-specific.h" Modified: head/www/iridium/pkg-plist ============================================================================== --- head/www/iridium/pkg-plist Fri May 5 20:36:36 2017 (r440203) +++ head/www/iridium/pkg-plist Fri May 5 20:44:57 2017 (r440204) @@ -222,6 +222,7 @@ share/applications/iridium-browser.deskt %%DATADIR%%/resources/inspector/unit_test_runner.js %%DATADIR%%/resources/inspector/utility_shared_worker.js %%DATADIR%%/snapshot_blob.bin +%%DATADIR%%/test_ime_driver.service %%DATADIR%%/ui.service %%DATADIR%%/views_mus_resources.pak share/icons/hicolor/128x128/apps/iridium.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705052044.v45KivCt051663>