Index: head/www/cliqz/Makefile =================================================================== --- head/www/cliqz/Makefile (revision 526765) +++ head/www/cliqz/Makefile (revision 526766) @@ -1,165 +1,184 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.32.1 -PORTREVISION= 1 +DISTVERSION= 1.33.0 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 DISTFILES= adult-domains.bin:amazon \ cliqz@cliqz.com.xpi:cliqz \ + dat@cliqz.com.xpi:cliqz \ gdprtool@cliqz.com.xpi:cliqz \ https-everywhere@cliqz.com.xpi:cliqz DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} MAINTAINER= fox@FreeBSD.org COMMENT= Secure browser (Mozilla based) with built-in quick search LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE FETCH_DEPENDS= ca_root_nss>=0:security/ca_root_nss LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libharfbuzz.so:print/harfbuzz \ libnspr4.so:devel/nspr \ libnssutil3.so:security/nss \ libplc4.so:devel/nspr \ libplds4.so:devel/nspr BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ + ${RUST_DEFAULT}>=1.39:lang/${RUST_DEFAULT} \ autoconf-2.13:devel/autoconf213 \ bash:shells/bash \ graphite2>=1.3.13:graphics/graphite2 \ harfbuzz>=2.6.1:print/harfbuzz \ icu>=64.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ libvorbis>=1.3.6,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \ nasm:devel/nasm \ node:www/node \ - nspr>=4.21:devel/nspr \ - nss>=3.46.1:security/nss \ + nspr>=4.24:devel/nspr \ + nss>=3.49.2:security/nss \ png>=1.6.35:graphics/png \ - rust-cbindgen>=0.8.7:devel/rust-cbindgen \ - sqlite3>=3.29.0:databases/sqlite3 \ + rust-cbindgen>=0.12.0:devel/rust-cbindgen \ + sqlite3>=3.30.1:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ zip:archivers/zip USES= compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig \ python:2.7,build shebangfix tar:xz xorg USE_GNOME= cairo gconf2 gdkpixbuf2 gtk20 gtk30 USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender xt USE_GITHUB= yes GH_ACCOUNT= cliqz-oss GH_PROJECT= browser-f USE_LDCONFIG= yes bash_OLD_CMD= "/bin/bash" bash_CMD= ${LOCALBASE}/bin/bash 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= 20200121101408 +CLIQZ_LAST_BUILD_ID= 20200219152122 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 CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \ CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} \ LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump \ PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}" \ + RUSTFLAGS=${RUSTFLAGS} \ MOZBUILD_STATE_PATH=${WRKDIR} # Configure args passed into mach build system MOZ_CONFIGURE_ARGS+= "--disable-crashreporter" \ "--disable-debug" \ "--disable-debug-symbols" \ "--disable-tests" \ "--disable-updater" \ "--libclang-path=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" \ "--with-system-graphite2" \ "--with-system-harfbuzz" .include "${.CURDIR}/Makefile.options" .include +# Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk +.if ${ARCH} == amd64 || ${ARCH} == i386 +RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu=/} +.else +RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} +.endif + +.if ${ARCH:Maarch64} || ${MACHINE_CPU:Msse2} +MOZ_CONFIGURE_ARGS+= "--enable-rust-simd" +.else +MOZ_CONFIGURE_ARGS+= "--disable-rust-simd" +.endif + # Require newer Clang than what's in base system unless user opted out .if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} # XXX avoid warnings USES:= ${USES:Ncompiler\:*} .endif post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC} ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/https-everywhere@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/gdprtool@cliqz.com.xpi \ ${WRKSRC}/obj/dist/bin/browser/features post-patch: @${CP} ${MOZ_DESKTOP} ${CLIQZ_DESKTOP} @${REINPLACE_CMD} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ -e 's/@MOZ_APP_NAME@/${PORTNAME}/g' \ -e '/Icon=${PORTNAME}/ s/${PORTNAME}/${CLIQZ_ICON}/' \ -e '/StartupWMClass/d' \ ${CLIQZ_DESKTOP} .for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS} @${ECHO_CMD} "ac_add_options" ${MOZ_CONFIGURE_ARG} >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; .endfor # This prevents linker exhausting memory in i386 builds .if ${ARCH} == "i386" @${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 + +pre-configure-script: + # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64 + @${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \ + ${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh do-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/obj/dist/${PORTNAME} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) # Check if the wayland lib was generated, this happens if # x11-toolkits/gtk30 has WAYLAND option enabled. @if [ -f ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libmozwayland.so ]; then \ ${REINPLACE_CMD} -e 's|%%WAYLAND%%||' ${TMPPLIST}; \ else \ ${REINPLACE_CMD} -e 's|%%WAYLAND%%|@comment |' ${TMPPLIST}; \ fi @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME} post-install: ${RLN} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps @${CP} ${CLIQZ_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON} .include Index: head/www/cliqz/distinfo =================================================================== --- head/www/cliqz/distinfo (revision 526765) +++ head/www/cliqz/distinfo (revision 526766) @@ -1,11 +1,13 @@ -TIMESTAMP = 1579729917 -SHA256 (cliqz/adult-domains.bin) = fcbec6811ca696bd044c0cce7f7aae45f4b822797eb6ecf657e5dc795870418f +TIMESTAMP = 1582289075 +SHA256 (cliqz/adult-domains.bin) = f726171965328f60e2cc2a50311883e76c21b3359f2596d10be76cc33abdda88 SIZE (cliqz/adult-domains.bin) = 528392 -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/cliqz@cliqz.com.xpi) = 0c2d2b36a6d5a37465453cef53ce22183177ef1ecebfbd759ab56dfc50deabe0 +SIZE (cliqz/cliqz@cliqz.com.xpi) = 3678987 +SHA256 (cliqz/dat@cliqz.com.xpi) = 1916b65b6f5d21e2c539afd6918c2b5b264bf82b4a987d9677eae28e528eb33f +SIZE (cliqz/dat@cliqz.com.xpi) = 986532 +SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 7d59af6529b0756e5a89cf150f781a81a1cc1284eab2de00a6a89432f65a711d +SIZE (cliqz/gdprtool@cliqz.com.xpi) = 219684 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 +SHA256 (cliqz/cliqz-oss-browser-f-1.33.0_GH0.tar.gz) = 25305a1f331f9f96a9bb5a2d3ea811926d3fa1428bbc718091a40b81a1e456fe +SIZE (cliqz/cliqz-oss-browser-f-1.33.0_GH0.tar.gz) = 499857375 Index: head/www/cliqz/files/patch-bug1556301 =================================================================== --- head/www/cliqz/files/patch-bug1556301 (revision 526765) +++ head/www/cliqz/files/patch-bug1556301 (nonexistent) @@ -1,241 +0,0 @@ -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); Property changes on: head/www/cliqz/files/patch-bug1556301 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-addon-search =================================================================== --- head/www/cliqz/files/patch-addon-search (nonexistent) +++ head/www/cliqz/files/patch-addon-search (revision 526766) @@ -0,0 +1,51 @@ +https://github.com/mozilla/addons/issues/708 +https://github.com/mozilla/addons-frontend/issues/4610 + +Taken from www/firefox + +--- mozilla-release/browser/app/profile/firefox.js.orig 2020-02-19 14:20:43 UTC ++++ mozilla-release/browser/app/profile/firefox.js +@@ -37,8 +37,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); +-pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); ++pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%"); ++pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%"); + pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/"); + pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%"); + pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%"); +@@ -174,8 +174,8 @@ pref("app.update.url", "https://updatecheck.cliqz.com/ + // .. etc .. + // + pref("extensions.update.enabled", true); +-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); +-pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); + #if MOZ_UPDATE_CHANNEL == beta + // CLIQZ-SPECIAL: force addons update in every 30 min on beta + pref("extensions.update.interval", 1800); +--- mozilla-release/toolkit/mozapps/extensions/internal/AddonRepository.jsm.orig 2020-02-19 14:20:43 UTC ++++ mozilla-release/toolkit/mozapps/extensions/internal/AddonRepository.jsm +@@ -586,7 +586,7 @@ var AddonRepository = { + addon.version = String(aEntry.current_version.version); + if (Array.isArray(aEntry.current_version.files)) { + for (let file of aEntry.current_version.files) { +- if (file.platform == "all" || file.platform == PLATFORM) { ++ if (file.platform == "all" || file.platform == "linux" || file.platform == PLATFORM) { + if (file.url) { + addon.sourceURI = NetUtil.newURI(file.url); + } +--- mozilla-release/toolkit/mozapps/extensions/internal/XPIDatabase.jsm.orig 2020-02-19 14:20:43 UTC ++++ mozilla-release/toolkit/mozapps/extensions/internal/XPIDatabase.jsm +@@ -484,7 +484,7 @@ class AddonInternal { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) { Property changes on: head/www/cliqz/files/patch-addon-search ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-bug1288587 =================================================================== --- head/www/cliqz/files/patch-bug1288587 (nonexistent) +++ head/www/cliqz/files/patch-bug1288587 (revision 526766) @@ -0,0 +1,72 @@ +Taken from www/firefox + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 855214a..1e91d51 100644 +--- mozilla-release/build/moz.configure/init.configure ++++ mozilla-release/build/moz.configure/init.configure +@@ -211,6 +211,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr + @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') + @imports(_from='mozbuild.virtualenv', _import='verify_python_version') + @imports(_from='mozbuild.virtualenv', _import='PY2') ++@imports(_from='__builtin__', _import='KeyError') + def virtualenv_python2(env_python, build_env, mozconfig, help): + if help: + return +@@ -242,6 +243,12 @@ def virtualenv_python2(env_python, build_env, mozconfi + python = mozconfig['vars']['added']['PYTHON'] + elif 'PYTHON' in mozconfig['vars']['modified']: + python = mozconfig['vars']['modified']['PYTHON'][1] ++ for i in ('env', 'vars'): ++ for j in ('added', 'modified'): ++ try: ++ del mozconfig[i][j]['PYTHON'] ++ except KeyError: ++ pass + + log.debug("python2: executable from configuration: %r" % python) + +@@ -294,7 +301,10 @@ def virtualenv_python2(env_python, build_env, mozconfi + sys.executable, manager.python_path)) + log.info('Reexecuting in the virtualenv') + if env_python: +- del os.environ['PYTHON'] ++ try: ++ del os.environ['PYTHON'] ++ except KeyError: ++ pass + # One would prefer to use os.execl, but that's completely borked on + # Windows. + sys.exit(subprocess.call([python] + sys.argv)) +@@ -430,6 +440,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre + @imports(_from='mozbuild.virtualenv', _import='PY3') + @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') + @imports(_from='mozbuild.pythonutil', _import='python_executable_version') ++@imports(_from='__builtin__', _import='KeyError') + def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help): + if help: + return +@@ -465,6 +476,12 @@ def virtualenv_python3(env_python, build_env, mozillab + python = mozconfig['vars']['added']['PYTHON3'] + elif 'PYTHON3' in mozconfig['vars']['modified']: + python = mozconfig['vars']['modified']['PYTHON3'][1] ++ for i in ('env', 'vars'): ++ for j in ('added', 'modified'): ++ try: ++ del mozconfig[i][j]['PYTHON3'] ++ except KeyError: ++ pass + + log.debug("python3: executable from configuration: %r" % python) + +@@ -545,7 +562,10 @@ def virtualenv_python3(env_python, build_env, mozillab + sys.executable, manager.python_path)) + log.info('Re-executing in the virtualenv') + if env_python: +- del os.environ['PYTHON3'] ++ try: ++ del os.environ['PYTHON3'] ++ except KeyError: ++ pass + # One would prefer to use os.execl, but that's completely borked on + # Windows. + sys.exit(subprocess.call([python] + sys.argv)) Property changes on: head/www/cliqz/files/patch-bug1288587 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-bug1594027 =================================================================== --- head/www/cliqz/files/patch-bug1594027 (nonexistent) +++ head/www/cliqz/files/patch-bug1594027 (revision 526766) @@ -0,0 +1,31 @@ +Disable STL wrappers in some places to help libc++ 9 + +Taken from www/firefox + +diff --git config/external/rlbox/moz.build config/external/rlbox/moz.build +index d216e62cad861..391bbdf566b88 100644 +--- mozilla-release/config/external/rlbox/moz.build ++++ mozilla-release/config/external/rlbox/moz.build +@@ -26,4 +26,7 @@ SOURCES += [ + 'rlbox_thread_locals.cpp' + ] + ++# bug 1594027 ++DisableStlWrapping() ++ + FINAL_LIBRARY = 'xul' +\ No newline at end of file +diff --git gfx/graphite2/src/moz.build gfx/graphite2/src/moz.build +index 447cd861126a3..8a4fcd814e6fb 100755 +--- mozilla-release/gfx/graphite2/src/moz.build ++++ mozilla-release/gfx/graphite2/src/moz.build +@@ -69,6 +69,9 @@ if CONFIG['MOZ_WASM_SANDBOXING_GRAPHITE']: + # thebes + DefineAndWasmDefine('GRAPHITE2_STATIC', True) + ++# bug 1594027 ++DisableStlWrapping() ++ + # We allow warnings for third-party code that can be updated from upstream. + AllowCompilerWarnings() + Property changes on: head/www/cliqz/files/patch-bug1594027 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-bug847568 =================================================================== --- head/www/cliqz/files/patch-bug847568 (revision 526765) +++ head/www/cliqz/files/patch-bug847568 (revision 526766) @@ -1,286 +1,289 @@ # Allow building against system-wide graphite2/harfbuzz. +Taken from www/firefox + 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 @@ -1299,6 +1299,19 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: 'proxy.h', ] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + system_headers += [ + 'graphite2/Font.h', + 'graphite2/Segment.h', + ] + +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + system_headers += [ + 'harfbuzz/hb-glib.h', + 'harfbuzz/hb-ot.h', + 'harfbuzz/hb.h', + ] + if CONFIG['MOZ_SYSTEM_LIBVPX']: system_headers += [ 'vpx_mem/vpx_mem.h', 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 @@ -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'] + 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 @@ +@@ -0,0 +1,21 @@ +# -*- 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', ++ 'include/GraphiteStructsForRLBox.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 # Script used to update the Graphite2 library in the mozilla source tree +# and bump version for --with-system-graphite2 # 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/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/;" {} \; +# chase version for --with-system-graphite2 +perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ + if /GR2_VERSION_REQUIRE/" old-configure.in + # summarize what's been touched echo Updated to $RELEASE. echo Here is what changed in the gfx/graphite2 directory: echo -hg stat gfx/graphite2 +hg stat old-configure.in gfx/graphite2 echo echo If gfx/graphite2/src/files.mk has changed, please make corresponding 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. If the collection of source files changes, manual updates to moz.build may be needed as we don't use the upstream makefiles. + +The in-tree copy may be omitted during build by --with-system-harfbuzz. +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. 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,14 @@ with Files('wr/**'): if CONFIG['MOZ_TREE_CAIRO']: DIRS += ['cairo'] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + DIRS += ['graphite2/geckoextra'] +else: + DIRS += ['graphite2/src' ] + +if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: + DIRS += ['harfbuzz/src'] + DIRS += [ '2d', 'ycbcr', @@ -21,8 +29,6 @@ DIRS += [ 'qcms', 'gl', 'layers', - 'graphite2/src', - 'harfbuzz/src', 'ots/src', 'thebes', 'ipc', 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', ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] 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', ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] 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']: LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] -DEFINES['GRAPHITE2_STATIC'] = True +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] +else: + DEFINES['GRAPHITE2_STATIC'] = True + +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] if CONFIG['CC_TYPE'] == 'clang': # Suppress warnings from Skia header files. 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', ] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + FINAL_LIBRARY = 'xul' 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 @@ -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'] diff --git old-configure.in old-configure.in index 95a58b634593..b614eef85c89 100644 --- mozilla-release/old-configure.in +++ mozilla-release/old-configure.in @@ -2639,6 +2639,27 @@ dnl ======================================================== AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) +dnl ======================================================== +dnl Check for graphite2 +dnl ======================================================== +if test -n "$MOZ_SYSTEM_GRAPHITE2"; then + dnl graphite2.pc has bogus version, check manually + _SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" + AC_TRY_COMPILE([ #include + #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ + ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,12) ++ #if !GR2_VERSION_REQUIRE(1,3,13) + #error "Insufficient graphite2 version." + #endif + ], [], + [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) + CFLAGS=$_SAVE_CFLAGS +fi + dnl ======================================================== dnl Check for pixman and cairo dnl ======================================================== 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 @@ -248,6 +248,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: if CONFIG['MOZ_SYSTEM_WEBP']: OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: + OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] + +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + if CONFIG['MOZ_SYSTEM_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] diff --git toolkit/moz.configure toolkit/moz.configure index 9297e4d6f501..d8e273887e4b 100644 --- mozilla-release/toolkit/moz.configure +++ mozilla-release/toolkit/moz.configure @@ -937,6 +937,25 @@ add_old_configure_assignment('FT2_LIBS', add_old_configure_assignment('FT2_CFLAGS', ft2_info.cflags) +# Graphite2 +# ============================================================== +option('--with-system-graphite2', + help="Use system graphite2 (located with pkgconfig)") + +system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', + when='--with-system-graphite2') + +set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) + +# HarfBuzz +# ============================================================== +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.2', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.4', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) # Remote agent (part of CDP based remote protocol) # ============================================================== Index: head/www/cliqz/files/patch-cubeb-sndio =================================================================== --- head/www/cliqz/files/patch-cubeb-sndio (nonexistent) +++ head/www/cliqz/files/patch-cubeb-sndio (revision 526766) @@ -0,0 +1,17 @@ +https://github.com/kinetiknz/cubeb/commit/3ab507569153 + +Taken from www/firefox + +diff --git a/src/cubeb_sndio.c b/src/cubeb_sndio.c +index 4a05bd84..34b3513d 100644 +--- mozilla-release/media/libcubeb/src/cubeb_sndio.c ++++ mozilla-release/media/libcubeb/src/cubeb_sndio.c +@@ -128,7 +128,7 @@ s16_to_float(void *ptr, long nsamp) + static const char * + sndio_get_device() + { +-#ifndef __OpenBSD__ ++#ifdef __linux__ + /* + * On other platforms default to sndio devices, + * so cubebs other backends can be used instead. Property changes on: head/www/cliqz/files/patch-cubeb-sndio ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-mozilla-release_config_rules.mk =================================================================== --- head/www/cliqz/files/patch-mozilla-release_config_rules.mk (revision 526765) +++ head/www/cliqz/files/patch-mozilla-release_config_rules.mk (revision 526766) @@ -1,26 +1,34 @@ ---- mozilla-release/config/rules.mk.orig 2019-11-13 13:22:25 UTC +--- mozilla-release/config/rules.mk.orig 2020-02-19 14:20:43 UTC +++ mozilla-release/config/rules.mk -@@ -960,20 +960,20 @@ $(EXTENSIONS_PATH): +@@ -914,27 +914,27 @@ $(EXTENSIONS_PATH): CLIQZ_XPI_PATH = $(EXTENSIONS_PATH)/cliqz@cliqz.com.xpi $(CLIQZ_XPI_PATH): $(EXTENSIONS_PATH) echo CLIQZ_XPI_PATH in `pwd` - wget --output-document $(CLIQZ_XPI_PATH) $(CLIQZ_EXT_URL) +# wget --output-document $(CLIQZ_XPI_PATH) $(CLIQZ_EXT_URL) HTTPSE_XPI_PATH = $(EXTENSIONS_PATH)/https-everywhere@cliqz.com.xpi $(HTTPSE_XPI_PATH): $(EXTENSIONS_PATH) ifdef HTTPSE_EXT_URL echo HTTPSE_XPI_PATH in `pwd` - wget --output-document $(HTTPSE_XPI_PATH) $(HTTPSE_EXT_URL) +# wget --output-document $(HTTPSE_XPI_PATH) $(HTTPSE_EXT_URL) endif CONSENTRICK_XPI_PATH = $(EXTENSIONS_PATH)/gdprtool@cliqz.com.xpi $(CONSENTRICK_XPI_PATH): $(EXTENSIONS_PATH) ifdef CONSENTRICK_EXT_URL echo CONSENTRICK_XPI_PATH in `pwd` - wget --output-document $(CONSENTRICK_XPI_PATH) $(CONSENTRICK_EXT_URL) +# wget --output-document $(CONSENTRICK_XPI_PATH) $(CONSENTRICK_EXT_URL) endif DAT_XPI_PATH = $(EXTENSIONS_PATH)/dat@cliqz.com.xpi + $(DAT_XPI_PATH): $(EXTENSIONS_PATH) + ifdef DAT_EXT_URL + echo DAT_XPI_PATH in `pwd` +- wget --output-document $(DAT_XPI_PATH) $(DAT_EXT_URL) ++# wget --output-document $(DAT_XPI_PATH) $(DAT_EXT_URL) + endif + + CLIQZ_CFG = $(DIST_RESPATH)/cliqz.cfg Index: head/www/cliqz/pkg-plist =================================================================== --- head/www/cliqz/pkg-plist (revision 526765) +++ head/www/cliqz/pkg-plist (revision 526766) @@ -1,52 +1,48 @@ bin/cliqz lib/cliqz/application.ini lib/cliqz/browser/adult-domains.bin lib/cliqz/browser/blocklist.xml -lib/cliqz/browser/chrome.manifest lib/cliqz/browser/chrome/icons/default/default128.png lib/cliqz/browser/chrome/icons/default/default16.png lib/cliqz/browser/chrome/icons/default/default32.png lib/cliqz/browser/chrome/icons/default/default48.png lib/cliqz/browser/chrome/icons/default/default64.png lib/cliqz/browser/features/cliqz@cliqz.com.xpi lib/cliqz/browser/features/gdprtool@cliqz.com.xpi lib/cliqz/browser/features/https-everywhere@cliqz.com.xpi lib/cliqz/browser/omni.ja -lib/cliqz/chrome.manifest lib/cliqz/cliqz lib/cliqz/cliqz-bin lib/cliqz/cliqz.cfg lib/cliqz/defaults/pref/channel-prefs.js lib/cliqz/dependentlibs.list lib/cliqz/gmp-clearkey/0.1/libclearkey.so lib/cliqz/gmp-clearkey/0.1/manifest.json lib/cliqz/gtk2/libmozgtk.so lib/cliqz/libfreebl3.chk lib/cliqz/libfreebl3.so lib/cliqz/liblgpllibs.so lib/cliqz/libmozavcodec.so lib/cliqz/libmozavutil.so lib/cliqz/libmozgtk.so lib/cliqz/libmozsqlite3.so %%WAYLAND%%lib/cliqz/libmozwayland.so lib/cliqz/libnspr4.so lib/cliqz/libnss3.so lib/cliqz/libnssckbi.so -lib/cliqz/libnssdbm3.chk -lib/cliqz/libnssdbm3.so lib/cliqz/libnssutil3.so lib/cliqz/libplc4.so lib/cliqz/libplds4.so lib/cliqz/libsmime3.so lib/cliqz/libsoftokn3.chk lib/cliqz/libsoftokn3.so lib/cliqz/libssl3.so lib/cliqz/libxul.so lib/cliqz/omni.ja lib/cliqz/pingsender lib/cliqz/platform.ini lib/cliqz/plugin-container lib/cliqz/precomplete lib/cliqz/removed-files share/applications/cliqz.desktop share/pixmaps/cliqz.png