pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cliqz: Incorporated suggestions from rillig

Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Thu Jan 17 20:23:05 2019 +0530
Changeset:	11165978d2b89ef01baa4ee3710414abe60e9fdd

Modified Files:
	cliqz/Makefile
	cliqz/distinfo
	cliqz/options.mk

Log Message:
cliqz: Incorporated suggestions from rillig

1. Set DIST_SUBDIR= so that the distfiles do not conflict with other packages.
2. Moved the SITES.* and related variables under the DISTFILES section.
3. In do-install section, added cd /lib before doing .
4. In do-install section, indended the  options correctly.
5. In post-install section, added an exec for the shell script being created.
6. In options.mk, removed the '+' from '+=' from  PKG_SUPPORTED_OPTIONS.
7. Updated distinfo.
8. Commented out NOT_PAX_MPROTECT_SAFE for now.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=11165978d2b89ef01baa4ee3710414abe60e9fdd

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

diffstat:
 cliqz/Makefile   | 53 ++++++++++++++++++++++++++++-------------------------
 cliqz/distinfo   | 40 ++++++++++++++++++++--------------------
 cliqz/options.mk |  2 +-
 3 files changed, 49 insertions(+), 46 deletions(-)

diffs:
diff --git a/cliqz/Makefile b/cliqz/Makefile
index f244da7fa4..063a42a6b8 100644
--- a/cliqz/Makefile
+++ b/cliqz/Makefile
@@ -10,6 +10,22 @@ DISTFILES=	adult-domains.bin \
 		https-everywhere%cliqz.com.xpi@localhost \
 		gdprtool%cliqz.com.xpi@localhost \
 		${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	${PKGBASE}
+
+CLIQZ_CHANNEL=		release
+# If the PKGVERSION_NOREV is updated, make sure to update the last build id from
+# fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/lastbuildid
+CLIQZ_LAST_BUILD_ID=	20181223141940
+CLIQZ_PLUGIN_SUFX=	@cliqz.com.xpi
+
+SITES.adult-domains.bin= \
+	https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/
+SITES.cliqz${CLIQZ_PLUGIN_SUFX}= \
+	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
+SITES.https-everywhere${CLIQZ_PLUGIN_SUFX}= \
+	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
+SITES.gdprtool${CLIQZ_PLUGIN_SUFX}= \
+	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
 
 EXTRACT_USING=	bsdtar
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -28,24 +44,10 @@ TOOL_DEPENDS+=			nodejs-[0-9]*:../../lang/nodejs
 
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
-CLIQZ_CHANNEL=		release
-# If the PKGVERSION_NOREV is updated, make sure to update the last build id from
-# fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/lastbuildid
-CLIQZ_LAST_BUILD_ID=	20181223141940
 CLIQZ_ICON=		cliqz.png
 CLIQZ_ICON_SRC=		${WRKSRC}/mozilla-release/browser/branding/cliqz/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
-CLIQZ_PLUGIN_SUFX=	@cliqz.com.xpi
-
-SITES.adult-domains.bin= \
-	https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/
-SITES.cliqz${CLIQZ_PLUGIN_SUFX}= \
-	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
-SITES.https-everywhere${CLIQZ_PLUGIN_SUFX}= \
-	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
-SITES.gdprtool${CLIQZ_PLUGIN_SUFX}= \
-	https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
 
 MAKE_ENV+=	CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL}
 MAKE_ENV+=	CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID}
@@ -61,9 +63,9 @@ REPLACE_BASH+=	magic_build_and_package.sh
 CFLAGS+=	-D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/cliqz ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 
-NOT_PAX_MPROTECT_SAFE+=	lib/cliqz/cliqz
-NOT_PAX_MPROTECT_SAFE+=	lib/cliqz/cliqz-bin
-NOT_PAX_MPROTECT_SAFE+=	lib/cliqz/plugin-container
+#NOT_PAX_MPROTECT_SAFE+=	lib/cliqz/cliqz
+#NOT_PAX_MPROTECT_SAFE+=	lib/cliqz/cliqz-bin
+#NOT_PAX_MPROTECT_SAFE+=	lib/cliqz/plugin-container
 
 post-extract:
 	${CP} ${DISTDIR}/adult-domains.bin ${WRKSRC}
@@ -93,17 +95,18 @@ do-install:
 	cd ${WRKSRC}/obj/dist && \
 		bsdtar -xjf ${DISTNAME}*${LOWER_OPSYS}-${MACHINE_ARCH}.tar.bz2 \
 		-C ${DESTDIR}${PREFIX}/lib
