Attachment 203586 Details for Bug 237201 – Patch to upgrade the ports script to support cliqz-1.26.0 builds.

[patch] Patch to upgrade the ports script to support cliqz-1.26.0 builds.

cliqz.1.26.0.update.patch (text/plain), 11.90 KB, created by Santhosh Raju on 2019-04-11 12:27:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Santhosh Raju

Created: 2019-04-11 12:27:12 UTC

Size: 11.90 KB

patch

obsolete

>diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
>index 97c9ae1..22e9235 100644
>--- a/www/cliqz/Makefile
>+++ b/www/cliqz/Makefile
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/www/cliqz/Makefile 496981 2019-03-27 21:11:08Z jbeich $
> 
> PORTNAME=	cliqz
>-DISTVERSION=	1.25.3
>-PORTREVISION=	2
>+DISTVERSION=	1.26.0
> 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
>@@ -68,7 +67,7 @@ USE_LDCONFIG=	yes
> 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=	20190311160606
>+CLIQZ_LAST_BUILD_ID=	20190403105019
> 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
>diff --git a/www/cliqz/distinfo b/www/cliqz/distinfo
>index 6880ede..21706d3 100644
>--- a/www/cliqz/distinfo
>+++ b/www/cliqz/distinfo
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1552563326
>+TIMESTAMP = 1554860786
> SHA256 (adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65
> SIZE (adult-domains.bin) = 528392
> SHA256 (cliqz@cliqz.com.xpi) = ee29f40e79b4b14f60b5c41fbb3fe16c8778c50f80e01d2e3c78202a373db745
>@@ -7,5 +7,5 @@ SHA256 (https-everywhere@cliqz.com.xpi) = f5d85cd29b8e1261fd62c3037c41ae3d457e17
> SIZE (https-everywhere@cliqz.com.xpi) = 2055381
> SHA256 (gdprtool@cliqz.com.xpi) = 8b9199e32f5bcd6acea83df36f815ad25683143b717988693deec9a6d02c71a9
> SIZE (gdprtool@cliqz.com.xpi) = 222207
>-SHA256 (cliqz-oss-browser-f-1.25.3_GH0.tar.gz) = 9069fbe2ac32a8ac356656ab083ebdd27a0d92fb25a8d309247c719568f0f472
>-SIZE (cliqz-oss-browser-f-1.25.3_GH0.tar.gz) = 419545179
>+SHA256 (cliqz-oss-browser-f-1.26.0_GH0.tar.gz) = 6fbfd93b57ae1273b9a169d0271992426f4f1786352719b3757b5d1a3efbe0e7
>+SIZE (cliqz-oss-browser-f-1.26.0_GH0.tar.gz) = 424869042
>diff --git a/www/cliqz/files/patch-bug1519629 b/www/cliqz/files/patch-bug1519629
>deleted file mode 100644
>index 1323fe2..0000000
>--- a/www/cliqz/files/patch-bug1519629
>+++ /dev/null
>@@ -1,35 +0,0 @@
>-commit f8f381bf03b5
>-Author: Emilio Cobos Ãlvarez <emilio@crisal.io>
>-Date:   Sun Jan 13 21:42:38 2019 +0100
>-
>-    Bug 1519629 - Document a few more macros.
>----
>- servo/components/style/gecko/regen_atoms.py            | 1 +
>- servo/components/style/gecko_string_cache/namespace.rs | 2 ++
>- 2 files changed, 3 insertions(+)
>-
>-diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py
>-index dfc2252aa899..b6f68fceb7d5 100755
>---- mozilla-release/servo/components/style/gecko/regen_atoms.py
>-+++ mozilla-release/servo/components/style/gecko/regen_atoms.py
>-@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n  '
>- 
>- MACRO = '''
>- #[macro_export]
>-+/// Returns a static atom by passing the literal string it represents.
>- macro_rules! atom {{
>- {}
>- }}
>-diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs
>-index 4aa4accaf1d4..725e1da21692 100644
>---- mozilla-release/servo/components/style/gecko_string_cache/namespace.rs
>-+++ mozilla-release/servo/components/style/gecko_string_cache/namespace.rs
>-@@ -11,6 +11,8 @@ use std::borrow::Borrow;
>- use std::fmt;
>- use std::ops::Deref;
>- 
>-+/// In Gecko namespaces are just regular atoms, so this is a simple macro to
>-+/// forward one macro to the other.
>- #[macro_export]
>- macro_rules! ns {
>-     () => {
>diff --git a/www/cliqz/files/patch-bug1519729 b/www/cliqz/files/patch-bug1519729
>deleted file mode 100644
>index 64829a4..0000000
>--- a/www/cliqz/files/patch-bug1519729
>+++ /dev/null
>@@ -1,131 +0,0 @@
>-commit 9bdfa9fecaf1
>-Author: Simon Sapin <simon.sapin@exyr.org>
>-Date:   Fri Jan 11 14:02:28 2019 +0100
>-
>-    Bug 1519729 - Remove unused macro. r=emilio
>-    
>-    Cherry-picks a commit from https://github.com/servo/servo/pull/22674
>----
>- servo/components/style_traits/values.rs | 18 ------------------
>- 1 file changed, 18 deletions(-)
>-
>-diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs
>-index 6da235c07b64..2851082c22e0 100644
>---- mozilla-release/servo/components/style_traits/values.rs
>-+++ mozilla-release/servo/components/style_traits/values.rs
>-@@ -158,24 +158,6 @@ where
>-     }
>- }
>- 
>--#[macro_export]
>--macro_rules! serialize_function {
>--    ($dest: expr, $name: ident($( $arg: expr, )+)) => {
>--        serialize_function!($dest, $name($($arg),+))
>--    };
>--    ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => {
>--        {
>--            $dest.write_str(concat!(stringify!($name), "("))?;
>--            $first_arg.to_css($dest)?;
>--            $(
>--                $dest.write_str(", ")?;
>--                $arg.to_css($dest)?;
>--            )*
>--            $dest.write_char(')')
>--        }
>--    }
>--}
>--
>- /// Convenience wrapper to serialise CSS values separated by a given string.
>- pub struct SequenceWriter<'a, 'b: 'a, W: 'b> {
>-     inner: &'a mut CssWriter<'b, W>,
>-
>-commit 9d5e559547d0
>-Author: Simon Sapin <simon.sapin@exyr.org>
>-Date:   Fri Jan 11 14:03:44 2019 +0100
>-
>-    Bug 1519729 - Document public macros. r=emilio
>-    
>-    Undocumented public macros emit warnings in nightly-2019-01-11,
>-    and we #![deny] that warning.
>-    
>-    Cherry-picks a commit from https://github.com/servo/servo/pull/22674
>----
>- servo/components/style/properties/properties.mako.rs | 17 ++++++++++++++++-
>- servo/components/style_traits/values.rs              |  2 +-
>- 2 files changed, 17 insertions(+), 2 deletions(-)
>-
>-diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs
>-index 2d91273be15a..9220c3b1a665 100644
>---- mozilla-release/servo/components/style/properties/properties.mako.rs
>-+++ mozilla-release/servo/components/style/properties/properties.mako.rs
>-@@ -3821,7 +3821,14 @@ impl AliasId {
>-     }
>- }
>- 
>--// NOTE(emilio): Callers are responsible to deal with prefs.
>-+/// Call the given macro with tokens like this for each longhand and shorthand properties
>-+/// that is enabled in content:
>-+///
>-+/// ```
>-+/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)],
>-+/// ```
>-+///
>-+/// NOTE(emilio): Callers are responsible to deal with prefs.
>- #[macro_export]
>- macro_rules! css_properties_accessors {
>-     ($macro_name: ident) => {
>-@@ -3844,6 +3851,14 @@ macro_rules! css_properties_accessors {
>-     }
>- }
>- 
>-+/// Call the given macro with tokens like this for each longhand properties:
>-+///
>-+/// ```
>-+/// { snake_case_ident, true }
>-+/// ```
>-+///
>-+/// â¦ where the boolean indicates whether the property value type
>-+/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant.
>- #[macro_export]
>- macro_rules! longhand_properties_idents {
>-     ($macro_name: ident) => {
>-diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs
>-index 2851082c22e0..0d7ee3f506ce 100644
>---- mozilla-release/servo/components/style_traits/values.rs
>-+++ mozilla-release/servo/components/style_traits/values.rs
>-@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA);
>- impl_to_css_for_predefined_type!(::cssparser::Color);
>- impl_to_css_for_predefined_type!(::cssparser::UnicodeRange);
>- 
>--#[macro_export]
>-+/// Define an enum type with unit variants that each corrsepond to a CSS keyword.
>- macro_rules! define_css_keyword_enum {
>-     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
>-         #[allow(missing_docs)]
>-
>-commit 2b08ae08b260
>-Author: lqd <remy.rakic+github@gmail.com>
>-Date:   Fri Jan 11 16:35:26 2019 +0100
>-
>-    Bug 1519729 - Typo fix in new doc-comment. r=emilio
>-    
>-    Cherry-picks a commit from https://github.com/servo/servo/pull/22674
>-    
>-    Co-Authored-By: SimonSapin <simon.sapin@exyr.org>
>----
>- servo/components/style_traits/values.rs | 2 +-
>- 1 file changed, 1 insertion(+), 1 deletion(-)
>-
>-diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs
>-index 0d7ee3f506ce..582e34eb3db0 100644
>---- mozilla-release/servo/components/style_traits/values.rs
>-+++ mozilla-release/servo/components/style_traits/values.rs
>-@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA);
>- impl_to_css_for_predefined_type!(::cssparser::Color);
>- impl_to_css_for_predefined_type!(::cssparser::UnicodeRange);
>- 
>--/// Define an enum type with unit variants that each corrsepond to a CSS keyword.
>-+/// Define an enum type with unit variants that each correspond to a CSS keyword.
>- macro_rules! define_css_keyword_enum {
>-     (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => {
>-         #[allow(missing_docs)]
>diff --git a/www/cliqz/files/patch-bug1532851 b/www/cliqz/files/patch-bug1532851
>deleted file mode 100644
>index 658aa1a..0000000
>--- a/www/cliqz/files/patch-bug1532851
>+++ /dev/null
>@@ -1,40 +0,0 @@
>-diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp
>-index fc49f361d82a..636537f84786 100644
>---- mozilla-release/js/src/wasm/WasmSignalHandlers.cpp
>-+++ mozilla-release/js/src/wasm/WasmSignalHandlers.cpp
>-@@ -102,6 +102,11 @@ using mozilla::DebugOnly;
>- #define EPC_sig(p) ((p)->sc_pc)
>- #define RFP_sig(p) ((p)->sc_regs[30])
>- #endif
>-+#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
>-+    defined(__PPC64LE__)
>-+#define R01_sig(p) ((p)->sc_frame.fixreg[1])
>-+#define R32_sig(p) ((p)->sc_frame.srr0)
>-+#endif
>- #elif defined(__linux__) || defined(__sun)
>- #if defined(__linux__)
>- #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP])
>-@@ -169,6 +174,11 @@ using mozilla::DebugOnly;
>- #define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC])
>- #define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8])
>- #endif
>-+#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \
>-+    defined(__PPC64LE__)
>-+#define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1])
>-+#define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC])
>-+#endif
>- #elif defined(__DragonFly__) || defined(__FreeBSD__) || \
>-     defined(__FreeBSD_kernel__)
>- #define EIP_sig(p) ((p)->uc_mcontext.mc_eip)
>-@@ -197,6 +207,11 @@ using mozilla::DebugOnly;
>- #if defined(__FreeBSD__) && defined(__mips__)
>- #define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
>- #define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
>-+#endif
>-+#if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \
>-+                             defined(__ppc64le__) || defined(__PPC64LE__))
>-+#define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1])
>-+#define R32_sig(p) ((p)->uc_mcontext.mc_srr0)
>- #endif
>- #elif defined(XP_DARWIN)
>- #define EIP_sig(p) ((p)->thread.uts.ts32.__eip)
>diff --git a/www/cliqz/files/patch-cliqz__env.sh b/www/cliqz/files/patch-cliqz__env.sh
>index ce6546a..9993b64 100644
>--- a/www/cliqz/files/patch-cliqz__env.sh
>+++ b/www/cliqz/files/patch-cliqz__env.sh
>@@ -1,3 +1,6 @@
>+Commented out the various wget(1) to prevent http traffic during build
>+phase.
>+
> --- cliqz_env.sh.orig	2018-11-16 13:55:29 UTC
> +++ cliqz_env.sh
> @@ -78,9 +78,9 @@ export S3_BUCKET=repository.cliqz.com
>diff --git a/www/cliqz/files/patch-magic__build__and__package.sh b/www/cliqz/files/patch-magic__build__and__package.sh
>index ca4b110..a248667 100644
>--- a/www/cliqz/files/patch-magic__build__and__package.sh
>+++ b/www/cliqz/files/patch-magic__build__and__package.sh
>@@ -1,4 +1,6 @@
>---- magic_build_and_package.sh.orig	2018-11-12 05:40:39 UTC
>+Disable build and packaging of tests.
>+
>+--- magic_build_and_package.sh.orig	2019-04-03 08:46:52 UTC
> +++ magic_build_and_package.sh
> @@ -1,4 +1,4 @@
> -#! /bin/bash
>@@ -6,3 +8,14 @@
>  
>  # Optional ENVs:
>  #  CQZ_BUILD_ID - specify special build timestamp or use latest one (depend on channel)
>+@@ -43,8 +43,8 @@ fi
>+ echo '***** Building *****'
>+ ./mach build
>+ 
>+-echo '***** Building tests *****'
>+-./mach build package-tests
>++#echo '***** Building tests *****'
>++#./mach build package-tests
>+ 
>+ echo '***** Packaging *****'
>+ ./mach package

Actions: View | Diff

Attachments on bug 237201: 203586