Attachment 191378 Details for Bug 226505 – patch

[patch] patch

patch.txt (text/plain), 2.72 KB, created by Craig Leres on 2018-03-10 20:40:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Craig Leres

Created: 2018-03-10 20:40:53 UTC

Size: 2.72 KB

patch

obsolete

>Index: www/chromium/Makefile
>===================================================================
>--- www/chromium/Makefile	(revision 464063)
>+++ www/chromium/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	chromium
> PORTVERSION=	64.0.3282.186
>+PORTREVISION=	1
> CATEGORIES?=	www
> MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>@@ -50,7 +51,6 @@
> 		libwebp.so:graphics/webp \
> 		libavcodec.so:multimedia/ffmpeg \
> 		libopenh264.so:multimedia/openh264 \
>-		libcups.so:print/cups \
> 		libfreetype.so:print/freetype2 \
> 		libharfbuzz.so:print/harfbuzz \
> 		libharfbuzz-icu.so:print/harfbuzz-icu \
>@@ -118,7 +118,6 @@
> 		use_allocator_shim=false \
> 		use_aura=true \
> 		use_bundled_fontconfig=false \
>-		use_cups=true \
> 		use_custom_libcxx=false \
> 		use_gtk3=true \
> 		use_lld=true \
>@@ -145,13 +144,14 @@
> SUB_FILES=	chromium-browser.desktop chrome
> SUB_LIST+=	COMMENT="${COMMENT}"
> 
>-OPTIONS_DEFINE=	CODECS DEBUG DRIVER GCONF KERBEROS TEST
>+OPTIONS_DEFINE=	CODECS CUPS DEBUG DRIVER GCONF KERBEROS TEST
> CODECS_DESC=	Compile and enable patented codecs like H.264
>+CUPS_DESC=	Disable cups support (note: this completely disables printing)
> DRIVER_DESC=	Install chromedriver
> OPTIONS_GROUP=		AUDIO
> OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
> 
>-OPTIONS_DEFAULT=	ALSA CODECS DRIVER GCONF KERBEROS
>+OPTIONS_DEFAULT=	ALSA CODECS CUPS DRIVER GCONF KERBEROS
> OPTIONS_SUB=		yes
> 
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>@@ -167,6 +167,10 @@
> 			GN_ARGS+=proprietary_codecs=false \
> 			GN_ARGS+=enable_hevc_demuxing=false
> 
>+CUPS_LIB_DEPENDS=	libcups.so:print/cups
>+CUPS_VARS=		GN_ARGS+=use_cups=true
>+CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
>+
> DEBUG_VARS=		BUILDTYPE=Debug \
> 			GN_ARGS+=is_debug=true \
> 			GN_ARGS+=is_component_build=false \
>Index: www/chromium/files/patch-chrome_service_cloud__print_print__system.cc
>===================================================================
>--- www/chromium/files/patch-chrome_service_cloud__print_print__system.cc	(nonexistent)
>+++ www/chromium/files/patch-chrome_service_cloud__print_print__system.cc	(working copy)
>@@ -0,0 +1,23 @@
>+--- chrome/service/cloud_print/print_system.cc.orig	2018-02-24 15:25:11 UTC
>++++ chrome/service/cloud_print/print_system.cc
>+@@ -5,6 +5,7 @@
>+ #include "chrome/service/cloud_print/print_system.h"
>+ 
>+ #include "base/guid.h"
>++#include "build/build_config.h"
>+ 
>+ namespace cloud_print {
>+ 
>+@@ -35,5 +36,12 @@ std::string PrintSystem::GenerateProxyId
>+   return base::GenerateGUID();
>+ }
>+ 
>++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(USE_CUPS)
>++scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
>++    const base::DictionaryValue*) {
>++  return nullptr;
>++}
>++#endif
>++
>+ }  // namespace cloud_print
>+

Actions: View | Diff

Attachments on bug 226505: 191378 | 191379 | 191419