www/cliqz: Fixes build failures under certain conditions.

- Redo the MOZ_CONFIGURE_ARGS so that port options picks it up correctly.
- Adds check for libmozwayland.so (available when x11-toolkits/gtk30 is built
  with WAYLAND option enabled).
- Drops a patch hunk not applicable to patch-bug847568 (reported by jbeich@).

Approved by:	philip (mentor)

4 files changed, 21 insertions, 22 deletions

diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
index 24989b30a381..62b06ad059af 100644
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cliqz
 DISTVERSION=	1.30.0
+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
@@ -88,14 +89,14 @@ MAKE_ENV+=	CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \
 		MOZBUILD_STATE_PATH=${WRKDIR}
 
 # Configure args passed into mach build system
-MOZ_CONFIGURE_ARGS+=	"ac_add_options --disable-crashreporter" \
-			"ac_add_options --disable-debug" \
-			"ac_add_options --disable-debug-symbols" \
-			"ac_add_options --disable-tests" \
-			"ac_add_options --disable-updater" \
-			"ac_add_options --libclang-path=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" \
-			"ac_add_options --with-system-graphite2" \
-			"ac_add_options --with-system-harfbuzz"
+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"
 
@@ -126,7 +127,7 @@ post-patch:
 		-e '/StartupWMClass/d' \
 		${CLIQZ_DESKTOP}
 .for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS}
-	@${ECHO_CMD} ${MOZ_CONFIGURE_ARG} >> \
+	@${ECHO_CMD} "ac_add_options" ${MOZ_CONFIGURE_ARG} >> \
 		${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig;
 .endfor
 # This prevents linker exhausting memory in i386 builds
@@ -142,6 +143,13 @@ 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}
 
diff --git a/www/cliqz/Makefile.options b/www/cliqz/Makefile.options
index 009652957620..1cebd99df62f 100644
--- a/www/cliqz/Makefile.options
+++ b/www/cliqz/Makefile.options
@@ -7,11 +7,11 @@ OPTIONS_DEFAULT=	JACK PULSEAUDIO SNDIO
 AUDIO_DESC=		Choose your audio options
 
 JACK_BUILD_DEPENDS=	${LOCALBASE}/include/jack/jack.h:audio/jack
-JACK_VARS=		MOZ_CONFIGURE_ARGS+=	"ac_add_options --enable-jack"
+JACK_VARS=		MOZ_CONFIGURE_ARGS+="--enable-jack"
 
 PULSEAUDIO_BUILD_DEPENDS=	${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio
-PULSEAUDIO_VARS=		MOZ_CONFIGURE_ARGS+=	"ac_add_options	--enable-pulseaudio"
-PULSEAUDIO_VARS_OFF=		MOZ_CONFIGURE_ARGS+=	"ac_add_options --disable-pulseaudio"
+PULSEAUDIO_VARS=		MOZ_CONFIGURE_ARGS+="--enable-pulseaudio"
+PULSEAUDIO_VARS_OFF=		MOZ_CONFIGURE_ARGS+="--disable-pulseaudio"
 
 SNDIO_BUILD_DEPENDS+=	${LOCALBASE}/include/sndio.h:audio/sndio
 SNDIO_LIB_DEPENDS+=	libsndio.so:audio/sndio
diff --git a/www/cliqz/files/patch-bug847568 b/www/cliqz/files/patch-bug847568
index 80d784bcbec1..dfa3fbb3780d 100644
--- a/www/cliqz/files/patch-bug847568
+++ b/www/cliqz/files/patch-bug847568
@@ -202,15 +202,6 @@
  if CONFIG['MOZ_SYSTEM_LIBEVENT']:
      OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
  
-@@ -274,7 +280,7 @@ OS_LIBS += CONFIG['ICONV_LIBS']
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
-     OS_LIBS += CONFIG['TK_LIBS']
- 
--if CONFIG['OS_ARCH'] == 'OpenBSD':
-+if CONFIG['OS_ARCH'] == 'FreeBSD':
-     OS_LIBS += [
-         'sndio',
-     ]
 --- mozilla-release/toolkit/moz.configure.orig	2019-11-13 13:22:25 UTC
 +++ mozilla-release/toolkit/moz.configure
 @@ -931,6 +931,25 @@ add_old_configure_assignment('FT2_LIBS',
diff --git a/www/cliqz/pkg-plist b/www/cliqz/pkg-plist
index 95606ab356eb..9ef91cf8e663 100644
--- a/www/cliqz/pkg-plist
+++ b/www/cliqz/pkg-plist
@@ -28,7 +28,7 @@ lib/cliqz/libmozavcodec.so
 lib/cliqz/libmozavutil.so
 lib/cliqz/libmozgtk.so
 lib/cliqz/libmozsqlite3.so
-lib/cliqz/libmozwayland.so
+%%WAYLAND%%lib/cliqz/libmozwayland.so
 lib/cliqz/libnspr4.so
 lib/cliqz/libnss3.so
 lib/cliqz/libnssckbi.so