Attachment #206851 for bug #239994




# $FreeBSD: head/www/cliqz/Makefile 508994 2019-08-15 14:30:16Z tobik $

PORTNAME=	cliqz
DISTVERSION=	1.28.2
PORTREVISION=	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
DISTFILES=	adult-domains.bin:amazon \
		cliqz@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=	santhosh.raju@gmail.com

		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libnspr4.so:devel/nspr \
		libnssutil3.so:security/nss \
		libplc4.so:devel/nspr \
		libplds4.so:devel/nspr
		libnssutil3.so:security/nss

BUILD_DEPENDS=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \
		${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
		${RUST_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \
		autoconf-2.13:devel/autoconf213 \
		bash:shells/bash \
		graphite2>=1.3.12:graphics/graphite2 \
		harfbuzz>=1.8.8:print/harfbuzz \

		libevent>=2.1.8:devel/libevent \
		libvorbis>=1.3.6,3:audio/libvorbis \
		libvpx>=1.5.0:multimedia/libvpx \
		${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
		llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \
		nasm:devel/nasm \
		node:www/node \
		nspr>=4.19:devel/nspr \
		nss>=3.39:security/nss \
		png>=1.6.34:graphics/png \
		${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \
		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
		${RUST_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \
		rust-cbindgen>=0.6.2:devel/rust-cbindgen \
		sqlite3>=3.24.0:databases/sqlite3 \
		v4l_compat>0:multimedia/v4l_compat \
		yasm:devel/yasm \
		zip:archivers/zip

USES=		compiler:c11 desktop-file-utils gmake gnome pkgconfig \
		python:2.7,build shebangfix tar:xz

USE_GNOME=	cairo gconf2 gdkpixbuf2 gtk20 gtk30

USE_XORG=	x11 xcb xcb xcomposite xcursor xdamage xext xfixes xi xrender \
		xt

USE_GITHUB=	yes
GH_ACCOUNT=	cliqz-oss

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=	20190816174655
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 \
		MOZBUILD_STATE_PATH=${WRKDIR}

post-extract:
	${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC}

Lines 1-11 Link Here

(-)b/www/cliqz/distinfo (-11 / +11 lines)
1	TIMESTAMP = 1565224721	1	TIMESTAMP = 1566401840
2	SHA256 (adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65	2	SHA256 (cliqz/adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65
3	SIZE (adult-domains.bin) = 528392	3	SIZE (cliqz/adult-domains.bin) = 528392
4	SHA256 (cliqz@cliqz.com.xpi) = 833455156987be6100e444df4cb12aa0f8a1a4df45b82198bed8f50958045a1c	4	SHA256 (cliqz/cliqz@cliqz.com.xpi) = 833455156987be6100e444df4cb12aa0f8a1a4df45b82198bed8f50958045a1c
5	SIZE (cliqz@cliqz.com.xpi) = 7795084	5	SIZE (cliqz/cliqz@cliqz.com.xpi) = 7795084
6	SHA256 (https-everywhere@cliqz.com.xpi) = 92d43d3c7313bd890cb8ded3229aa1814ca3ebaec1b74bb317154a823b35355b	6	SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 1b07623b967694ca0bf45a2f88c52317f90bda1436633800cf4d02b3de54fb76
7	SIZE (https-everywhere@cliqz.com.xpi) = 1765469	7	SIZE (cliqz/gdprtool@cliqz.com.xpi) = 222806
8	SHA256 (gdprtool@cliqz.com.xpi) = 1b07623b967694ca0bf45a2f88c52317f90bda1436633800cf4d02b3de54fb76	8	SHA256 (cliqz/https-everywhere@cliqz.com.xpi) = 92d43d3c7313bd890cb8ded3229aa1814ca3ebaec1b74bb317154a823b35355b
9	SIZE (gdprtool@cliqz.com.xpi) = 222806	9	SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 1765469
10	SHA256 (cliqz-oss-browser-f-1.28.1_GH0.tar.gz) = 4d6d0dbf87d30e760b66e6e891ab80ff5e9863168ce9641cebfe4b114fe38e10	10	SHA256 (cliqz/cliqz-oss-browser-f-1.28.2_GH0.tar.gz) = eb22c3c06530a78012e300cd0be28d03e386270477fee29087941ec19d093982
11	SIZE (cliqz-oss-browser-f-1.28.1_GH0.tar.gz) = 496805470	11	SIZE (cliqz/cliqz-oss-browser-f-1.28.2_GH0.tar.gz) = 496816279




Firefox pulls in if_var.h which causes "class thread" conflicts with
"struct thread" in sys/lock.h.

https://lists.freebsd.org/pipermail/svn-src-all/2019-August/184844.html

--- mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h.orig	2019-08-23 20:05:51 UTC
+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h
@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
 #include <sys/socket.h>
 #ifndef LINUX
 #include <net/if.h>
-#if !defined(__OpenBSD__) && !defined(__NetBSD__)
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
 #include <net/if_var.h>
 #endif
 #include <net/if_dl.h>

Return to bug 239994

Lines 1-15 Link Here

(-)b/www/cliqz/Makefile (-22 / +22 lines)
1	# $FreeBSD: head/www/cliqz/Makefile 508994 2019-08-15 14:30:16Z tobik $	1	# $FreeBSD: head/www/cliqz/Makefile 508994 2019-08-15 14:30:16Z tobik $
2		2
3	PORTNAME= cliqz	3	PORTNAME= cliqz
4	DISTVERSION= 1.28.1	4	DISTVERSION= 1.28.2
5	PORTREVISION= 1
6	CATEGORIES= www	5	CATEGORIES= www
7	MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \	6	MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \
8	http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz	7	http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz
9	DISTFILES= adult-domains.bin:amazon \	8	DISTFILES= adult-domains.bin:amazon \
10	cliqz@cliqz.com.xpi:cliqz \	9	cliqz@cliqz.com.xpi:cliqz \
11	https-everywhere@cliqz.com.xpi:cliqz \	10	gdprtool@cliqz.com.xpi:cliqz \
12	gdprtool@cliqz.com.xpi:cliqz	11	https-everywhere@cliqz.com.xpi:cliqz
		12	DIST_SUBDIR= ${PORTNAME}
13	EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX}	13	EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX}
14		14
15	MAINTAINER= santhosh.raju@gmail.com	15	MAINTAINER= santhosh.raju@gmail.com
Lines 24-34 LIB_DEPENDS= libdbus-1.so:devel/dbus \ Link Here
24	libfontconfig.so:x11-fonts/fontconfig \	24	libfontconfig.so:x11-fonts/fontconfig \
25	libfreetype.so:print/freetype2 \	25	libfreetype.so:print/freetype2 \
26	libnspr4.so:devel/nspr \	26	libnspr4.so:devel/nspr \
		27	libnssutil3.so:security/nss \
27	libplc4.so:devel/nspr \	28	libplc4.so:devel/nspr \
28	libplds4.so:devel/nspr \	29	libplds4.so:devel/nspr
29	libnssutil3.so:security/nss
30		30
31	BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \	31	BUILD_DEPENDS= ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \
		32	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
		33	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
		34	${RUST_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \
		35	autoconf-2.13:devel/autoconf213 \
32	bash:shells/bash \	36	bash:shells/bash \
33	graphite2>=1.3.12:graphics/graphite2 \	37	graphite2>=1.3.12:graphics/graphite2 \
34	harfbuzz>=1.8.8:print/harfbuzz \	38	harfbuzz>=1.8.8:print/harfbuzz \
Lines 36-64 BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \ Link Here
36	libevent>=2.1.8:devel/libevent \	40	libevent>=2.1.8:devel/libevent \
37	libvorbis>=1.3.6,3:audio/libvorbis \	41	libvorbis>=1.3.6,3:audio/libvorbis \
38	libvpx>=1.5.0:multimedia/libvpx \	42	libvpx>=1.5.0:multimedia/libvpx \
39	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
40	llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \	43	llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \
41	nasm:devel/nasm \	44	nasm:devel/nasm \
42	node:www/node \	45	node:www/node \
43	nspr>=4.19:devel/nspr \	46	nspr>=4.19:devel/nspr \
44	nss>=3.39:security/nss \	47	nss>=3.39:security/nss \
45	png>=1.6.34:graphics/png \	48	png>=1.6.34:graphics/png \
46	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \
47	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
48	${RUST_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \
49	rust-cbindgen>=0.6.2:devel/rust-cbindgen \	49	rust-cbindgen>=0.6.2:devel/rust-cbindgen \
50	sqlite3>=3.24.0:databases/sqlite3 \	50	sqlite3>=3.24.0:databases/sqlite3 \
51	v4l_compat>0:multimedia/v4l_compat \	51	v4l_compat>0:multimedia/v4l_compat \
52	yasm:devel/yasm \	52	yasm:devel/yasm \
53	zip:archivers/zip	53	zip:archivers/zip
54		54
55	USES= tar:xz gmake pkgconfig gnome python:2.7,build desktop-file-utils \	55	USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig \
56	compiler:c11 shebangfix	56	python:2.7,build shebangfix tar:xz
57		57
58	USE_GNOME= gconf2 gtk20 gtk30 cairo gdkpixbuf2	58	USE_GNOME= cairo gconf2 gdkpixbuf2 gtk20 gtk30
59		59
60	USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender \	60	USE_XORG= x11 xcb xcb xcomposite xcursor xdamage xext xfixes xi xrender \
61	xcb xt	61	xt
62		62
63	USE_GITHUB= yes	63	USE_GITHUB= yes
64	GH_ACCOUNT= cliqz-oss	64	GH_ACCOUNT= cliqz-oss
Lines 73-89 SHEBANG_FILES= magic_build_and_package.sh Link Here
73	CLIQZ_CHANNEL= release	73	CLIQZ_CHANNEL= release
74	# If the DISTVERSION is updated, make sure to update the last build id from	74	# If the DISTVERSION is updated, make sure to update the last build id from
75	# fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid	75	# fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid
76	CLIQZ_LAST_BUILD_ID= 20190802181254	76	CLIQZ_LAST_BUILD_ID= 20190816174655
77	CLIQZ_ICON= ${PORTNAME}.png	77	CLIQZ_ICON= ${PORTNAME}.png
78	CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png	78	CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png
79	MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop	79	MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop
80	CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop	80	CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop
81		81
82	MAKE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT}	82	MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \
83	MAKE_ENV+= LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump	83	CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} \
84	MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL}	84	LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
85	MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID}	85	LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump \
86	MAKE_ENV+= MOZBUILD_STATE_PATH=${WRKDIR}	86	MOZBUILD_STATE_PATH=${WRKDIR}
87		87
88	post-extract:	88	post-extract:
89	${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC}	89	${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC}

Added Link Here

(-)b/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h (+16 lines)
1	Firefox pulls in if_var.h which causes "class thread" conflicts with
2	"struct thread" in sys/lock.h.
3
4	https://lists.freebsd.org/pipermail/svn-src-all/2019-August/184844.html
5
6	--- mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h.orig 2019-08-23 20:05:51 UTC
7	+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h
8	@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
9	#include <sys/socket.h>
10	#ifndef LINUX
11	#include <net/if.h>
12	-#if !defined(__OpenBSD__) && !defined(__NetBSD__)
13	+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
14	#include <net/if_var.h>
15	#endif
16	#include <net/if_dl.h>