Sun Apr 28 22:00:54 2019 UTC ()
cliqz: Added a comment about NOT_PAX_MPROTECT_SAFE so that pkglint(1)
is happy.

This option is needed by the Javascript JIT used by cliqz, else it
will crash.


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

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