Sat Jun 8 00:56:22 2019 UTC ()
cliqz: Fixed build failures.

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

2. Bump PKGREVISION


(fox)
diff -r1.9 -r1.10 pkgsrc/www/cliqz/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/www/cliqz/Attic/Makefile (switch to unified diff)

--- pkgsrc/www/cliqz/Attic/Makefile 2019/06/07 01:19:07 1.9
+++ pkgsrc/www/cliqz/Attic/Makefile 2019/06/08 00:56:22 1.10
@@ -1,128 +1,130 @@ @@ -1,128 +1,130 @@
1# $NetBSD: Makefile,v 1.9 2019/06/07 01:19:07 fox Exp $ 1# $NetBSD: Makefile,v 1.10 2019/06/08 00:56:22 fox Exp $
2 2
3DISTNAME= cliqz-1.27.0 3DISTNAME= cliqz-1.27.0
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_GITHUB:=cliqz-oss/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=cliqz-oss/}
6GITHUB_PROJECT= browser-f 7GITHUB_PROJECT= browser-f
7GITHUB_TAG= ${PKGVERSION_NOREV} 8GITHUB_TAG= ${PKGVERSION_NOREV}
8DISTFILES= adult-domains.bin \ 9DISTFILES= adult-domains.bin \
9 cliqz@cliqz.com.xpi \ 10 cliqz@cliqz.com.xpi \
10 https-everywhere@cliqz.com.xpi \ 11 https-everywhere@cliqz.com.xpi \
11 gdprtool@cliqz.com.xpi \ 12 gdprtool@cliqz.com.xpi \
12 ${DISTNAME}${EXTRACT_SUFX} 13 ${DISTNAME}${EXTRACT_SUFX}
13DIST_SUBDIR= ${PKGNAME_NOREV} 14DIST_SUBDIR= ${PKGNAME_NOREV}
14 15
15CLIQZ_CHANNEL= release 16CLIQZ_CHANNEL= release
16# If the PKGVERSION_NOREV is updated, make sure to update the last build id from 17# If the PKGVERSION_NOREV is updated, make sure to update the last build id from
17# ftp -Vo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/lastbuildid 18# ftp -Vo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/lastbuildid
18CLIQZ_LAST_BUILD_ID= 20190603212344 19CLIQZ_LAST_BUILD_ID= 20190603212344
19CLIQZ_PLUGIN_SUFX= @cliqz.com.xpi 20CLIQZ_PLUGIN_SUFX= @cliqz.com.xpi
20 21
21SITES.adult-domains.bin= \ 22SITES.adult-domains.bin= \
22 https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/ 23 https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/
23SITES.cliqz${CLIQZ_PLUGIN_SUFX}= \ 24SITES.cliqz${CLIQZ_PLUGIN_SUFX}= \
24 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/ 25 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
25SITES.https-everywhere${CLIQZ_PLUGIN_SUFX}= \ 26SITES.https-everywhere${CLIQZ_PLUGIN_SUFX}= \
26 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/ 27 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
27SITES.gdprtool${CLIQZ_PLUGIN_SUFX}= \ 28SITES.gdprtool${CLIQZ_PLUGIN_SUFX}= \
28 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/ 29 https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
29 30
30EXTRACT_USING= bsdtar 31EXTRACT_USING= bsdtar
31EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 32EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
32 33
33MAINTAINER= fox@NetBSD.org 34MAINTAINER= fox@NetBSD.org
34HOMEPAGE= https://cliqz.com/en/desktop 35HOMEPAGE= https://cliqz.com/en/desktop
35COMMENT= Secure browser (Mozilla based) with built-in quick search 36COMMENT= Secure browser (Mozilla based) with built-in quick search
36LICENSE= mpl-2.0 AND gnu-gpl-v2 37LICENSE= mpl-2.0 AND gnu-gpl-v2
37 38
38USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip bash pax 39USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip bash pax
39USE_LANGUAGES+= c99 gnu++14 40USE_LANGUAGES+= c99 gnu++14
40 41
41# Build script does not support python 3.x yet. 42# Build script does not support python 3.x yet.
42# https://firefox-source-docs.mozilla.org/build/buildsystem/python.html 43# https://firefox-source-docs.mozilla.org/build/buildsystem/python.html
43PYTHON_VERSIONS_ACCEPTED= 27 44PYTHON_VERSIONS_ACCEPTED= 27
44PYTHON_FOR_BUILD_ONLY= tool 45PYTHON_FOR_BUILD_ONLY= tool
45TOOL_DEPENDS+= cbindgen>=0.8.2:../../devel/cbindgen 46TOOL_DEPENDS+= cbindgen>=0.8.2:../../devel/cbindgen
46TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 47TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
47 48
48BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 49BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
 50BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
