net-www/inox: get patches from upstream repo instead

2016-05-13 23:28:32 +02:00 · 2016-05-13 23:28:32 +02:00 · 35359b825b
commit 35359b825b
parent f94ba74bd2
18 changed files with 17 additions and 1499 deletions
--- a/packages/net-www/exlibs/inox.exlib
+++ b/packages/net-www/exlibs/inox.exlib
@ -13,6 +13,14 @@ MY_PNV=${MY_PN}-${PV}
 require freedesktop-desktop gtk-icon-cache python [ has_lib=false ] toolchain-funcs
 myexparam patchset=
 exparam -v PATCHSET patchset
 if [[ -z $(exparam patchset) ]]; then
    die "patchset exparam needs to be set!"
 fi
 export_exlib_phases pkg_setup src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
 SUMMARY="The open-source project behind Google Chrome"
@ -21,6 +29,7 @@ HOMEPAGE="https://www.chromium.org/Home"
 DOWNLOADS="
    https://storage.googleapis.com/chromium-browser-official/${MY_PNV}.tar.xz
    https://gsdview.appspot.com/chromium-browser-official/${MY_PNV}.tar.xz
    https://github.com/gcarq/inox-patchset/archive/${PATCHSET}.tar.gz -> inox-patches-${PATCHSET}.tar.gz
 "
 LICENCES="
