From owner-svn-ports-all@freebsd.org Thu Jan 23 08:32:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 49E3D232359; Thu, 23 Jan 2020 08:32:30 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 483FrZ1vQlz4JwZ; Thu, 23 Jan 2020 08:32:30 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 22F5FBE26; Thu, 23 Jan 2020 08:32:30 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00N8WUHg091628; Thu, 23 Jan 2020 08:32:30 GMT (envelope-from fox@FreeBSD.org) Received: (from fox@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00N8WTZ2091624; Thu, 23 Jan 2020 08:32:29 GMT (envelope-from fox@FreeBSD.org) Message-Id: <202001230832.00N8WTZ2091624@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fox set sender to fox@FreeBSD.org using -f From: Santhosh Raju Date: Thu, 23 Jan 2020 08:32:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523906 - in head/www/cliqz: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fox X-SVN-Commit-Paths: in head/www/cliqz: . files X-SVN-Commit-Revision: 523906 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2020 08:32:30 -0000 Author: fox Date: Thu Jan 23 08:32:28 2020 New Revision: 523906 URL: https://svnweb.freebsd.org/changeset/ports/523906 Log: www/cliqz: Updates to 1.32.1 Changes (since 1.30.1): Cliqz Browser release 1.32.0 includes the improvements of Firefox’s latest versions 71.0, 72.0.1 and 72.0.2 with additional Cliqz improvements and bug fixes. Improvements * Cliqz got updated to Firefox 71.0 and 72.0.1 with various improvements and fixes. * The built-in security add-on HTTPS Everywhere got updated to the latest version 2019.11.7. Fixes * For some users, YouTube stopped working in Cliqz Browser until they cleared their cookies and cache. These cookie related issues have been fixed. * Sometimes the onboarding was shown again and again. Now you’ll only see it after the first start of the browser. * Recommended add-ons like Ghostery or LastPass could not be installed anymore. These add-ons can now be installed again. * We made sure that Cliqz Tab doesn’t show up in the history item list anymore. * If you right-clicked on the Cliqz icon in the Windows taskbar and selected the task "Open new tab" in the Jump List, it could happen that instead of Cliqz Tab only a blank page appeared. This has been fixed. Added: head/www/cliqz/files/patch-bug1550891 (contents, props changed) head/www/cliqz/files/patch-bug1556301 (contents, props changed) Deleted: head/www/cliqz/files/patch-Makefile.in head/www/cliqz/files/patch-bindgen-rust1390 Modified: head/www/cliqz/Makefile head/www/cliqz/distinfo head/www/cliqz/files/patch-bug847568 Modified: head/www/cliqz/Makefile ============================================================================== --- head/www/cliqz/Makefile Thu Jan 23 08:32:13 2020 (r523905) +++ head/www/cliqz/Makefile Thu Jan 23 08:32:28 2020 (r523906) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.30.1 -PORTREVISION= 1 +DISTVERSION= 1.32.1 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz @@ -75,7 +74,7 @@ SHEBANG_FILES= magic_build_and_package.sh CLIQZ_CHANNEL= release # If the DISTVERSION is updated, make sure to update the last build id from # fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid -CLIQZ_LAST_BUILD_ID= 20191128141357 +CLIQZ_LAST_BUILD_ID= 20200121101408 CLIQZ_ICON= ${PORTNAME}.png CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop @@ -135,6 +134,9 @@ post-patch: @${ECHO_CMD} 'export LDFLAGS="-Wl,--no-keep-memory -Wl,--as-needed"' >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig .endif +# Disable vendor checksums like lang/rust + @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \ + ${WRKSRC}/mozilla-release/third_party/rust/*/.cargo-checksum.json do-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh) Modified: head/www/cliqz/distinfo ============================================================================== --- head/www/cliqz/distinfo Thu Jan 23 08:32:13 2020 (r523905) +++ head/www/cliqz/distinfo Thu Jan 23 08:32:28 2020 (r523906) @@ -1,11 +1,11 @@ -TIMESTAMP = 1575124586 -SHA256 (cliqz/adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65 +TIMESTAMP = 1579729917 +SHA256 (cliqz/adult-domains.bin) = fcbec6811ca696bd044c0cce7f7aae45f4b822797eb6ecf657e5dc795870418f SIZE (cliqz/adult-domains.bin) = 528392 -SHA256 (cliqz/cliqz@cliqz.com.xpi) = 501f4c3caadd18f3ce7caa5535bd6dab8375be3c52bfb231cc6d512bc62d4695 -SIZE (cliqz/cliqz@cliqz.com.xpi) = 4542303 +SHA256 (cliqz/cliqz@cliqz.com.xpi) = 8ff1fd47bbaa57f32356573f8f4b530e2c0219e5a1e87ba70cabad6d77b973a1 +SIZE (cliqz/cliqz@cliqz.com.xpi) = 3669619 SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 95ce7bd4ba1ea301246ce45bc3cdcff550acf7d8f1af1b42fd22984614cd9018 SIZE (cliqz/gdprtool@cliqz.com.xpi) = 222247 -SHA256 (cliqz/https-everywhere@cliqz.com.xpi) = 094516da166aa984c836130075184315c5636033899c49fe6bca5b7190f488fc -SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 2147608 -SHA256 (cliqz/cliqz-oss-browser-f-1.30.1_GH0.tar.gz) = 930785beeb58e917a7ed231c1d23ad7fd20945836cbaa9f2dc2173ea90f15797 -SIZE (cliqz/cliqz-oss-browser-f-1.30.1_GH0.tar.gz) = 507243510 +SHA256 (cliqz/https-everywhere@cliqz.com.xpi) = 8b743d319cc2bc08eef90c564a6fca725eb2fe0e35c6caa441826c3408244346 +SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 2038441 +SHA256 (cliqz/cliqz-oss-browser-f-1.32.1_GH0.tar.gz) = ec69008726e60af40a86026a2252c09996770efe502279ead4f0512c5231c4ce +SIZE (cliqz/cliqz-oss-browser-f-1.32.1_GH0.tar.gz) = 495123166 Added: head/www/cliqz/files/patch-bug1550891 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-bug1550891 Thu Jan 23 08:32:28 2020 (r523906) @@ -0,0 +1,90 @@ +commit 965eb33c5e86 +Author: Greg V +Date: Wed Jan 8 15:06:00 2020 -0800 + + Bug 1550891 - re-add SHM_ANON support in IPC shared memory, freezing via capabilities + +Taken from www/firefox +--- + config/system-headers.mozbuild | 1 + + ipc/chromium/src/base/shared_memory_posix.cc | 20 +++++++++++++++++--- + 2 files changed, 18 insertions(+), 3 deletions(-) + +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index 88afca1070f86..beff3e2542c9f 100644 +--- mozilla-release/config/system-headers.mozbuild ++++ mozilla-release/config/system-headers.mozbuild +@@ -816,6 +816,7 @@ system_headers = [ + 'sys/bitypes.h', + 'sys/byteorder.h', + 'syscall.h', ++ 'sys/capsicum.h', + 'sys/cdefs.h', + 'sys/cfgodm.h', + 'sys/elf.h', +diff --git ipc/chromium/src/base/shared_memory_posix.cc ipc/chromium/src/base/shared_memory_posix.cc +index 0be9cce0b4bed..89e67483e4c16 100644 +--- mozilla-release/ipc/chromium/src/base/shared_memory_posix.cc ++++ mozilla-release/ipc/chromium/src/base/shared_memory_posix.cc +@@ -16,6 +16,10 @@ + # include + #endif + ++#ifdef __FreeBSD__ ++# include ++#endif ++ + #include "base/eintr_wrapper.h" + #include "base/logging.h" + #include "base/string_util.h" +@@ -148,7 +152,7 @@ static int SafeShmUnlink(bool freezeable, const char* name) { + } + } + +-#elif !defined(ANDROID) ++#elif !defined(ANDROID) && !defined(__FreeBSD__) + static int SafeShmOpen(bool freezeable, const char* name, int oflag, int mode) { + return shm_open(name, oflag, mode); + } +@@ -160,7 +164,7 @@ static int SafeShmUnlink(bool freezeable, const char* name) { + + // static + bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(__FreeBSD__) + return false; + #else + *str += '/'; +@@ -186,7 +190,7 @@ bool SharedMemory::AppendPosixShmPrefix(std::string* str, pid_t pid) { + // enough for this. + StringAppendF(str, "org.mozilla.ipc.%d.", static_cast(pid)); + return true; +-#endif // !ANDROID ++#endif // !ANDROID && !__FreeBSD__ + } + + bool SharedMemory::CreateInternal(size_t size, bool freezeable) { +@@ -212,6 +216,9 @@ bool SharedMemory::CreateInternal(size_t size, bool freezeable) { + return false; + } + needs_truncate = false; ++#elif defined(__FreeBSD__) ++ // FreeBSD supports anonymous shm_open ++ fd.reset(shm_open(SHM_ANON, O_RDWR, 0600)); + #else + // Generic Unix: shm_open + shm_unlink + do { +@@ -275,6 +282,13 @@ bool SharedMemory::Freeze() { + CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); + return false; + } ++#elif defined(__FreeBSD__) ++ cap_rights_t rights; ++ cap_rights_init(&rights, CAP_MMAP_R); ++ if (cap_rights_limit(mapped_file_, &rights) != 0) { ++ CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); ++ return false; ++ } + #else + DCHECK(frozen_file_ >= 0); + DCHECK(mapped_file_ >= 0); Added: head/www/cliqz/files/patch-bug1556301 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-bug1556301 Thu Jan 23 08:32:28 2020 (r523906) @@ -0,0 +1,241 @@ +commit 5f2329c58c1b +Author: myfreeweb +Date: Wed Dec 18 20:25:00 2019 +0000 + + Bug 1556301 - Wayland-EGL/GLES support in glxtest + + This allows GfxInfoX11 to get GLES3 and Mesa version from Wayland-EGL, which + allows automatic enablement of acceleration to work without Xwayland. + + This also fixes bug 1578598 - WebRender did not work correctly + without this GL version information. + + Differential Revision: https://phabricator.services.mozilla.com/D57474 + +Taken from www/firefox + +--- + toolkit/xre/glxtest.cpp | 132 +++++++++++++++++++++++++++++++++++-- + widget/gtk/mozwayland/mozwayland.h | 1 + + 2 files changed, 126 insertions(+), 7 deletions(-) + +diff --git toolkit/xre/glxtest.cpp toolkit/xre/glxtest.cpp +index 7b33a5c2b08f0..a1e6036cb6002 100644 +--- mozilla-release/toolkit/xre/glxtest.cpp ++++ mozilla-release/toolkit/xre/glxtest.cpp +@@ -36,6 +36,11 @@ + + #include "mozilla/Unused.h" + ++#ifdef MOZ_WAYLAND ++#include "nsAppRunner.h" // for IsWaylandDisabled ++#include "mozilla/widget/mozwayland.h" ++#endif ++ + // stuff from glx.h + typedef struct __GLXcontextRec* GLXContext; + typedef XID GLXPixmap; +@@ -74,6 +79,15 @@ typedef uint32_t GLenum; + #define GLX_RENDERER_ID_MESA 0x818E + // clang-format on + ++// stuff from egl.h ++#define EGL_BLUE_SIZE 0x3022 ++#define EGL_GREEN_SIZE 0x3023 ++#define EGL_RED_SIZE 0x3024 ++#define EGL_NONE 0x3038 ++#define EGL_VENDOR 0x3053 ++#define EGL_CONTEXT_CLIENT_VERSION 0x3098 ++#define EGL_NO_CONTEXT nullptr ++ + namespace mozilla { + namespace widget { + // the read end of the pipe, which will be used by GfxInfo +@@ -118,7 +132,10 @@ static int x_error_handler(Display*, XErrorEvent* ev) { + // care about leaking memory + extern "C" { + +-static int get_egl_status(char* buf, int bufsize) { ++typedef void* EGLNativeDisplayType; ++ ++static int get_egl_status(char* buf, int bufsize, ++ EGLNativeDisplayType native_dpy, bool gles_test) { + void* libegl = dlopen("libEGL.so.1", RTLD_LAZY); + if (!libegl) { + libegl = dlopen("libEGL.so", RTLD_LAZY); +@@ -164,7 +181,7 @@ static int get_egl_status(char* buf, int bufsize) { + return 0; + } + +- EGLDisplay dpy = eglGetDisplay(nullptr); ++ EGLDisplay dpy = eglGetDisplay(native_dpy); + if (!dpy) { + dlclose(libegl); + return 0; +@@ -177,9 +194,87 @@ static int get_egl_status(char* buf, int bufsize) { + } + + int length = 0; ++ ++ if (gles_test) { ++ typedef void* EGLConfig; ++ typedef void* EGLContext; ++ typedef void* EGLSurface; ++ ++ typedef EGLBoolean (*PFNEGLCHOOSECONFIGPROC)( ++ EGLDisplay dpy, EGLint const* attrib_list, EGLConfig* configs, ++ EGLint config_size, EGLint* num_config); ++ PFNEGLCHOOSECONFIGPROC eglChooseConfig = ++ cast(eglGetProcAddress("eglChooseConfig")); ++ ++ typedef EGLContext (*PFNEGLCREATECONTEXTPROC)( ++ EGLDisplay dpy, EGLConfig config, EGLContext share_context, ++ EGLint const* attrib_list); ++ PFNEGLCREATECONTEXTPROC eglCreateContext = ++ cast(eglGetProcAddress("eglCreateContext")); ++ ++ typedef EGLSurface (*PFNEGLCREATEPBUFFERSURFACEPROC)( ++ EGLDisplay dpy, EGLConfig config, EGLint const* attrib_list); ++ PFNEGLCREATEPBUFFERSURFACEPROC eglCreatePbufferSurface = ++ cast( ++ eglGetProcAddress("eglCreatePbufferSurface")); ++ ++ typedef EGLBoolean (*PFNEGLMAKECURRENTPROC)( ++ EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext context); ++ PFNEGLMAKECURRENTPROC eglMakeCurrent = ++ cast(eglGetProcAddress("eglMakeCurrent")); ++ ++ void* libgles = dlopen("libGLESv2.so.2", RTLD_LAZY); ++ if (!libgles) { ++ libgles = dlopen("libGLESv2.so", RTLD_LAZY); ++ } ++ if (!libgles) { ++ fatal_error("Unable to load libGLESv2"); ++ } ++ ++ typedef GLubyte* (*PFNGLGETSTRING)(GLenum); ++ PFNGLGETSTRING glGetString = ++ cast(eglGetProcAddress("glGetString")); ++ ++ if (!glGetString) { ++ // Implementations disagree about whether eglGetProcAddress or dlsym ++ // should be used for getting functions from the actual API, see ++ // https://github.com/anholt/libepoxy/commit/14f24485e33816139398d1bd170d617703473738 ++ glGetString = cast(dlsym(libgles, "glGetString")); ++ } ++ ++ if (!glGetString) { ++ fatal_error("GLESv2 glGetString not found"); ++ } ++ ++ EGLint config_attrs[] = {EGL_RED_SIZE, 8, EGL_GREEN_SIZE, 8, ++ EGL_BLUE_SIZE, 8, EGL_NONE}; ++ EGLConfig config; ++ EGLint num_config; ++ eglChooseConfig(dpy, config_attrs, &config, 1, &num_config); ++ EGLint ctx_attrs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE}; ++ EGLContext ectx = eglCreateContext(dpy, config, EGL_NO_CONTEXT, ctx_attrs); ++ EGLSurface pbuf = eglCreatePbufferSurface(dpy, config, nullptr); ++ eglMakeCurrent(dpy, pbuf, pbuf, ectx); ++ ++ const GLubyte* versionString = glGetString(GL_VERSION); ++ const GLubyte* vendorString = glGetString(GL_VENDOR); ++ const GLubyte* rendererString = glGetString(GL_RENDERER); ++ ++ if (!versionString || !vendorString || !rendererString) ++ fatal_error("glGetString returned null"); ++ ++ length = snprintf(buf, bufsize, ++ "VENDOR\n%s\nRENDERER\n%s\nVERSION\n%s\nTFP\nTRUE\n", ++ vendorString, rendererString, versionString); ++ if (length >= bufsize) { ++ fatal_error("GL strings length too large for buffer size"); ++ } ++ } ++ + const char* driDriver = eglGetDisplayDriverName(dpy); + if (driDriver) { +- length = snprintf(buf, bufsize, "DRI_DRIVER\n%s\n", driDriver); ++ length += ++ snprintf(buf + length, bufsize - length, "DRI_DRIVER\n%s\n", driDriver); + } + + eglTerminate(dpy); +@@ -187,7 +282,7 @@ static int get_egl_status(char* buf, int bufsize) { + return length; + } + +-void glxtest() { ++static void close_logging() { + // we want to redirect to /dev/null stdout, stderr, and while we're at it, + // any PR logging file descriptors. To that effect, we redirect all positive + // file descriptors up to what open() returns here. In particular, 1 is stdout +@@ -199,8 +294,32 @@ void glxtest() { + if (getenv("MOZ_AVOID_OPENGL_ALTOGETHER")) + fatal_error( + "The MOZ_AVOID_OPENGL_ALTOGETHER environment variable is defined"); ++} ++ ++#ifdef MOZ_WAYLAND ++bool wayland_egltest() { ++ // NOTE: returns false to fall back to X11 when the Wayland socket doesn't ++ // exist but fails with fatal_error if something actually went wrong ++ struct wl_display* dpy = wl_display_connect(nullptr); ++ if (!dpy) return false; ++ ++ enum { bufsize = 2048 }; ++ char buf[bufsize]; ++ ++ int length = get_egl_status(buf, bufsize, (EGLNativeDisplayType)dpy, true); ++ if (length >= bufsize) { ++ fatal_error("GL strings length too large for buffer size"); ++ } + +- ///// Open libGL and load needed symbols ///// ++ ///// Finally write data to the pipe ++ mozilla::Unused << write(write_end_of_the_pipe, buf, length); ++ ++ return true; ++} ++#endif ++ ++void glxtest() { ++ ///// Open libGL and load needed symbols ///// + #if defined(__OpenBSD__) || defined(__NetBSD__) + # define LIBGL_FILENAME "libGL.so" + #else +@@ -401,7 +520,7 @@ void glxtest() { + // If we failed to get the driver name from X, try via EGL_MESA_query_driver. + // We are probably using Wayland. + if (!gotDriDriver) { +- length += get_egl_status(buf + length, bufsize - length); ++ length += get_egl_status(buf + length, bufsize - length, nullptr, false); + if (length >= bufsize) { + fatal_error("GL strings length too large for buffer size"); + } +@@ -431,7 +550,12 @@ bool fire_glxtest_process() { + if (pid == 0) { + close(pfd[0]); + write_end_of_the_pipe = pfd[1]; +- glxtest(); ++ close_logging(); ++ // TODO: --display command line argument is not properly handled ++#ifdef MOZ_WAYLAND ++ if (IsWaylandDisabled() || !wayland_egltest()) ++#endif ++ glxtest(); + close(pfd[1]); + _exit(0); + } +diff --git widget/gtk/mozwayland/mozwayland.h widget/gtk/mozwayland/mozwayland.h +index b31742fb2bc33..8aa0ce6f4665a 100644 +--- mozilla-release/widget/gtk/mozwayland/mozwayland.h ++++ mozilla-release/widget/gtk/mozwayland/mozwayland.h +@@ -20,6 +20,7 @@ + extern "C" { + #endif + ++MOZ_EXPORT struct wl_display* wl_display_connect(const char* name); + MOZ_EXPORT int wl_display_roundtrip_queue(struct wl_display* display, + struct wl_event_queue* queue); + MOZ_EXPORT uint32_t wl_proxy_get_version(struct wl_proxy* proxy); Modified: head/www/cliqz/files/patch-bug847568 ============================================================================== --- head/www/cliqz/files/patch-bug847568 Thu Jan 23 08:32:13 2020 (r523905) +++ head/www/cliqz/files/patch-bug847568 Thu Jan 23 08:32:28 2020 (r523906) @@ -1,8 +1,10 @@ # Allow building against system-wide graphite2/harfbuzz. ---- mozilla-release/config/system-headers.mozbuild.orig 2019-11-13 13:22:25 UTC +diff --git config/system-headers.mozbuild config/system-headers.mozbuild +index 7620b4d00623..09d3db5ca8c0 100644 +--- mozilla-release/config/system-headers.mozbuild +++ mozilla-release/config/system-headers.mozbuild -@@ -1295,6 +1295,19 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: +@@ -1299,6 +1299,19 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: 'proxy.h', ] @@ -22,19 +24,49 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: system_headers += [ 'vpx_mem/vpx_mem.h', ---- mozilla-release/dom/base/moz.build.orig 2019-11-13 13:22:25 UTC +diff --git dom/base/moz.build dom/base/moz.build +index 8e19020315ae..2fcdbb6f7b42 100644 +--- mozilla-release/dom/base/moz.build +++ mozilla-release/dom/base/moz.build -@@ -539,6 +539,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/andr +@@ -543,6 +543,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']: if CONFIG['MOZ_X11']: CXXFLAGS += CONFIG['TK_CFLAGS'] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - GENERATED_FILES += [ - 'UseCounterList.h', - ] ---- mozilla-release/gfx/graphite2/moz-gr-update.sh.orig 2019-11-13 13:22:25 UTC + GeneratedFile('UseCounterList.h', script='gen-usecounters.py', + entry_point='use_counter_list', inputs=['UseCounters.conf']) + +diff --git gfx/graphite2/geckoextra/moz.build gfx/graphite2/geckoextra/moz.build +new file mode 100644 +index 0000000000000..24e8d7a03274a +--- /dev/null ++++ mozilla-release/gfx/graphite2/geckoextra/moz.build +@@ -0,0 +1,20 @@ ++# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- ++# vim: set filetype=python: ++# This Source Code Form is subject to the terms of the Mozilla Public ++# License, v. 2.0. If a copy of the MPL was not distributed with this ++# file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ ++EXPORTS.graphite2 += [ ++ 'include/GraphiteExtra.h', ++] ++ ++UNIFIED_SOURCES += [ ++ '../geckoextra/src/GraphiteExtra.cpp', ++] ++ ++CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] ++ ++# Match bundled graphite2 configuration ++AllowCompilerWarnings() ++ ++FINAL_LIBRARY = 'gkmedias' +diff --git gfx/graphite2/moz-gr-update.sh gfx/graphite2/moz-gr-update.sh +index faaab1b17971..04eff5f09882 100644 +--- mozilla-release/gfx/graphite2/moz-gr-update.sh +++ mozilla-release/gfx/graphite2/moz-gr-update.sh @@ -1,6 +1,7 @@ #!/bin/bash @@ -44,7 +76,7 @@ # This script lives in gfx/graphite2, along with the library source, # but must be run from the top level of the mozilla-central tree. -@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2 +@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; @@ -62,7 +94,9 @@ echo echo If gfx/graphite2/src/files.mk has changed, please make corresponding ---- mozilla-release/gfx/harfbuzz/README-mozilla.orig 2019-11-13 13:22:25 UTC +diff --git gfx/harfbuzz/README-mozilla gfx/harfbuzz/README-mozilla +index 22c76a7df020..a01490bd49ee 100644 +--- mozilla-release/gfx/harfbuzz/README-mozilla +++ mozilla-release/gfx/harfbuzz/README-mozilla @@ -15,3 +15,8 @@ from within the gfx/harfbuzz directory. @@ -73,13 +107,17 @@ +Make sure to keep pkg-config version check within toolkit/moz.configure in sync +with checkout version or increment latest tag by one if it's not based +on upstream release. ---- mozilla-release/gfx/moz.build.orig 2019-11-13 13:22:25 UTC +diff --git gfx/moz.build gfx/moz.build +index 771f652e837a..3b358d84e384 100644 +--- mozilla-release/gfx/moz.build +++ mozilla-release/gfx/moz.build -@@ -13,6 +13,12 @@ with Files('wr/**'): +@@ -13,6 +13,14 @@ with Files('wr/**'): if CONFIG['MOZ_TREE_CAIRO']: DIRS += ['cairo'] -+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: ++ DIRS += ['graphite2/geckoextra'] ++else: + DIRS += ['graphite2/src' ] + +if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: @@ -88,7 +126,7 @@ DIRS += [ '2d', 'ycbcr', -@@ -21,8 +27,6 @@ DIRS += [ +@@ -21,8 +29,6 @@ DIRS += [ 'qcms', 'gl', 'layers', @@ -97,7 +135,9 @@ 'ots/src', 'thebes', 'ipc', ---- mozilla-release/gfx/skia/generate_mozbuild.py.orig 2019-11-13 13:22:25 UTC +diff --git gfx/skia/generate_mozbuild.py gfx/skia/generate_mozbuild.py +index e06ae3457a47..93faa61594a3 100755 +--- mozilla-release/gfx/skia/generate_mozbuild.py +++ mozilla-release/gfx/skia/generate_mozbuild.py @@ -117,6 +117,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', @@ -109,7 +149,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] ---- mozilla-release/gfx/skia/moz.build.orig 2019-11-13 13:22:25 UTC +diff --git gfx/skia/moz.build gfx/skia/moz.build +index 2118677ca3a8..e4978b413784 100644 +--- mozilla-release/gfx/skia/moz.build +++ mozilla-release/gfx/skia/moz.build @@ -493,6 +493,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', @@ -121,7 +163,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] ---- mozilla-release/gfx/thebes/moz.build.orig 2019-11-13 13:22:25 UTC +diff --git gfx/thebes/moz.build gfx/thebes/moz.build +index 56f1b9fe3f4b..0ac1100b0df3 100644 +--- mozilla-release/gfx/thebes/moz.build +++ mozilla-release/gfx/thebes/moz.build @@ -284,7 +284,13 @@ if CONFIG['MOZ_WAYLAND']: @@ -138,7 +182,9 @@ if CONFIG['CC_TYPE'] == 'clang': # Suppress warnings from Skia header files. ---- mozilla-release/intl/unicharutil/util/moz.build.orig 2019-11-13 13:22:25 UTC +diff --git intl/unicharutil/util/moz.build intl/unicharutil/util/moz.build +index cb1233c56d7e..06fb1f9f174b 100644 +--- mozilla-release/intl/unicharutil/util/moz.build +++ mozilla-release/intl/unicharutil/util/moz.build @@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ 'nsUnicodeProperties.cpp', @@ -148,21 +194,26 @@ + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + FINAL_LIBRARY = 'xul' ---- mozilla-release/netwerk/dns/moz.build.orig 2019-11-13 13:22:25 UTC +diff --git netwerk/dns/moz.build netwerk/dns/moz.build +index 79c26e3e7001..c4d93bc5f7dc 100644 +--- mozilla-release/netwerk/dns/moz.build +++ mozilla-release/netwerk/dns/moz.build -@@ -90,3 +90,6 @@ USE_LIBS += ['icu'] +@@ -86,3 +86,6 @@ USE_LIBS += ['icu'] if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] + +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ---- mozilla-release/old-configure.in.orig 2019-11-13 13:22:25 UTC +diff --git old-configure.in old-configure.in +index 95a58b634593..b614eef85c89 100644 +--- mozilla-release/old-configure.in +++ mozilla-release/old-configure.in -@@ -2674,6 +2674,27 @@ dnl ================================================== +@@ -2639,6 +2639,27 @@ dnl ======================================================== + AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) - dnl ======================================================== ++dnl ======================================================== +dnl Check for graphite2 +dnl ======================================================== +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then @@ -183,13 +234,14 @@ + CFLAGS=$_SAVE_CFLAGS +fi + -+dnl ======================================================== + dnl ======================================================== dnl Check for pixman and cairo dnl ======================================================== - ---- mozilla-release/toolkit/library/moz.build.orig 2019-11-13 13:22:25 UTC +diff --git toolkit/library/moz.build toolkit/library/moz.build +index 24f940e1ed7e..079a575adec3 100644 +--- mozilla-release/toolkit/library/moz.build +++ mozilla-release/toolkit/library/moz.build -@@ -254,6 +254,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: +@@ -248,6 +248,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: if CONFIG['MOZ_SYSTEM_WEBP']: OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] @@ -202,9 +254,11 @@ if CONFIG['MOZ_SYSTEM_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] ---- mozilla-release/toolkit/moz.configure.orig 2019-11-13 13:22:25 UTC +diff --git toolkit/moz.configure toolkit/moz.configure +index 9297e4d6f501..d8e273887e4b 100644 +--- mozilla-release/toolkit/moz.configure +++ mozilla-release/toolkit/moz.configure -@@ -931,6 +931,25 @@ add_old_configure_assignment('FT2_LIBS', +@@ -937,6 +937,25 @@ add_old_configure_assignment('FT2_LIBS', add_old_configure_assignment('FT2_CFLAGS', ft2_info.cflags)