49 51
50WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV} 52WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
51 53
52CLIQZ_ICON= cliqz.png 54CLIQZ_ICON= cliqz.png
53CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/cliqz/default48.png 55CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/cliqz/default48.png
54MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop 56MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop
55CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop 57CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop
56 58
57MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} 59MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL}
58MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} 60MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID}
59MAKE_ENV+= MOZBUILD_STATE_PATH=${WRKDIR}/.home/.mozbuild 61MAKE_ENV+= MOZBUILD_STATE_PATH=${WRKDIR}/.home/.mozbuild
60 62
61.include "mozilla-common.mk" 63.include "mozilla-common.mk"
62.include "options.mk" 64.include "options.mk"
63 65
64CHECK_WRKREF_SKIP+= lib/cliqz/chrome/toolkit/content/global/buildconfig.html 66CHECK_WRKREF_SKIP+= lib/cliqz/chrome/toolkit/content/global/buildconfig.html
65 67
66REPLACE_BASH+= magic_build_and_package.sh 68REPLACE_BASH+= magic_build_and_package.sh
67 69
68CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS 70CFLAGS+= -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
69LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/cliqz ${COMPILER_RPATH_FLAG}${PREFIX}/lib 71LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/cliqz ${COMPILER_RPATH_FLAG}${PREFIX}/lib
70 72
71# Needed by the Javascript JIT used in cliqz 73# Needed by the Javascript JIT used in cliqz
72NOT_PAX_MPROTECT_SAFE+= lib/cliqz/cliqz 74NOT_PAX_MPROTECT_SAFE+= lib/cliqz/cliqz
73NOT_PAX_MPROTECT_SAFE+= lib/cliqz/cliqz-bin 75NOT_PAX_MPROTECT_SAFE+= lib/cliqz/cliqz-bin
74NOT_PAX_MPROTECT_SAFE+= lib/cliqz/plugin-container 76NOT_PAX_MPROTECT_SAFE+= lib/cliqz/plugin-container
75 77
76post-extract: 78post-extract:
77 ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC} 79 ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC}
78 ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features 80 ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features
79 ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz${CLIQZ_PLUGIN_SUFX} \ 81 ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz${CLIQZ_PLUGIN_SUFX} \
80 ${DISTDIR}/${DIST_SUBDIR}/https-everywhere${CLIQZ_PLUGIN_SUFX} \ 82 ${DISTDIR}/${DIST_SUBDIR}/https-everywhere${CLIQZ_PLUGIN_SUFX} \
81 ${DISTDIR}/${DIST_SUBDIR}/gdprtool${CLIQZ_PLUGIN_SUFX} \ 83 ${DISTDIR}/${DIST_SUBDIR}/gdprtool${CLIQZ_PLUGIN_SUFX} \
82 ${WRKSRC}/obj/dist/bin/browser/features 84 ${WRKSRC}/obj/dist/bin/browser/features
83 85
84post-patch: 86post-patch:
85 ${SED} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ 87 ${SED} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \
86 -e 's/@MOZ_APP_NAME@/cliqz/g' \ 88 -e 's/@MOZ_APP_NAME@/cliqz/g' \
87 -e '/Icon=cliqz/ s/cliqz/${CLIQZ_ICON}/' \ 89 -e '/Icon=cliqz/ s/cliqz/${CLIQZ_ICON}/' \
88 -e '/StartupWMClass/d' \ 90 -e '/StartupWMClass/d' \
89 < ${MOZ_DESKTOP} \ 91 < ${MOZ_DESKTOP} \
90 > ${CLIQZ_DESKTOP} 92 > ${CLIQZ_DESKTOP}
91 for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS}; do \ 93 for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS}; do \
92 ${ECHO} $$MOZ_CONFIGURE_ARG >> \ 94 ${ECHO} $$MOZ_CONFIGURE_ARG >> \
93 ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; \ 95 ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; \
94 done; 96 done;
95 97
96do-build: 98do-build:
97 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh 99 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh
98 100
99INSTALLATION_DIRS+= share/applications share/pixmaps bin lib/cliqz 101INSTALLATION_DIRS+= share/applications share/pixmaps bin lib/cliqz
100do-install: 102do-install:
101 cd ${WRKSRC}/obj/dist/cliqz && \ 103 cd ${WRKSRC}/obj/dist/cliqz && \
102 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/cliqz && \ 104 ${PAX} -wr * ${DESTDIR}${PREFIX}/lib/cliqz && \
103 ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${DESTDIR}${PREFIX}/lib/* 105 ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${DESTDIR}${PREFIX}/lib/*
104 cd ${DESTDIR}${PREFIX}/lib && \ 106 cd ${DESTDIR}${PREFIX}/lib && \
105 ${FIND} . \( -name \*.js -or \ 107 ${FIND} . \( -name \*.js -or \
106 -name \*.html -or \ 108 -name \*.html -or \
107 -name \*.xml -or \ 109 -name \*.xml -or \
108 -name \*.svg \ 110 -name \*.svg \
109 \) \ 111 \) \
110 -type f \ 112 -type f \
111 -exec ${CHMOD} 0644 '{}' \; 113 -exec ${CHMOD} 0644 '{}' \;
112 114
113post-install: 115post-install:
114 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/cliqz 116 ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/cliqz
115 ${ECHO} 'exec ${PREFIX}/lib/cliqz/cliqz "$$@"' >> ${DESTDIR}${PREFIX}/bin/cliqz 117 ${ECHO} 'exec ${PREFIX}/lib/cliqz/cliqz "$$@"' >> ${DESTDIR}${PREFIX}/bin/cliqz
116 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/cliqz 118 ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/cliqz
117 ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${DESTDIR}${PREFIX}/share/applications/ 119 ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${DESTDIR}${PREFIX}/share/applications/
118 ${INSTALL_DATA} ${CLIQZ_ICON_SRC} ${DESTDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON} 120 ${INSTALL_DATA} ${CLIQZ_ICON_SRC} ${DESTDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON}
119 121
120.include "../../lang/python/pyversion.mk" 122.include "../../lang/python/pyversion.mk"
121BUILDLINK_DEPMETHOD.clang= build 123BUILDLINK_DEPMETHOD.clang= build
122BUILDLINK_API_DEPENDS.clang+= clang>=6.0.1nb1 124BUILDLINK_API_DEPENDS.clang+= clang>=6.0.1nb1
123.include "../../lang/clang/buildlink3.mk" 125.include "../../lang/clang/buildlink3.mk"
124BUILDLINK_DEPMETHOD.rust= build 126BUILDLINK_DEPMETHOD.rust= build
125BUILDLINK_API_DEPENDS.rust+= rust>=1.31.0 127BUILDLINK_API_DEPENDS.rust+= rust>=1.31.0
126.include "../../lang/rust/buildlink3.mk" 128.include "../../lang/rust/buildlink3.mk"
127.include "../../sysutils/desktop-file-utils/desktopdb.mk" 129.include "../../sysutils/desktop-file-utils/desktopdb.mk"
128.include "../../mk/bsd.pkg.mk" 130.include "../../mk/bsd.pkg.mk"