-	${FIND} . \(	-name \*.js  -or \
-			-name \*.html -or \
-			-name \*.xml -or \
-			-name \*.svg \
-		\) \
-	-type f \
-	-exec ${CHMOD} 0644 '{}' \;
+	cd ${DESTDIR}${PREFIX}/lib && \
+		${FIND} . \(	-name \*.js  -or \
+				-name \*.html -or \
+				-name \*.xml -or \
+				-name \*.svg \
+			\) \
+			-type f \
+			-exec ${CHMOD} 0644 '{}' \;
 
 post-install:
 	${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/cliqz
-	${ECHO} '${PREFIX}/lib/cliqz/cliqz "$$@"' >> ${DESTDIR}${PREFIX}/bin/cliqz
+	${ECHO} 'exec ${PREFIX}/lib/cliqz/cliqz "$$@"' >> ${DESTDIR}${PREFIX}/bin/cliqz
 	${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/cliqz
 	${INSTALL_DATA} ${CLIQZ_DESKTOP} ${DESTDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${CLIQZ_ICON_SRC} ${DESTDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON}
diff --git a/cliqz/distinfo b/cliqz/distinfo
index e06d819f70..c632142cc4 100644
--- a/cliqz/distinfo
+++ b/cliqz/distinfo
@@ -1,25 +1,25 @@
 $NetBSD$
 
-SHA1 (adult-domains.bin) = 782667f88481e5057abb01cfb6f5d76f41c854d1
-RMD160 (adult-domains.bin) = 30919ed6fddc322ec9910cb3fb90d46517b82daa
-SHA512 (adult-domains.bin) = 56d3b33207808e0573fb248105a84d1c32ba48982e0b0c05e7324c88789c8edb9e9f06bc1fdd6fae54da241f756df729b9e0d127faecce20c5678ac55f1178fd
-Size (adult-domains.bin) = 528392 bytes
-SHA1 (cliqz-1.24.0.tar.gz) = fc0224c77e12ce4d25c5ff21663c2f393dc3349f
-RMD160 (cliqz-1.24.0.tar.gz) = 669a1392ad58880a1e03892741e78754c797ada9
-SHA512 (cliqz-1.24.0.tar.gz) = 6f3b8387e2b2075479999f019d02d69e1800dc20bf64c4fedccbdd415ce4026fb7f4a8be4808cef9c3a041077b2e61de2d25304f79e20a85213b13980294c07b
-Size (cliqz-1.24.0.tar.gz) = 410994502 bytes
-SHA1 (cliqz%cliqz.com.xpi@localhost) = 222d075d1f45b48398f3317e03a378e9c9235b0b
-RMD160 (cliqz%cliqz.com.xpi@localhost) = 6037cf7094164b532b48cf9935f6c6e4bb9bbd1e
-SHA512 (cliqz%cliqz.com.xpi@localhost) = 167ecbdceb0d61003f8e9b3f3da3f5429e746d76924b7ec10ec43795c600448aaa219cb87db190899e28d3183f96dce106a6d60e697b780666e9ace8370ac78a
-Size (cliqz%cliqz.com.xpi@localhost) = 24372566 bytes
-SHA1 (gdprtool%cliqz.com.xpi@localhost) = d7aae9824cf9c87932576f09dc672e2750e5ad80
-RMD160 (gdprtool%cliqz.com.xpi@localhost) = 2ce4cc6ceb332767d86e6027a878c7151013c5ae
-SHA512 (gdprtool%cliqz.com.xpi@localhost) = a31e3965881970b9f3b648c9765b29add41ec4dfa554cab1eb414f5e885171b5264b4cedd482a4a18d89f78922ebe1f24ec862806659d0d4f6b85a1893455ca1
-Size (gdprtool%cliqz.com.xpi@localhost) = 259585 bytes
-SHA1 (https-everywhere%cliqz.com.xpi@localhost) = b0da1413b46d7f538d864435d35c1fb388fad398
-RMD160 (https-everywhere%cliqz.com.xpi@localhost) = 8e911f6c0def596eaa4caf586cfcc1322b5462ba
-SHA512 (https-everywhere%cliqz.com.xpi@localhost) = f9c2f1d92c6a63c04d3bcd051099ee32c988c38602b51ee1eb87b7baec65ffbc8fe61034fa6d52ac380d9cad951c00b370ce2e408918d5f91631e83fba2be7fb
-Size (https-everywhere%cliqz.com.xpi@localhost) = 2042146 bytes
+SHA1 (cliqz/adult-domains.bin) = 782667f88481e5057abb01cfb6f5d76f41c854d1
+RMD160 (cliqz/adult-domains.bin) = 30919ed6fddc322ec9910cb3fb90d46517b82daa
+SHA512 (cliqz/adult-domains.bin) = 56d3b33207808e0573fb248105a84d1c32ba48982e0b0c05e7324c88789c8edb9e9f06bc1fdd6fae54da241f756df729b9e0d127faecce20c5678ac55f1178fd
+Size (cliqz/adult-domains.bin) = 528392 bytes
+SHA1 (cliqz/cliqz-1.24.0.tar.gz) = fc0224c77e12ce4d25c5ff21663c2f393dc3349f
+RMD160 (cliqz/cliqz-1.24.0.tar.gz) = 669a1392ad58880a1e03892741e78754c797ada9
+SHA512 (cliqz/cliqz-1.24.0.tar.gz) = 6f3b8387e2b2075479999f019d02d69e1800dc20bf64c4fedccbdd415ce4026fb7f4a8be4808cef9c3a041077b2e61de2d25304f79e20a85213b13980294c07b
+Size (cliqz/cliqz-1.24.0.tar.gz) = 410994502 bytes
+SHA1 (cliqz/cliqz%cliqz.com.xpi@localhost) = 7349ab2e5ffd632d90bab2ff9ab8257cab877d2e
+RMD160 (cliqz/cliqz%cliqz.com.xpi@localhost) = 99920b6ad8629b4e24e5e1a3e33b678611e93b30
+SHA512 (cliqz/cliqz%cliqz.com.xpi@localhost) = 0110980bdd65003bf739761a66106986498538ea950fa43d8f71d0fc941657ff7477f00e478fe4829142d288c4001dcdcbf992ea4f71a1cd67eb41b0f04682af
+Size (cliqz/cliqz%cliqz.com.xpi@localhost) = 21289549 bytes
+SHA1 (cliqz/gdprtool%cliqz.com.xpi@localhost) = fe387878fdd13d65d05e2fecf80320d1bacfd92e
+RMD160 (cliqz/gdprtool%cliqz.com.xpi@localhost) = 798973cd18d9b5b4d245d304f63b55b4a0ac9a1e
+SHA512 (cliqz/gdprtool%cliqz.com.xpi@localhost) = 58b74a336a53f615b3c61cb97cb39979bd48b13ffc72db7bffe9fb6447ca23beafda7ae8948cb3bdcb98013390c402d07437478b7da1163e3712f9e1de22a076
+Size (cliqz/gdprtool%cliqz.com.xpi@localhost) = 222672 bytes
+SHA1 (cliqz/https-everywhere%cliqz.com.xpi@localhost) = b0da1413b46d7f538d864435d35c1fb388fad398
+RMD160 (cliqz/https-everywhere%cliqz.com.xpi@localhost) = 8e911f6c0def596eaa4caf586cfcc1322b5462ba
+SHA512 (cliqz/https-everywhere%cliqz.com.xpi@localhost) = f9c2f1d92c6a63c04d3bcd051099ee32c988c38602b51ee1eb87b7baec65ffbc8fe61034fa6d52ac380d9cad951c00b370ce2e408918d5f91631e83fba2be7fb
+Size (cliqz/https-everywhere%cliqz.com.xpi@localhost) = 2042146 bytes
 SHA1 (patch-cliqz__env.sh) = 6f7aba36875e86960a8fd674fdff2f576d9b479d
 SHA1 (patch-mozilla-release_browser_app_profile_firefox.js) = 5becd17e209b233b8692343407f3356d4d7e1b59
 SHA1 (patch-mozilla-release_browser_config_cliqz.mozconfig) = c0d050914951f7aa179336fa547b981b0561da59
diff --git a/cliqz/options.mk b/cliqz/options.mk
index 0ef1b0f10b..c24b0d10f4 100644
--- a/cliqz/options.mk
+++ b/cliqz/options.mk
@@ -2,7 +2,7 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cliqz
 
-PKG_SUPPORTED_OPTIONS+=	alsa pulseaudio dbus
+PKG_SUPPORTED_OPTIONS=	alsa pulseaudio dbus
 
 PKG_SUGGESTED_OPTIONS+=	pulseaudio dbus
Home | Main Index | Thread Index | Old Index