CVS commit: pkgsrc/www/cliqz

["Santhosh Raju" <fox%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fox
Date:           Wed May 22 10:53:12 UTC 2019

Modified Files:
        pkgsrc/www/cliqz: Makefile mozilla-common.mk

Log Message:
cliqz: Fixed build failures.

1. Added a missing build dependency, devel/yasm.

2. Fixed build failures when compiling with rust>=1.33 by disabling the
--enable-rust-simd flag for now. (borrowed from ryoon@'s fix from
www/firefox)

3. Bumped the rust dependency minimum version to 1.31.

4. Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/cliqz/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/cliqz/mozilla-common.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/cliqz/Makefile
diff -u pkgsrc/www/cliqz/Makefile:1.7 pkgsrc/www/cliqz/Makefile:1.8
--- pkgsrc/www/cliqz/Makefile:1.7       Mon May 13 11:59:06 2019
+++ pkgsrc/www/cliqz/Makefile   Wed May 22 10:53:12 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2019/05/13 11:59:06 fox Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/22 10:53:12 fox Exp $
 
 DISTNAME=      cliqz-1.26.5
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=cliqz-oss/}
 GITHUB_PROJECT=        browser-f
@@ -45,7 +46,9 @@ PYTHON_FOR_BUILD_ONLY=                tool
 TOOL_DEPENDS+=                 cbindgen-[0-9]*:../../devel/cbindgen
 TOOL_DEPENDS+=                 nodejs-[0-9]*:../../lang/nodejs
 
-WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
+BUILD_DEPENDS+=                        yasm>=1.1:../../devel/yasm
+
+WRKSRC=                        ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
 CLIQZ_ICON=            cliqz.png
 CLIQZ_ICON_SRC=                ${WRKSRC}/mozilla-release/browser/branding/cliqz/default48.png
@@ -120,7 +123,7 @@ BUILDLINK_DEPMETHOD.clang=     build
 BUILDLINK_API_DEPENDS.clang+=  clang>=6.0.1nb1
 .include "../../lang/clang/buildlink3.mk"
 BUILDLINK_DEPMETHOD.rust=      build
-BUILDLINK_API_DEPENDS.rust+=   rust>=1.24.0
+BUILDLINK_API_DEPENDS.rust+=   rust>=1.31.0
 .include "../../lang/rust/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/cliqz/mozilla-common.mk
diff -u pkgsrc/www/cliqz/mozilla-common.mk:1.1 pkgsrc/www/cliqz/mozilla-common.mk:1.2
--- pkgsrc/www/cliqz/mozilla-common.mk:1.1      Fri Apr 19 14:02:03 2019
+++ pkgsrc/www/cliqz/mozilla-common.mk  Wed May 22 10:53:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.1 2019/04/19 14:02:03 fox Exp $
+# $NetBSD: mozilla-common.mk,v 1.2 2019/05/22 10:53:12 fox Exp $
 #
 # Common Makefile fragment for mozilla packages based on gecko 2.0.
 # derived from www/firefox
@@ -64,7 +64,9 @@ MOZ_CONFIGURE_ARGS+=  "ac_add_options --w
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-default-toolkit=cairo-gtk3"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-system-pixman"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-webrender=build"
-MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-rust-simd"
+# Disable Rust SIMD option to fix build with lang/rust-1.33.0
+# This should be enabled later again.
+#MOZ_CONFIGURE_ARGS+=  "ac_add_options --enable-rust-simd"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-system-ffi"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-chrome-format=flat"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-gconf"