@ -151,6 +160,13 @@ inox_pkg_setup() {
 }
 inox_src_prepare() {
    # odd upstream git versioning
    edo rm -r "${WORKBASE}"/inox-patchset-${PATCHSET}/archive
    # this one is unneded and doesn't apply cleanly
    edo rm "${WORKBASE}"/inox-patchset-${PATCHSET}/launcher-branding.patch
    # fire up the inox patches
    expatch "${WORKBASE}"/inox-patchset-${PATCHSET}/
    default
    edo sed \
--- a/packages/net-www/inox/files/inox/add-duckduckgo-search-engine.patch
+++ b/packages/net-www/inox/files/inox/add-duckduckgo-search-engine.patch
@ -1,584 +0,0 @@
 --- ./components/search_engines/prepopulated_engines.json
 +++ ./components/search_engines/prepopulated_engines.json.new
@@ -36,6 +36,17 @@
   // The following engines are included in country lists and are added to the
   // list of search engines on the first run depending on user's country.
   "elements": {
 +    "duckduckgo": {
 +      "name": "DuckDuckGo",
 +      "keyword": "duckduckgo.com",
 +      "favicon_url": "https://duckduckgo.com/favicon.ico",
 +      "search_url": "https://duckduckgo.com/?q={searchTerms}",
 +      "suggest_url": "https://duckduckgo.com/?q={searchTerms}&language={language}&kac=1",
 +      "new_tab_url": "about:blank",
 +      "type": "SEARCH_ENGINE_DUCKDUCKGO",
 +      "id": 11
 +    },
 +
     "aol": {
       "name": "AOL",
       "keyword": "aol.com",
 --- ./components/search_engines/search_engine_type.h
 +++ ./components/search_engines/search_engine_type.h.new
@@ -58,6 +58,7 @@ enum SearchEngineType {
   SEARCH_ENGINE_YAHOO,
   SEARCH_ENGINE_YANDEX,
   SEARCH_ENGINE_ZOZNAM,
 +  SEARCH_ENGINE_DUCKDUCKGO,
   SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
 };
 --- ./components/search_engines/template_url_prepopulate_data.cc
 +++ ./components/search_engines/template_url_prepopulate_data.cc.new
@@ -48,441 +48,441 @@
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* engines_default[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // United Arab Emirates
 const PrepopulatedEngine* engines_AE[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Albania
 const PrepopulatedEngine* engines_AL[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Argentina
 const PrepopulatedEngine* engines_AR[] =
 -    { &google, &bing, &yahoo_ar, };
 +    { &duckduckgo, &google, &bing, &yahoo_ar, };
 // Austria
 const PrepopulatedEngine* engines_AT[] =
 -    { &google, &bing, &yahoo_at, };
 +    { &duckduckgo, &google, &bing, &yahoo_at, };
 // Australia
 const PrepopulatedEngine* engines_AU[] =
 -    { &google, &bing, &yahoo_au, };
 +    { &duckduckgo, &google, &bing, &yahoo_au, };
 // Bosnia and Herzegovina
 const PrepopulatedEngine* engines_BA[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Belgium
 const PrepopulatedEngine* engines_BE[] =
 -    { &google, &bing, &yahoo, &yahoo_fr, };
 +    { &duckduckgo, &google, &bing, &yahoo, &yahoo_fr, };
 // Bulgaria
 const PrepopulatedEngine* engines_BG[] =
 -    { &google, &bing, &ask, };
 +    { &duckduckgo, &google, &bing, &ask, };
 // Bahrain
 const PrepopulatedEngine* engines_BH[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Burundi
 const PrepopulatedEngine* engines_BI[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Brunei
 const PrepopulatedEngine* engines_BN[] =
 -    { &google, &yahoo_my, &bing, };
 +    { &duckduckgo, &google, &yahoo_my, &bing, };
 // Bolivia
 const PrepopulatedEngine* engines_BO[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Brazil
 const PrepopulatedEngine* engines_BR[] =
 -    { &google, &ask_br, &bing, &yahoo_br, };
 +    { &duckduckgo, &google, &ask_br, &bing, &yahoo_br, };
 // Belarus
 const PrepopulatedEngine* engines_BY[] =
 -    { &google, &yandex_by, &mail_ru, };
 +    { &duckduckgo, &google, &yandex_by, &mail_ru, };
 // Belize
 const PrepopulatedEngine* engines_BZ[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Canada
 const PrepopulatedEngine* engines_CA[] =
 -    { &google, &bing, &ask, &yahoo_ca, &yahoo_qc, };
 +    { &duckduckgo, &google, &bing, &ask, &yahoo_ca, &yahoo_qc, };
 // Switzerland
 const PrepopulatedEngine* engines_CH[] =
 -    { &google, &bing, &yahoo_ch, };
 +    { &duckduckgo, &google, &bing, &yahoo_ch, };
 // Chile
 const PrepopulatedEngine* engines_CL[] =
 -    { &google, &bing, &yahoo_cl, };
 +    { &duckduckgo, &google, &bing, &yahoo_cl, };
 // China
 const PrepopulatedEngine* engines_CN[] =
 -    { &google, &baidu, &sogou, };
 +    { &duckduckgo, &google, &baidu, &sogou, };
 // Colombia
 const PrepopulatedEngine* engines_CO[] =
 -    { &google, &bing, &yahoo_co, };
 +    { &duckduckgo, &google, &bing, &yahoo_co, };
 // Costa Rica
 const PrepopulatedEngine* engines_CR[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Czech Republic
 const PrepopulatedEngine* engines_CZ[] =
 -    { &google, &seznam, &bing, };
 +    { &duckduckgo, &google, &seznam, &bing, };
 // Germany
 const PrepopulatedEngine* engines_DE[] =
 -    { &google, &bing, &yahoo_de };
 +    { &duckduckgo, &google, &bing, &yahoo_de };
 // Denmark
 const PrepopulatedEngine* engines_DK[] =
 -    { &google, &bing, &yahoo_dk, };
 +    { &duckduckgo, &google, &bing, &yahoo_dk, };
 // Dominican Republic
 const PrepopulatedEngine* engines_DO[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Algeria
 const PrepopulatedEngine* engines_DZ[] =
 -    { &google, &bing, &yahoo_maktoob, };
 +    { &duckduckgo, &google, &bing, &yahoo_maktoob, };
 // Ecuador
 const PrepopulatedEngine* engines_EC[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Estonia
 const PrepopulatedEngine* engines_EE[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Egypt
 const PrepopulatedEngine* engines_EG[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Spain
 const PrepopulatedEngine* engines_ES[] =
 -    { &google, &bing, &yahoo_es, };
 +    { &duckduckgo, &google, &bing, &yahoo_es, };
 // Faroe Islands
 const PrepopulatedEngine* engines_FO[] =
 -    { &google, &bing, &ask, };
 +    { &duckduckgo, &google, &bing, &ask, };
 // Finland
 const PrepopulatedEngine* engines_FI[] =
 -    { &google, &bing, &yahoo_fi, };
 +    { &duckduckgo, &google, &bing, &yahoo_fi, };
 // France
 const PrepopulatedEngine* engines_FR[] =
 -    { &google, &bing, &yahoo_fr, };
 +    { &duckduckgo, &google, &bing, &yahoo_fr, };
 // United Kingdom
 const PrepopulatedEngine* engines_GB[] =
 -    { &google, &bing, &yahoo_uk, &ask_uk, };
 +    { &duckduckgo, &google, &bing, &yahoo_uk, &ask_uk, };
 // Greece
 const PrepopulatedEngine* engines_GR[] =
 -    { &google, &bing, &yahoo_gr, };
 +    { &duckduckgo, &google, &bing, &yahoo_gr, };
 // Guatemala
 const PrepopulatedEngine* engines_GT[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Hong Kong
 const PrepopulatedEngine* engines_HK[] =
 -    { &google, &yahoo_hk, &baidu, &bing, };
 +    { &duckduckgo, &google, &yahoo_hk, &baidu, &bing, };
 // Honduras
 const PrepopulatedEngine* engines_HN[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Croatia
 const PrepopulatedEngine* engines_HR[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Hungary
 const PrepopulatedEngine* engines_HU[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Indonesia
 const PrepopulatedEngine* engines_ID[] =
 -    { &google, &yahoo_id, &bing, };
 +    { &duckduckgo, &google, &yahoo_id, &bing, };
 // Ireland
 const PrepopulatedEngine* engines_IE[] =
 -    { &google, &bing, &yahoo_uk, };
 +    { &duckduckgo, &google, &bing, &yahoo_uk, };
 // Israel
 const PrepopulatedEngine* engines_IL[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // India
 const PrepopulatedEngine* engines_IN[] =
 -    { &google, &bing, &yahoo_in, };
 +    { &duckduckgo, &google, &bing, &yahoo_in, };
 // Iraq
 const PrepopulatedEngine* engines_IQ[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Iran
 const PrepopulatedEngine* engines_IR[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Iceland
 const PrepopulatedEngine* engines_IS[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Italy
 const PrepopulatedEngine* engines_IT[] =
 -    { &google, &virgilio, &bing, };
 +    { &duckduckgo, &google, &virgilio, &bing, };
 // Jamaica
 const PrepopulatedEngine* engines_JM[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Jordan
 const PrepopulatedEngine* engines_JO[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Japan
 const PrepopulatedEngine* engines_JP[] =
 -    { &google, &yahoo_jp, &bing, };
 +    { &duckduckgo, &google, &yahoo_jp, &bing, };
 // Kenya
 const PrepopulatedEngine* engines_KE[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Kuwait
 const PrepopulatedEngine* engines_KW[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // South Korea
 const PrepopulatedEngine* engines_KR[] =
 -    { &google, &naver, &daum, };
 +    { &duckduckgo, &google, &naver, &daum, };
 // Kazakhstan
 const PrepopulatedEngine* engines_KZ[] =
 -    { &google, &mail_ru, &yandex_kz, };
 +    { &duckduckgo, &google, &mail_ru, &yandex_kz, };
 // Lebanon
 const PrepopulatedEngine* engines_LB[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Liechtenstein
 const PrepopulatedEngine* engines_LI[] =
 -    { &google, &bing, &yahoo_de, };
 +    { &duckduckgo, &google, &bing, &yahoo_de, };
 // Lithuania
 const PrepopulatedEngine* engines_LT[] =
 -    { &google, &bing, &yandex_ru, };
 +    { &duckduckgo, &google, &bing, &yandex_ru, };
 // Luxembourg
 const PrepopulatedEngine* engines_LU[] =
 -    { &google, &bing, &yahoo_fr, };
 +    { &duckduckgo, &google, &bing, &yahoo_fr, };
 // Latvia
 const PrepopulatedEngine* engines_LV[] =
 -    { &google, &yandex_ru, &bing, };
 +    { &duckduckgo, &google, &yandex_ru, &bing, };
 // Libya
 const PrepopulatedEngine* engines_LY[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Morocco
 const PrepopulatedEngine* engines_MA[] =
 -    { &google, &bing, &yahoo_maktoob, };
 +    { &duckduckgo, &google, &bing, &yahoo_maktoob, };
 // Monaco
 const PrepopulatedEngine* engines_MC[] =
 -    { &google, &yahoo_fr, &bing, };
 +    { &duckduckgo, &google, &yahoo_fr, &bing, };
 // Moldova
 const PrepopulatedEngine* engines_MD[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Montenegro
 const PrepopulatedEngine* engines_ME[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Macedonia
 const PrepopulatedEngine* engines_MK[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Mexico
 const PrepopulatedEngine* engines_MX[] =
 -    { &google, &bing, &yahoo_mx, };
 +    { &duckduckgo, &google, &bing, &yahoo_mx, };
 // Malaysia
 const PrepopulatedEngine* engines_MY[] =
 -    { &google, &yahoo_my, &bing, };
 +    { &duckduckgo, &google, &yahoo_my, &bing, };
 // Nicaragua
 const PrepopulatedEngine* engines_NI[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Netherlands
 const PrepopulatedEngine* engines_NL[] =
 -    { &google, &yahoo_nl, &vinden, };
 +    { &duckduckgo, &google, &yahoo_nl, &vinden, };
 // Norway
 const PrepopulatedEngine* engines_NO[] =
 -    { &google, &bing, &kvasir, };
 +    { &duckduckgo, &google, &bing, &kvasir, };
 // New Zealand
 const PrepopulatedEngine* engines_NZ[] =
 -    { &google, &bing, &yahoo_nz, };
 +    { &duckduckgo, &google, &bing, &yahoo_nz, };
 // Oman
 const PrepopulatedEngine* engines_OM[] =
 -    { &google, &bing, &yahoo_maktoob, };
 +    { &duckduckgo, &google, &bing, &yahoo_maktoob, };
 // Panama
 const PrepopulatedEngine* engines_PA[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Peru
 const PrepopulatedEngine* engines_PE[] =
 -    { &google, &bing, &yahoo_pe, };
 +    { &duckduckgo, &google, &bing, &yahoo_pe, };
 // Philippines
 const PrepopulatedEngine* engines_PH[] =
 -    { &google, &yahoo_ph, &bing, };
 +    { &duckduckgo, &google, &yahoo_ph, &bing, };
 // Pakistan
 const PrepopulatedEngine* engines_PK[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Puerto Rico
 const PrepopulatedEngine* engines_PR[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Poland
 const PrepopulatedEngine* engines_PL[] =
 -    { &google, &onet, &bing, };
 +    { &duckduckgo, &google, &onet, &bing, };
 // Portugal
 const PrepopulatedEngine* engines_PT[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Paraguay
 const PrepopulatedEngine* engines_PY[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Qatar
 const PrepopulatedEngine* engines_QA[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Romania
 const PrepopulatedEngine* engines_RO[] =
 -    { &google, &yahoo_ro, &bing, };
 +    { &duckduckgo, &google, &yahoo_ro, &bing, };
 // Serbia
 const PrepopulatedEngine* engines_RS[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Russia
 const PrepopulatedEngine* engines_RU[] =
 -    { &google, &yandex_ru, &mail_ru, };
 +    { &duckduckgo, &google, &yandex_ru, &mail_ru, };
 // Rwanda
 const PrepopulatedEngine* engines_RW[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Saudi Arabia
 const PrepopulatedEngine* engines_SA[] =
 -    { &google, &yahoo_maktoob, &bing, };
 +    { &duckduckgo, &google, &yahoo_maktoob, &bing, };
 // Sweden
 const PrepopulatedEngine* engines_SE[] =
 -    { &google, &bing, &yahoo_se, };
 +    { &duckduckgo, &google, &bing, &yahoo_se, };
 // Singapore
 const PrepopulatedEngine* engines_SG[] =
 -    { &google, &yahoo_sg, &bing, };
 +    { &duckduckgo, &google, &yahoo_sg, &bing, };
 // Slovenia
 const PrepopulatedEngine* engines_SI[] =
 -    { &google, &najdi, &ask, };
 +    { &duckduckgo, &google, &najdi, &ask, };
 // Slovakia
 const PrepopulatedEngine* engines_SK[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // El Salvador
 const PrepopulatedEngine* engines_SV[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Syria
 const PrepopulatedEngine* engines_SY[] =
 -    { &google, &bing, &yahoo_maktoob, };
 +    { &duckduckgo, &google, &bing, &yahoo_maktoob, };
 // Thailand
 const PrepopulatedEngine* engines_TH[] =
 -    { &google, &yahoo_th, &bing, };
 +    { &duckduckgo, &google, &yahoo_th, &bing, };
 // Tunisia
 const PrepopulatedEngine* engines_TN[] =
 -    { &google, &bing, &yahoo_maktoob, };
 +    { &duckduckgo, &google, &bing, &yahoo_maktoob, };
 // Turkey
 const PrepopulatedEngine* engines_TR[] =
 -    { &google, &bing, &yahoo_tr, &yandex_tr, };
 +    { &duckduckgo, &google, &bing, &yahoo_tr, &yandex_tr, };
 // Trinidad and Tobago
 const PrepopulatedEngine* engines_TT[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Taiwan
 const PrepopulatedEngine* engines_TW[] =
 -    { &google, &yahoo_tw, &bing, };
 +    { &duckduckgo, &google, &yahoo_tw, &bing, };
 // Tanzania
 const PrepopulatedEngine* engines_TZ[] =
 -    { &google, &yahoo, &bing, };
 +    { &duckduckgo, &google, &yahoo, &bing, };
 // Ukraine
 const PrepopulatedEngine* engines_UA[] =
 -    { &google, &yandex_ua, &bing, };
 +    { &duckduckgo, &google, &yandex_ua, &bing, };
 // United States
 const PrepopulatedEngine* engines_US[] =
 -    { &google, &bing, &yahoo, &aol, &ask, };
 +    { &duckduckgo, &google, &bing, &yahoo, &aol, &ask, };
 // Uruguay
 const PrepopulatedEngine* engines_UY[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Venezuela
 const PrepopulatedEngine* engines_VE[] =
 -    { &google, &bing, &yahoo_ve, };
 +    { &duckduckgo, &google, &bing, &yahoo_ve, };
 // Vietnam
 const PrepopulatedEngine* engines_VN[] =
 -    { &google, &yahoo_vn, &bing, };
 +    { &duckduckgo, &google, &yahoo_vn, &bing, };
 // Yemen
 const PrepopulatedEngine* engines_YE[] =
 -    { &google, &bing, &yahoo_maktoob, };
 +    { &duckduckgo, &google, &bing, &yahoo_maktoob, };
 // South Africa
 const PrepopulatedEngine* engines_ZA[] =
 -    { &google, &bing, &yahoo, };
 +    { &duckduckgo, &google, &bing, &yahoo, };
 // Zimbabwe
 const PrepopulatedEngine* engines_ZW[] =
 -    { &google, &bing, &yahoo, &ask, };
 +    { &duckduckgo, &google, &bing, &yahoo, &ask, };
 // A list of all the engines that we know about.
 const PrepopulatedEngine* kAllEngines[] = {
   // Prepopulated engines:
   &aol,          &ask,          &ask_br,       &ask_uk,       &baidu,
 -  &bing,         &daum,         &google,       &kvasir,       &mail_ru,
 +  &bing,         &daum,&duckduckgo,&google,       &kvasir,       &mail_ru,
   &najdi,        &naver,        &onet,         &seznam,       &sogou,
   &vinden,       &virgilio,     &yahoo,        &yahoo_ar,     &yahoo_at,
   &yahoo_au,     &yahoo_br,     &yahoo_ca,     &yahoo_ch,     &yahoo_cl,
--- a/packages/net-www/inox/files/inox/branding.patch
+++ b/packages/net-www/inox/files/inox/branding.patch
@ -1,100 +0,0 @@
 --- ./chrome/common/chrome_paths_linux.cc
 +++ ./chrome/common/chrome_paths_linux.cc.new
@@ -64,11 +64,7 @@
   base::FilePath config_dir(GetXDGDirectory(env.get(),
                                             kXdgConfigHomeEnvVar,
                                             kDotConfigDir));
 -#if defined(GOOGLE_CHROME_BUILD)
 -  *result = config_dir.Append("google-chrome");
 -#else
 -  *result = config_dir.Append("chromium");
 -#endif
 +  *result = config_dir.Append("inox");
   return true;
 }
 --- ./chrome/app/chromium_strings.grd
 +++ ./chrome/app/chromium_strings.grd.new
@@ -215,17 +215,17 @@ be available for now. -->
         Disconnecting <ph name="USERNAME">$1<ex>someone@example.com</ex></ph> will clear your history, bookmarks, settings, and other Chromium data stored on this device. Data stored in your Google Account will not be cleared and can be managed on <ph name="GOOGLE_DASHBOARD_LINK">&lt;a target="_blank" href="$2"&gt;</ph>Google Dashboard<ph name="END_GOOGLE_DASHBOARD_LINK">&lt;/a&gt;</ph>.
       </message>
       <message name="IDS_PRODUCT_NAME" desc="The Chrome application name">
 -        Chromium
 +        Inox
       </message>
       <message name="IDS_SHORT_PRODUCT_NAME" desc="The Chrome application short name.">
 -        Chromium
 +        Inox
       </message>
       <if expr="is_win">
         <message name="IDS_SXS_SHORTCUT_NAME" desc="The Chrome short cut name for SxS channel">
 -          Chromium
 +          Inox
         </message>
         <message name="IDS_PRODUCT_DESCRIPTION" desc="Browser description">
 -          Chromium is a web browser that runs webpages and applications with lightning speed. It's fast, stable, and easy to use. Browse the web more safely with malware and phishing protection built into Chromium.
 +          Inox is a free, open, and libre browser modification of the Chromium code base, with privacy being enhanced in several key areas. Automatic transmission of partial queries, keywords, metrics to central services inhibited and only occurs with consent. In addition, all our builds are reproducible, and modifications are auditable, setting the project ahead of other secure browser providers.
         </message>
       </if>
       <if expr="chromeos">
@@ -241,7 +241,7 @@ be available for now. -->
           Chromium App Launcher
         </message>
         <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name">
 -          Chromium Binaries
 +          Inox Binaries
         </message>
         <message name="IDS_CHROME_FRAME_TURNDOWN_LEARN_MORE_URL" desc="Link to knowledge-base article about Chromium Frame's turndown">
           https://support.google.com/chrome/?p=ib_chromeframe
@@ -272,17 +272,17 @@ be available for now. -->
         </message>
       </if>
       <message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window">
 -        Task Manager - Chromium
 +        Task Manager - Inox
       </message>
       <message name="IDS_SESSION_CRASHED_VIEW_MESSAGE" desc="Message shown when the last session didn't exit cleanly.">
 -        Chromium didn't shut down correctly.
 +        Inox did not shut down correctly.
       </message>
       <message name="IDS_SESSION_CRASHED_VIEW_UMA_OPTIN" desc="Text besides the checkbox to let users optin to UMA in the restore from previous crash bubble.">
         Help make Chromium better by sending crash reports and <ph name="UMA_LINK">$1<ex>usage statistics</ex></ph> to Google
       </message>
       <!-- Browser Window Title Format -->
       <message name="IDS_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for titles displayed in tabs and popup windows">
 -        <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> - Chromium
 +        <ph name="PAGE_TITLE">$1<ex>Google</ex></ph> – Inox
       </message>
       <if expr="not chromeos">
         <message name="IDS_GET_HELP_USING_CHROME" desc="Text of the button which takes the user to the Chrome help page.">
@@ -787,7 +787,7 @@ For Chromium, processes used to display diagnostics information (such as this "a
       <if expr="use_titlecase and not chromeos">
         <message name="IDS_ABOUT" desc="In Title Case: The text label of the About Chrome menu item">
 -          About &amp;Chromium
 +          About &amp;Inox
         </message>
         <message name="IDS_UPDATE_NOW" desc="In Title Case: The text label of the Update Chrome Now menu item">
           Update &amp;Chromium
@@ -795,7 +795,7 @@ For Chromium, processes used to display diagnostics information (such as this "a
       </if>
       <if expr="not use_titlecase and not chromeos">
         <message name="IDS_ABOUT" desc="The text label of the About Chrome menu item">
 -          About &amp;Chromium
 +          About &amp;Inox
         </message>
         <message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome Now menu item">
           Update &amp;Chromium
@@ -812,7 +812,7 @@ For Chromium, processes used to display diagnostics information (such as this "a
       <if expr="is_macosx">
         <message name="IDS_APP_MENU_PRODUCT_NAME" desc="The application's short name, used for the Mac's application menu, activity monitor, etc. This should be less than 16 characters. Example: Chrome, not Google Chrome.">
 -          Chromium
 +          Inox
         </message>
         <message name="IDS_HELPER_NAME" desc="The helper application's name.  Should contain the Chrome application name (IDS_PRODUCT_NAME). Example: Google Chrome Helper.">
           Chromium Helper
--- a/packages/net-www/inox/files/inox/chromium-sandbox-pie.patch
+++ b/packages/net-www/inox/files/inox/chromium-sandbox-pie.patch
@ -1,14 +0,0 @@
 --- a/sandbox/linux/sandbox_linux.gypi
 +++ b/sandbox/linux/sandbox_linux.gypi
@@ -221,7 +221,10 @@
       ],
       'cflags': [
         # For ULLONG_MAX
 -        '-std=gnu99',
 +        '-std=gnu99 -fPIE',
 +      ],
 +      'ldflags': [
 +        '-pie',
       ],
       'include_dirs': [
         '../..',
--- a/packages/net-www/inox/files/inox/disable-autofill-download-manager.patch
+++ b/packages/net-www/inox/files/inox/disable-autofill-download-manager.patch
@ -1,61 +0,0 @@
 --- ./components/autofill/core/browser/autofill_download_manager.cc	2016-03-08 04:12:53.191538227 +0300
 +++ ./components/autofill/core/browser/autofill_download_manager.cc.new	2016-03-08 04:14:33.351542560 +0300
@@ -87,8 +87,7 @@
 }
 GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
 -  return GURL("https://clients1.google.com/tbproxy/af/" +
 -              RequestTypeToString(request_type) + "?client=" + kClientName);
 +  return GURL("about:blank");
 }
 }  // namespace
@@ -174,48 +173,6 @@
 bool AutofillDownloadManager::StartRequest(
     const FormRequestData& request_data) {
 -  net::URLRequestContextGetter* request_context =
 -      driver_->GetURLRequestContext();
 -  DCHECK(request_context);
 -  GURL request_url = GetRequestUrl(request_data.request_type);
 -
 -  std::string compressed_data;
 -  if (!compression::GzipCompress(request_data.payload, &compressed_data)) {
 -    NOTREACHED();
 -    return false;
 -  }
 -
 -  const int compression_ratio = base::checked_cast<int>(
 -      100 * compressed_data.size() / request_data.payload.size());
 -  AutofillMetrics::LogPayloadCompressionRatio(compression_ratio,
 -                                              request_data.request_type);
 -
 -  // Id is ignored for regular chrome, in unit test id's for fake fetcher
 -  // factory will be 0, 1, 2, ...
 -  net::URLFetcher* fetcher =
 -      net::URLFetcher::Create(fetcher_id_for_unittest_++, request_url,
 -                              net::URLFetcher::POST, this).release();
 -  data_use_measurement::DataUseUserData::AttachToFetcher(
 -      fetcher, data_use_measurement::DataUseUserData::AUTOFILL);
 -  url_fetchers_[fetcher] = request_data;
 -  fetcher->SetAutomaticallyRetryOn5xx(false);
 -  fetcher->SetRequestContext(request_context);
 -  fetcher->SetUploadData("text/xml", compressed_data);
 -  fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
 -                        net::LOAD_DO_NOT_SEND_COOKIES);
 -  // Add Chrome experiment state and GZIP encoding to the request headers.
 -  net::HttpRequestHeaders headers;
 -  headers.SetHeaderIfMissing("content-encoding", "gzip");
 -  variations::AppendVariationHeaders(
 -      fetcher->GetOriginalURL(), driver_->IsOffTheRecord(), false, &headers);
 -  fetcher->SetExtraRequestHeaders(headers.ToString());
 -  fetcher->Start();
 -
 -  VLOG(1) << "Sending AutofillDownloadManager "
 -          << RequestTypeToString(request_data.request_type)
 -          << " request (compression " << compression_ratio
 -          << "): " << request_data.payload;
 -
   return true;
 }
--- a/packages/net-www/inox/files/inox/disable-default-extensions.patch
+++ b/packages/net-www/inox/files/inox/disable-default-extensions.patch
@ -1,145 +0,0 @@
 --- ./chrome/browser/extensions/external_component_loader.cc
 +++ ./chrome/browser/extensions/external_component_loader.cc.new
@@ -39,10 +39,6 @@
 void ExternalComponentLoader::StartLoading() {
   prefs_.reset(new base::DictionaryValue());
 -  AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId);
 -
 -  if (HotwordServiceFactory::IsHotwordAllowed(profile_))
 -    AddExternalExtension(extension_misc::kHotwordSharedModuleId);
 #if defined(OS_CHROMEOS)
   {
@@ -53,17 +49,6 @@
   }
 #endif
 -#if defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
 -  if (media_router::MediaRouterEnabled(profile_))
 -    AddExternalExtension(extension_misc::kMediaRouterStableExtensionId);
 -#endif  // defined(ENABLE_MEDIA_ROUTER) && defined(GOOGLE_CHROME_BUILD)
 -
 -#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
 -  std::string google_now_extension_id;
 -  if (GetGoogleNowExtensionId(&google_now_extension_id))
 -    AddExternalExtension(google_now_extension_id);
 -#endif
 -
   LoadFinished();
 }
 --- ./chrome/browser/extensions/component_loader.cc
 +++ ./chrome/browser/extensions/component_loader.cc.new
@@ -351,24 +351,12 @@
 }
 void ComponentLoader::AddHangoutServicesExtension() {
 -#if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
 -  Add(IDR_HANGOUT_SERVICES_MANIFEST,
 -      base::FilePath(FILE_PATH_LITERAL("hangout_services")));
 -#endif
 }
 void ComponentLoader::AddHotwordAudioVerificationApp() {
 -  if (HotwordServiceFactory::IsAlwaysOnAvailable()) {
 -    Add(IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST,
 -        base::FilePath(FILE_PATH_LITERAL("hotword_audio_verification")));
 -  }
 }
 void ComponentLoader::AddHotwordHelperExtension() {
 -  if (HotwordServiceFactory::IsHotwordAllowed(profile_)) {
 -    Add(IDR_HOTWORD_MANIFEST,
 -        base::FilePath(FILE_PATH_LITERAL("hotword")));
 -  }
 }
 void ComponentLoader::AddImageLoaderExtension() {
@@ -384,43 +372,6 @@
 }
 void ComponentLoader::AddGoogleNowExtension() {
 -#if BUILDFLAG(ENABLE_GOOGLE_NOW)
 -  const char kEnablePrefix[] = "Enable";
 -  const char kFieldTrialName[] = "GoogleNow";
 -  std::string enable_prefix(kEnablePrefix);
 -  std::string field_trial_result =
 -      base::FieldTrialList::FindFullName(kFieldTrialName);
 -
 -  bool enabled_via_field_trial =
 -      field_trial_result.compare(0, enable_prefix.length(), enable_prefix) == 0;
 -
 -  // Enable the feature on trybots and trunk builds.
 -  bool enabled_via_trunk_build =
 -      chrome::GetChannel() == version_info::Channel::UNKNOWN;
 -
 -  bool is_authenticated =
 -      SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated();
 -
 -  bool enabled =
 -      (enabled_via_field_trial && is_authenticated) || enabled_via_trunk_build;
 -
 -#if defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
 -  // Don't load if newer trial is running (== new extension id is available).
 -  std::string ignored_extension_id;
 -  if (GetGoogleNowExtensionId(&ignored_extension_id)) {
 -    enabled = false;
 -  }
 -#endif  // defined(ENABLE_APP_LIST) && defined(OS_CHROMEOS)
 -
 -  const int google_now_manifest_id = IDR_GOOGLE_NOW_MANIFEST;
 -  const base::FilePath root_directory =
 -      base::FilePath(FILE_PATH_LITERAL("google_now"));
 -  if (enabled) {
 -    Add(google_now_manifest_id, root_directory);
 -  } else {
 -    DeleteData(google_now_manifest_id, root_directory);
 -  }
 -#endif  // BUILDFLAG(ENABLE_GOOGLE_NOW)
 }
 #if defined(OS_CHROMEOS)
@@ -496,15 +447,6 @@
 }
 void ComponentLoader::AddWebStoreApp() {
 -#if defined(OS_CHROMEOS)
 -  if (!IsNormalSession())
 -    return;
 -#endif
 -
 -  AddWithNameAndDescription(
 -      IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")),
 -      l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE),
 -      l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
 }
 scoped_refptr<const Extension> ComponentLoader::CreateExtension(
@@ -555,9 +497,6 @@
   DCHECK(!skip_session_components);
   Add(IDR_BOOKMARKS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("bookmark_manager")));
 -  // Cloud Print component app. Not required on Chrome OS.
 -  Add(IDR_CLOUDPRINT_MANIFEST,
 -      base::FilePath(FILE_PATH_LITERAL("cloud_print")));
 #endif
   if (!skip_session_components) {
@@ -629,13 +571,6 @@
     AddImageLoaderExtension();
     AddGoogleNowExtension();
 -    bool install_feedback = enable_background_extensions_during_testing;
 -#if defined(GOOGLE_CHROME_BUILD)
 -    install_feedback = true;
 -#endif  // defined(GOOGLE_CHROME_BUILD)
 -    if (install_feedback)
 -      Add(IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")));
 -
 #if defined(ENABLE_SETTINGS_APP)
     Add(IDR_SETTINGS_APP_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("settings_app")));
--- a/packages/net-www/inox/files/inox/disable-first-run-behaviour.patch
+++ b/packages/net-www/inox/files/inox/disable-first-run-behaviour.patch
@ -1,35 +0,0 @@
 --- ./chrome/browser/ui/startup/startup_browser_creator_impl.cc
 +++ ./chrome/browser/ui/startup/startup_browser_creator_impl.cc.new
@@ -852,8 +852,6 @@
         // Replace magic names for the actual urls.
         if (it->host() == "new_tab_page") {
           startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
 -        } else if (it->host() == "welcome_page") {
 -          startup_urls->push_back(internals::GetWelcomePageURL());
         } else {
           startup_urls->push_back(*it);
         }
@@ -868,10 +866,6 @@
   if (startup_urls->empty()) {
     AddSpecialURLs(startup_urls);
     startup_urls->push_back(GURL(chrome::kChromeUINewTabURL));
 -
 -    // Special case the FIRST_RUN_LAST_TAB case of the welcome page.
 -    if (welcome_run_type_ == WelcomeRunType::FIRST_RUN_LAST_TAB)
 -      startup_urls->push_back(internals::GetWelcomePageURL());
   }
   if (signin::ShouldShowPromoAtStartup(profile_, is_first_run_)) {
@@ -905,10 +899,6 @@
 void StartupBrowserCreatorImpl::AddSpecialURLs(
     std::vector<GURL>* url_list) const {
 -  // Optionally include the welcome page.
 -  if (welcome_run_type_ == WelcomeRunType::FIRST_TAB)
 -    url_list->insert(url_list->begin(), internals::GetWelcomePageURL());
 -
   // If this Profile is marked for a reset prompt, ensure the reset
   // settings dialog appears.
   if (CheckAndClearProfileResetTrigger())
--- a/packages/net-www/inox/files/inox/disable-gcm-status-check.patch
+++ b/packages/net-www/inox/files/inox/disable-gcm-status-check.patch
@ -1,32 +0,0 @@
 --- ./components/gcm_driver/gcm_channel_status_request.cc
 +++ ./components/gcm_driver/gcm_channel_status_request.cc.new
@@ -19,8 +19,10 @@ namespace gcm {
 namespace {
 +#if 0
 const char kRequestContentType[] = "application/octet-stream";
 const char kGCMChannelTag[] = "gcm_channel";
 +#endif
 const int kDefaultPollIntervalSeconds = 60 * 60;  // 60 minutes.
 const int kMinPollIntervalSeconds = 30 * 60;  // 30 minutes.
@@ -53,6 +55,7 @@ int GCMChannelStatusRequest::min_poll_interval_seconds() {
 }
 void GCMChannelStatusRequest::Start() {
 +#if 0
   DCHECK(!url_fetcher_.get());
   GURL request_url(channel_status_request_url_);
@@ -72,6 +75,9 @@ void GCMChannelStatusRequest::Start() {
   url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                              net::LOAD_DO_NOT_SAVE_COOKIES);
   url_fetcher_->Start();
 +#endif
 +  // Simulate an empty response and disable GCM.
 +  callback_.Run(false, false, 0);
 }
 void GCMChannelStatusRequest::OnURLFetchComplete(
--- a/packages/net-www/inox/files/inox/disable-google-ipv6-probes.patch
+++ b/packages/net-www/inox/files/inox/disable-google-ipv6-probes.patch
@ -1,17 +0,0 @@
 --- ./net/dns/host_resolver_impl.cc
 +++ ./net/dns/host_resolver_impl.cc.new
@@ -78,10 +78,10 @@ const char kLocalhost[] = "localhost.";
 // cached.
 const int kIPv6ProbePeriodMs = 1000;
 -// Google DNS address used for IPv6 probes.
 +/* RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted) */
 const uint8_t kIPv6ProbeAddress[] =
 -    { 0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00,
 -      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88 };
 +    { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
 +      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
 // We use a separate histogram name for each platform to facilitate the
 // display of error codes by their symbolic name (since each platform has
--- a/packages/net-www/inox/files/inox/disable-google-url-tracker.patch
+++ b/packages/net-www/inox/files/inox/disable-google-url-tracker.patch
@ -1,64 +0,0 @@
 --- ./components/google/core/browser/google_url_tracker.cc
 +++ ./components/google/core/browser/google_url_tracker.cc.new
@@ -25,9 +25,9 @@
 const char GoogleURLTracker::kDefaultGoogleHomepage[] =
 -    "https://www.google.com/";
 +    "";
 const char GoogleURLTracker::kSearchDomainCheckURL[] =
 -    "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
 +    "";
 GoogleURLTracker::GoogleURLTracker(scoped_ptr<GoogleURLTrackerClient> client,
                                    Mode mode)
@@ -146,48 +146,4 @@
 }
 void GoogleURLTracker::StartFetchIfDesirable() {
 -  // Bail if a fetch isn't appropriate right now.  This function will be called
 -  // again each time one of the preconditions changes, so we'll fetch
 -  // immediately once all of them are met.
 -  //
 -  // See comments in header on the class, on RequestServerCheck(), and on the
 -  // various members here for more detail on exactly what the conditions are.
 -  if (in_startup_sleep_ || already_fetched_ || !need_to_fetch_)
 -    return;
 -
 -  // Some switches should disable the Google URL tracker entirely.  If we can't
 -  // do background networking, we can't do the necessary fetch, and if the user
 -  // specified a Google base URL manually, we shouldn't bother to look up any
 -  // alternatives or offer to switch to them.
 -  if (!client_->IsBackgroundNetworkingEnabled() ||
 -      base::CommandLine::ForCurrentProcess()->HasSwitch(
 -          switches::kGoogleBaseURL))
 -    return;
 -
 -  already_fetched_ = true;
 -  fetcher_ = net::URLFetcher::Create(fetcher_id_, GURL(kSearchDomainCheckURL),
 -                                     net::URLFetcher::GET, this);
 -  data_use_measurement::DataUseUserData::AttachToFetcher(
 -      fetcher_.get(),
 -      data_use_measurement::DataUseUserData::GOOGLE_URL_TRACKER);
 -  ++fetcher_id_;
 -  // We don't want this fetch to set new entries in the cache or cookies, lest
 -  // we alarm the user.
 -  fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
 -                         net::LOAD_DO_NOT_SAVE_COOKIES);
 -  fetcher_->SetRequestContext(client_->GetRequestContext());
 -
 -  // Configure to retry at most kMaxRetries times for 5xx errors.
 -  static const int kMaxRetries = 5;
 -  fetcher_->SetMaxRetriesOn5xx(kMaxRetries);
 -
 -  // Also retry kMaxRetries times on network change errors. A network change can
 -  // propagate through Chrome in various stages, so it's possible for this code
 -  // to be reached via OnNetworkChanged(), and then have the fetch we kick off
 -  // be canceled due to e.g. the DNS server changing at a later time. In general
 -  // it's not possible to ensure that by the time we reach here any requests we
 -  // start won't be canceled in this fashion, so retrying is the best we can do.
 -  fetcher_->SetAutomaticallyRetryOnNetworkChanges(kMaxRetries);
 -
 -  fetcher_->Start();
 }
--- a/packages/net-www/inox/files/inox/disable-missing-key-warning.patch
+++ b/packages/net-www/inox/files/inox/disable-missing-key-warning.patch
@ -1,10 +0,0 @@
 --- ./chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
 +++ ./chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc.new
@@ -15,6 +15,7 @@
 // static
 void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) {
 +  return;
   if (google_apis::HasKeysConfigured())
     return;
--- a/packages/net-www/inox/files/inox/disable-new-avatar-menu.patch
+++ b/packages/net-www/inox/files/inox/disable-new-avatar-menu.patch
@ -1,29 +0,0 @@
 --- ./chrome/browser/profiles/avatar_menu.cc
 +++ ./chrome/browser/profiles/avatar_menu.cc.new
@@ -92,12 +92,7 @@
   // TODO: Eliminate this ifdef. Add a delegate interface for the menu which
   // would also help remove the Browser dependency in AvatarMenuActions
   // implementations.
 -#if defined(OS_CHROMEOS)
 -  // On ChromeOS the menu will not be shown.
   return false;
 -#else
 -  return true;
 -#endif
 }
 bool AvatarMenu::CompareItems(const Item* item1, const Item* item2) {
 --- ./chrome/browser/ui/webui/options/browser_options_handler.cc
 +++ ./chrome/browser/ui/webui/options/browser_options_handler.cc.new
@@ -1506,7 +1506,7 @@
   SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
   DCHECK(signin);
   sync_status->SetBoolean("signoutAllowed", !signout_prohibited);
 -  sync_status->SetBoolean("signinAllowed", signin->IsSigninAllowed());
 +  sync_status->SetBoolean("signinAllowed", false);
   sync_status->SetBoolean("syncSystemEnabled", (service != NULL));
   sync_status->SetBoolean("setupCompleted",
                           service && service->HasSyncSetupCompleted());
--- a/packages/net-www/inox/files/inox/disable-translation-lang-fetch.patch
+++ b/packages/net-www/inox/files/inox/disable-translation-lang-fetch.patch
@ -1,60 +0,0 @@
 --- ./components/translate/core/browser/translate_language_list.cc
 +++ ./components/translate/core/browser/translate_language_list.cc.new
@@ -200,35 +200,6 @@
 }
 void TranslateLanguageList::RequestLanguageList() {
 -  // If resource requests are not allowed, we'll get a callback when they are.
 -  if (!resource_requests_allowed_) {
 -    request_pending_ = true;
 -    return;
 -  }
 -
 -  request_pending_ = false;
 -
 -  if (language_list_fetcher_.get() &&
 -      (language_list_fetcher_->state() == TranslateURLFetcher::IDLE ||
 -       language_list_fetcher_->state() == TranslateURLFetcher::FAILED)) {
 -    GURL url = TranslateLanguageUrl();
 -    url = AddHostLocaleToUrl(url);
 -    url = AddApiKeyToUrl(url);
 -    url = net::AppendQueryParameter(
 -        url, kAlphaLanguageQueryName, kAlphaLanguageQueryValue);
 -
 -    std::string message = base::StringPrintf(
 -        "Language list including alpha languages fetch starts (URL: %s)",
 -        url.spec().c_str());
 -    NotifyEvent(__LINE__, message);
 -
 -    bool result = language_list_fetcher_->Request(
 -        url,
 -        base::Bind(&TranslateLanguageList::OnLanguageListFetchComplete,
 -                   base::Unretained(this)));
 -    if (!result)
 -      NotifyEvent(__LINE__, "Request is omitted due to retry limit");
 -  }
 }
 void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) {
 --- ./chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
 +++ ./chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.new
@@ -145,7 +145,6 @@
     return;
   }
   request_context_getter_ = request_context_getter;
 -  DownloadDictionary(GetDictionaryURL());
 }
 bool SpellcheckHunspellDictionary::IsReady() const {
@@ -338,9 +337,6 @@
     }
     if (request_context_getter_) {
 -      // Download from the UI thread to check that |request_context_getter_| is
 -      // still valid.
 -      DownloadDictionary(GetDictionaryURL());
       return;
     }
   }
--- a/packages/net-www/inox/files/inox/disable-update-pings.patch
+++ b/packages/net-www/inox/files/inox/disable-update-pings.patch
@ -1,17 +0,0 @@
 --- ./components/component_updater/configurator_impl.cc
 +++ ./components/component_updater/configurator_impl.cc.new
@@ -153,14 +153,6 @@
 std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
   std::vector<GURL> urls;
 -  if (url_source_override_.is_valid()) {
 -    urls.push_back(GURL(url_source_override_));
 -  } else {
 -    urls.push_back(GURL(kUpdaterDefaultUrl));
 -    if (fallback_to_alt_source_url_enabled_) {
 -      urls.push_back(GURL(kUpdaterAltUrl));
 -    }
 -  }
   return urls;
 }
--- a/packages/net-www/inox/files/inox/disable-web-resource-service.patch
+++ b/packages/net-www/inox/files/inox/disable-web-resource-service.patch
@ -1,34 +0,0 @@
 # Disable the web resource service
 --- a/./components/web_resource/web_resource_service.cc
 +++ b/./components/web_resource/web_resource_service.cc
@@ -114,27 +114,8 @@ void WebResourceService::StartFetch() {
   prefs_->SetString(last_update_time_pref_name_,
                     base::DoubleToString(base::Time::Now().ToDoubleT()));
 -  // If we are still fetching data, exit.
 -  if (in_fetch_)
 -    return;
 -  in_fetch_ = true;
 -
 -  GURL web_resource_server =
 -      application_locale_.empty()
 -          ? web_resource_server_
 -          : google_util::AppendGoogleLocaleParam(web_resource_server_,
 -                                                 application_locale_);
 -
 -  DVLOG(1) << "WebResourceService StartFetch " << web_resource_server;
 -  url_fetcher_ =
 -      net::URLFetcher::Create(web_resource_server, net::URLFetcher::GET, this);
 -  // Do not let url fetcher affect existing state in system context
 -  // (by setting cookies, for example).
 -  url_fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
 -                             net::LOAD_DO_NOT_SEND_COOKIES |
 -                             net::LOAD_DO_NOT_SAVE_COOKIES);
 -  url_fetcher_->SetRequestContext(request_context_.get());
 -  url_fetcher_->Start();
 +  in_fetch_ = false;
 +  return;
 }
 void WebResourceService::EndFetch() {
--- a/packages/net-www/inox/files/inox/modify-default-prefs.patch
+++ b/packages/net-www/inox/files/inox/modify-default-prefs.patch
@ -1,250 +0,0 @@
 --- ./chrome/browser/chrome_content_browser_client.cc
 +++ ./chrome/browser/chrome_content_browser_client.cc.new
@@ -733,7 +733,7 @@
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
 -  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
 +  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
   registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
 }
 --- ./chrome/browser/ui/browser_ui_prefs.cc
 +++ ./chrome/browser/ui/browser_ui_prefs.cc.new
@@ -83,11 +83,11 @@
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
       prefs::kEnableTranslate,
 -      true,
 +      false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kCloudPrintEmail, std::string());
   registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
 -  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false);
   registry->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
 --- ./chrome/browser/net/prediction_options.cc
 +++ ./chrome/browser/net/prediction_options.cc.new
@@ -26,7 +26,7 @@
     case NETWORK_PREDICTION_NEVER:
       return NetworkPredictionStatus::DISABLED_ALWAYS;
     default:
 -      DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options);
 +      //DCHECK_EQ(NETWORK_PREDICTION_WIFI_ONLY, network_prediction_options);
       if (net::NetworkChangeNotifier::IsConnectionCellular(
                  net::NetworkChangeNotifier::GetConnectionType())) {
         return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK;
 --- ./chrome/browser/net/prediction_options.h
 +++ ./chrome/browser/net/prediction_options.h.new
@@ -21,7 +21,7 @@ enum NetworkPredictionOptions {
   NETWORK_PREDICTION_ALWAYS,
   NETWORK_PREDICTION_WIFI_ONLY,
   NETWORK_PREDICTION_NEVER,
 -  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_WIFI_ONLY,
 +  NETWORK_PREDICTION_DEFAULT = NETWORK_PREDICTION_NEVER,
 };
 enum class NetworkPredictionStatus {
 --- ./chrome/browser/background/background_mode_manager.cc
 +++ ./chrome/browser/background/background_mode_manager.cc.new
@@ -356,7 +356,7 @@ void BackgroundModeManager::RegisterPref
   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
 #endif
 -  registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false);
 }
 void BackgroundModeManager::RegisterProfile(Profile* profile) {
 --- ./components/content_settings/core/browser/cookie_settings.cc
 +++ ./components/content_settings/core/browser/cookie_settings.cc.new
@@ -82,7 +82,7 @@
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
 -      prefs::kBlockThirdPartyCookies, false,
 +      prefs::kBlockThirdPartyCookies, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 --- ./chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ ./chrome/browser/ui/navigation_correction_tab_observer.cc.new
@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~Naviga
 void NavigationCorrectionTabObserver::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
 -                             true,
 +                             false,
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 --- ./components/autofill/core/browser/autofill_manager.cc
 +++ ./components/autofill/core/browser/autofill_manager.cc.new
@@ -140,7 +140,7 @@ void AutofillManager::RegisterProfilePre
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kAutofillEnabled,
 -      true,
 +      false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kAutofillWalletSyncExperimentEnabled,
                                 false);
 --- ./chrome/browser/resources/options/reset_profile_settings_overlay.html
 +++ ./chrome/browser/resources/options/reset_profile_settings_overlay.html.new
@@ -26,7 +26,7 @@
   <div id="feedback-bar"
       class="gray-bottom-bar checkbox controlled-setting-with-label">
     <label>
 -      <input id="send-settings" type="checkbox" checked>
 +      <input id="send-settings" type="checkbox">
       <span>
         <span i18n-content="resetProfileSettingsFeedback"></span>
         <span id="expand-feedback"></span>
 --- ./chrome/browser/io_thread.cc
 +++ ./chrome/browser/io_thread.cc.new
@@ -1043,7 +1043,7 @@ void IOThread::RegisterPrefs(PrefRegistr
                                std::string());
   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
   data_reduction_proxy::RegisterPrefs(registry);
 -  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
 }
 --- ./extensions/common/extension.cc
 +++ ./extensions/common/extension.cc.new
@@ -357,7 +357,7 @@ bool Extension::ShouldNotBeVisible() con
   if (extensions::Manifest::IsComponentLocation(location()) &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kShowComponentExtensionOptions)) {
 -    return true;
 +    return false;
   }
   // Always show unpacked extensions and apps.
@@ -366,7 +366,7 @@ bool Extension::ShouldNotBeVisible() con
   // Don't show apps that aren't visible in either launcher or ntp.
   if (is_app() && !ShouldDisplayInAppLauncher() && !ShouldDisplayInNewTabPage())
 -    return true;
 +    return false;
   return false;
 }
 --- ./chrome/browser/signin/signin_promo.cc
 +++ ./chrome/browser/signin/signin_promo.cc.new
@@ -353,8 +354,8 @@ void ForceWebBasedSigninFlowForTesting(b
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
 -  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
 -  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
 +  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
 +  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
 }
 --- ./components/bookmarks/browser/bookmark_utils.cc
 +++ ./components/bookmarks/browser/bookmark_utils.cc.new
@@ -430,12 +430,12 @@ void GetBookmarksMatchingProperties(Book
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kShowBookmarkBar,
 -      false,
 +      true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kEditBookmarksEnabled, true);
   registry->RegisterBooleanPref(
       prefs::kShowAppsShortcutInBookmarkBar,
 -      true,
 +      false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kShowManagedBookmarksInBookmarkBar,
 --- ./chrome/browser/profiles/profile.cc
 +++ ./chrome/browser/profiles/profile.cc.new
@@ -77,7 +77,7 @@ const char Profile::kNoHostedDomainFound
 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kSearchSuggestEnabled,
 -      true,
 +      false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #if BUILDFLAG(ANDROID_JAVA_UI)
   registry->RegisterStringPref(
@@ -89,7 +89,7 @@ void Profile::RegisterProfilePrefs(user_
   registry->RegisterStringPref(prefs::kSessionExitType, std::string());
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingEnabled,
 -      true,
 +      false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kSafeBrowsingExtendedReportingEnabled,
                                 false);
@@ -105,7 +105,7 @@ void Profile::RegisterProfilePrefs(user_
   // This pref is intentionally outside the above #if. That flag corresponds
   // to the Notifier extension and does not gate the launcher page.
   // TODO(skare): Remove or rename ENABLE_GOOGLE_NOW: http://crbug.com/459827.
 -  registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kGoogleNowLauncherEnabled, false);
   registry->RegisterBooleanPref(prefs::kDisableExtensions, false);
 #if defined(ENABLE_EXTENSIONS)
   registry->RegisterBooleanPref(extensions::pref_names::kAlertsInitialized,
 --- ./chrome/service/cloud_print/connector_settings.cc
 +++ ./chrome/service/cloud_print/connector_settings.cc.new
@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(Service
   DCHECK(server_url_.is_valid());
   connect_new_printers_ = prefs->GetBoolean(
 -      prefs::kCloudPrintConnectNewPrinters, true);
 +      prefs::kCloudPrintConnectNewPrinters, false);
   xmpp_ping_enabled_ = prefs->GetBoolean(
       prefs::kCloudPrintXmppPingEnabled, false);
 --- ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ ./chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc.new
@@ -142,10 +142,6 @@ void LocalDiscoveryUI::RegisterProfilePr
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kLocalDiscoveryNotificationsEnabled,
 -#if defined(OS_WIN)
       false,
 -#else
 -      true,
 -#endif
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
--- a/packages/net-www/inox/files/inox/restore-classic-ntp.patch
+++ b/packages/net-www/inox/files/inox/restore-classic-ntp.patch
@ -1,44 +0,0 @@
 --- ./chrome/browser/search/search.cc
 +++ ./chrome/browser/search/search.cc.new
@@ -287,17 +287,7 @@
         template_url->new_tab_url_ref(), UIThreadSearchTermsData(profile),
         false, false);
     NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
 -    switch (state) {
 -      case NEW_TAB_URL_VALID:
 -        // We can use the search provider's page.
 -        return NewTabURLDetails(search_provider_url, state);
 -      case NEW_TAB_URL_INCOGNITO:
 -        // Incognito has its own New Tab.
 -        return NewTabURLDetails(GURL(), state);
 -      default:
 -        // Use the local New Tab otherwise.
 -        return NewTabURLDetails(local_url, state);
 -    }
 +    return NewTabURLDetails(local_url, state);
   }
   GURL url;
 --- ./chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
 +++ ./chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc.new
@@ -90,14 +90,9 @@
   SigninManagerBase* signin = SigninManagerFactory::GetForProfile(
       Profile::FromWebUI(web_ui()));
 -  // Hide the sync status section if sync is managed or disabled entirely.
 -  if (!sync_service_ ||
 -      sync_service_->IsManaged() ||
 -      !signin ||
 -      !signin->IsSigninAllowed()) {
 -    HideSyncStatusSection();
 -    return;
 -  }
 +  // Hide the sync status section
 +  HideSyncStatusSection();
 +  return;
   // Don't show sync status if setup is not complete.
   if (!sync_service_->HasSyncSetupCompleted()) {
--- a/packages/net-www/inox/inox-49.0.2623.111.exheres-0
+++ b/packages/net-www/inox/inox-49.0.2623.111.exheres-0
@ -2,7 +2,7 @@
 # Copyright 2009 Heiko Przybyl <zuxez@cs.tu-berlin.de>
 # Distributed under the terms of the GNU General Public License v2
-require inox
+require inox [ patchset="49.0.2623.110" ]
 DESCRIPTION+="
 Chromium has three release channels: Stable, Beta, and Dev. This package corresponds to the Stable
@ -19,8 +19,6 @@ RESTRICT=test
 WIDEVINE_VERSION=1.4.8.824
 src_prepare() {
    expatch "${FILES}"/inox
    inox_src_prepare
    edo sed \