From c3c9fc5be24de6a568459b031043324d01c548ea Mon Sep 17 00:00:00 2001 From: Eloston Date: Sat, 31 Dec 2016 18:30:01 -0800 Subject: [PATCH] New resources directory layout Now contains directories configs, patches, and packaging for increased sharing flexibility --- resources/{ => configs}/archlinux/gn_flags | 0 resources/configs/archlinux/metadata.ini | 4 ++ resources/{ => configs}/common/cleaning_list | 0 .../{ => configs}/common/domain_regex_list | 0 .../common/domain_substitution_list | 0 resources/{ => configs}/common/gn_flags | 0 resources/configs/common/metadata.ini | 2 + .../patches => configs/common}/patch_order | 0 .../{ => configs}/common_debian/gn_flags | 0 resources/configs/common_debian/metadata.ini | 3 ++ .../common_debian}/patch_order | 0 resources/configs/debian_stretch/metadata.ini | 4 ++ .../{ => configs}/linux_dynamic/cleaning_list | 0 .../{ => configs}/linux_dynamic/gn_flags | 0 resources/configs/linux_dynamic/metadata.ini | 4 ++ .../linux_dynamic}/patch_order | 0 resources/{ => configs}/linux_static/gn_flags | 0 resources/configs/linux_static/metadata.ini | 4 ++ .../linux_static/template_readme | 0 resources/{ => configs}/macos/extra_deps.ini | 0 resources/{ => configs}/macos/gn_flags | 0 resources/configs/macos/metadata.ini | 4 ++ .../patches => configs/macos}/patch_order | 0 .../{ => configs}/windows/extra_deps.ini | 0 resources/{ => configs}/windows/gn_flags | 0 resources/configs/windows/metadata.ini | 4 ++ .../patches => configs/windows}/patch_order | 0 resources/linux_dynamic/scripts/unbundle | 47 ------------------- .../debian}/changelog.in | 0 .../debian}/chrome-sandbox.install.in | 0 .../debian}/chrome-sandbox.lintian-overrides | 0 .../debian}/chromedriver.install.in | 0 .../debian}/chromium-l10n.install.in | 0 .../debian}/chromium.desktop | 0 .../debian}/chromium.dirs | 0 .../debian}/chromium.install.in | 0 .../debian}/chromium.links | 0 .../debian}/chromium.lintian-overrides | 0 .../debian}/chromium.manpages.in | 0 .../debian}/chromium.postinst | 0 .../debian}/chromium.prerm | 0 .../debian}/chromium.xml | 0 .../dpkg_dir => packaging/debian}/clean | 0 .../dpkg_dir => packaging/debian}/compat | 0 .../dpkg_dir => packaging/debian}/control | 0 .../debian}/default-flags | 0 .../debian}/master_preferences | 0 .../dpkg_dir => packaging/debian}/presubj | 0 .../dpkg_dir => packaging/debian}/rules.in | 0 .../debian}/scripts/chromium | 0 .../debian}/source/format | 0 .../debian}/source/lintian-overrides | 0 .../common_debian/arm64-gcc-toolchain.patch | 0 .../patches/common_debian/arm64-gn.patch | 0 .../patches/debian/build-flags.patch | 0 .../disable/default-browser-warning.patch | 0 .../debian/disable/extension-updater.patch | 0 .../debian/disable/external-components.patch | 0 .../debian/disable/google-api-warning.patch | 0 .../patches/debian/disable/pings.patch | 0 .../patches/debian/disable/promo.patch | 0 .../patches/debian/glibc2.24.patch | 0 .../{common => }/patches/debian/gn.patch | 0 .../patches/debian/gpu-timeout.patch | 0 .../patches/debian/ps-print.patch | 0 .../add-duckduckgo-search-engine.patch | 0 .../inox-patchset/chromium-icu58.patch | 0 .../inox-patchset/chromium-sandbox-pie.patch | 0 .../inox-patchset/chromium-widevine.patch | 0 .../disable-autofill-download-manager.patch | 0 .../disable-battery-status-service.patch | 0 .../disable-default-extensions.patch | 0 .../disable-first-run-behaviour.patch | 0 .../disable-gcm-status-check.patch | 0 .../disable-google-ipv6-probes.patch | 0 .../disable-google-url-tracker.patch | 0 .../disable-missing-key-warning.patch | 0 .../disable-new-avatar-menu.patch | 0 .../disable-translation-lang-fetch.patch | 0 .../inox-patchset/disable-update-pings.patch | 0 .../disable-web-resource-service.patch | 0 .../fix-building-without-safebrowsing.patch | 0 .../inox-patchset/modify-default-prefs.patch | 0 .../inox-patchset/restore-classic-ntp.patch | 0 .../Remove-EV-certificates.patch | 0 ...refixes-to-possibly-evil-connections.patch | 0 ...ble-profile-auto-import-on-first-run.patch | 0 ...ord-disable-at-build-time-by-default.patch | 0 ...rce-text-x-suse-ymp-to-be-downloaded.patch | 0 ...me-and-help-identify-URLs-being-retr.patch | 0 ...e-default-key-length-for-newly-gener.patch | 0 ...mpt-for-download-directory-by-defaul.patch | 0 ...fs-do-not-store-passwords-by-default.patch | 0 .../prefs-only-keep-cookies-until-exit.patch | 0 ...mo-disable-Google-promotion-fetching.patch | 0 ..._browsing-disable-incident-reporting.patch | 0 ...sable-reporting-of-safebrowsing-over.patch | 0 .../safe_browsing-support-trk-prefix.patch | 0 .../updater-disable-auto-update.patch | 0 .../linux_dynamic/chromedriver-revision.patch | 0 .../patches/linux_dynamic/gtk3theme.patch | 0 .../patches/linux_dynamic/manpage.patch | 0 .../linux_dynamic/master-preferences.patch | 0 .../patches/linux_dynamic/system/event.patch | 0 .../patches/linux_dynamic/system/ffmpeg.patch | 0 .../patches/linux_dynamic/system/icu.patch | 0 .../patches/linux_dynamic/system/nspr.patch | 0 .../patches/linux_dynamic/system/vpx.patch | 0 .../change-trace-infobar-message.patch | 0 .../clear-http-auth-cache-menu-item.patch | 0 .../disable-crash-reporter.patch | 0 .../disable-domain-reliability.patch | 0 .../disable-download-quarantine.patch | 0 .../disable-formatting-in-omnibox.patch | 0 .../ungoogled-chromium/disable-gaia.patch | 0 .../ungoogled-chromium/disable-gcm.patch | 0 .../disable-google-host-detection.patch | 0 .../disable-intranet-redirect-detector.patch | 0 .../disable-ipv6-pinging.patch | 0 .../disable-logging-urls-to-stderr.patch | 0 .../disable-profile-avatar-downloading.patch | 0 .../ungoogled-chromium/disable-signin.patch | 0 .../disable-translate.patch | 0 ...disable-unload-javascript-dialog-box.patch | 0 .../disable-untraceable-urls.patch | 0 .../enable-page-saving-on-more-pages.patch | 0 ...ix-building-without-one-click-signin.patch | 0 .../gn-modify-hardcoded-settings.patch | 0 .../intercept-all-modified-domains.patch | 0 .../ungoogled-chromium/popups-to-tabs.patch | 0 .../prevent-trace-url-requests.patch | 0 ...e-disable-setuid-sandbox-as-bad-flag.patch | 0 .../remove-get-help-button.patch | 0 ...e-google-search-engine-with-nosearch.patch | 0 .../add-trknotify-gn-dependency.patch | 0 .../disable-symbol-order-verification.patch | 0 .../ungoogled-macos/fix-widevine-macos.patch | 0 .../windows-disable-reorder-fix-linking.patch | 0 .../windows-fix-gn-bootstrap.patch | 0 ...ix-missing-include-es_parser_adts-cc.patch | 0 .../windows-use-system-binaries.patch | 0 141 files changed, 29 insertions(+), 47 deletions(-) rename resources/{ => configs}/archlinux/gn_flags (100%) create mode 100644 resources/configs/archlinux/metadata.ini rename resources/{ => configs}/common/cleaning_list (100%) rename resources/{ => configs}/common/domain_regex_list (100%) rename resources/{ => configs}/common/domain_substitution_list (100%) rename resources/{ => configs}/common/gn_flags (100%) create mode 100644 resources/configs/common/metadata.ini rename resources/{common/patches => configs/common}/patch_order (100%) rename resources/{ => configs}/common_debian/gn_flags (100%) create mode 100644 resources/configs/common_debian/metadata.ini rename resources/{common_debian/patches => configs/common_debian}/patch_order (100%) create mode 100644 resources/configs/debian_stretch/metadata.ini rename resources/{ => configs}/linux_dynamic/cleaning_list (100%) rename resources/{ => configs}/linux_dynamic/gn_flags (100%) create mode 100644 resources/configs/linux_dynamic/metadata.ini rename resources/{linux_dynamic/patches => configs/linux_dynamic}/patch_order (100%) rename resources/{ => configs}/linux_static/gn_flags (100%) create mode 100644 resources/configs/linux_static/metadata.ini rename resources/{ => configs}/linux_static/template_readme (100%) rename resources/{ => configs}/macos/extra_deps.ini (100%) rename resources/{ => configs}/macos/gn_flags (100%) create mode 100644 resources/configs/macos/metadata.ini rename resources/{macos/patches => configs/macos}/patch_order (100%) rename resources/{ => configs}/windows/extra_deps.ini (100%) rename resources/{ => configs}/windows/gn_flags (100%) create mode 100644 resources/configs/windows/metadata.ini rename resources/{windows/patches => configs/windows}/patch_order (100%) delete mode 100755 resources/linux_dynamic/scripts/unbundle rename resources/{common_debian/dpkg_dir => packaging/debian}/changelog.in (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chrome-sandbox.install.in (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chrome-sandbox.lintian-overrides (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromedriver.install.in (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium-l10n.install.in (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.desktop (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.dirs (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.install.in (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.links (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.lintian-overrides (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.manpages.in (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.postinst (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.prerm (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/chromium.xml (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/clean (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/compat (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/control (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/default-flags (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/master_preferences (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/presubj (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/rules.in (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/scripts/chromium (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/source/format (100%) rename resources/{common_debian/dpkg_dir => packaging/debian}/source/lintian-overrides (100%) rename resources/{common_debian => }/patches/common_debian/arm64-gcc-toolchain.patch (100%) rename resources/{common_debian => }/patches/common_debian/arm64-gn.patch (100%) rename resources/{common => }/patches/debian/build-flags.patch (100%) rename resources/{common => }/patches/debian/disable/default-browser-warning.patch (100%) rename resources/{common => }/patches/debian/disable/extension-updater.patch (100%) rename resources/{common => }/patches/debian/disable/external-components.patch (100%) rename resources/{common => }/patches/debian/disable/google-api-warning.patch (100%) rename resources/{common => }/patches/debian/disable/pings.patch (100%) rename resources/{common => }/patches/debian/disable/promo.patch (100%) rename resources/{common => }/patches/debian/glibc2.24.patch (100%) rename resources/{common => }/patches/debian/gn.patch (100%) rename resources/{common => }/patches/debian/gpu-timeout.patch (100%) rename resources/{common => }/patches/debian/ps-print.patch (100%) rename resources/{common => }/patches/inox-patchset/add-duckduckgo-search-engine.patch (100%) rename resources/{common => }/patches/inox-patchset/chromium-icu58.patch (100%) rename resources/{common => }/patches/inox-patchset/chromium-sandbox-pie.patch (100%) rename resources/{common => }/patches/inox-patchset/chromium-widevine.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-autofill-download-manager.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-battery-status-service.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-default-extensions.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-first-run-behaviour.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-gcm-status-check.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-google-ipv6-probes.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-google-url-tracker.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-missing-key-warning.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-new-avatar-menu.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-translation-lang-fetch.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-update-pings.patch (100%) rename resources/{common => }/patches/inox-patchset/disable-web-resource-service.patch (100%) rename resources/{common => }/patches/inox-patchset/fix-building-without-safebrowsing.patch (100%) rename resources/{common => }/patches/inox-patchset/modify-default-prefs.patch (100%) rename resources/{common => }/patches/inox-patchset/restore-classic-ntp.patch (100%) rename resources/{common => }/patches/iridium-browser/Remove-EV-certificates.patch (100%) rename resources/{common => }/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch (100%) rename resources/{common => }/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch (100%) rename resources/{common => }/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch (100%) rename resources/{common => }/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch (100%) rename resources/{common => }/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch (100%) rename resources/{common => }/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch (100%) rename resources/{common => }/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch (100%) rename resources/{common => }/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch (100%) rename resources/{common => }/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch (100%) rename resources/{common => }/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch (100%) rename resources/{common => }/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch (100%) rename resources/{common => }/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch (100%) rename resources/{common => }/patches/iridium-browser/safe_browsing-support-trk-prefix.patch (100%) rename resources/{common => }/patches/iridium-browser/updater-disable-auto-update.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/chromedriver-revision.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/gtk3theme.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/manpage.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/master-preferences.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/system/event.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/system/ffmpeg.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/system/icu.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/system/nspr.patch (100%) rename resources/{linux_dynamic => }/patches/linux_dynamic/system/vpx.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/change-trace-infobar-message.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-crash-reporter.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-domain-reliability.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-download-quarantine.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-formatting-in-omnibox.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-gaia.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-gcm.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-google-host-detection.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-intranet-redirect-detector.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-ipv6-pinging.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-profile-avatar-downloading.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-signin.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-translate.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-unload-javascript-dialog-box.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/disable-untraceable-urls.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/enable-page-saving-on-more-pages.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/gn-modify-hardcoded-settings.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/intercept-all-modified-domains.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/popups-to-tabs.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/prevent-trace-url-requests.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/remove-get-help-button.patch (100%) rename resources/{common => }/patches/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch (100%) rename resources/{macos => }/patches/ungoogled-macos/add-trknotify-gn-dependency.patch (100%) rename resources/{macos => }/patches/ungoogled-macos/disable-symbol-order-verification.patch (100%) rename resources/{macos => }/patches/ungoogled-macos/fix-widevine-macos.patch (100%) rename resources/{windows => }/patches/ungoogled-windows/windows-disable-reorder-fix-linking.patch (100%) rename resources/{windows => }/patches/ungoogled-windows/windows-fix-gn-bootstrap.patch (100%) rename resources/{windows => }/patches/ungoogled-windows/windows-fix-missing-include-es_parser_adts-cc.patch (100%) rename resources/{windows => }/patches/ungoogled-windows/windows-use-system-binaries.patch (100%) diff --git a/resources/archlinux/gn_flags b/resources/configs/archlinux/gn_flags similarity index 100% rename from resources/archlinux/gn_flags rename to resources/configs/archlinux/gn_flags diff --git a/resources/configs/archlinux/metadata.ini b/resources/configs/archlinux/metadata.ini new file mode 100644 index 00000000..727b058f --- /dev/null +++ b/resources/configs/archlinux/metadata.ini @@ -0,0 +1,4 @@ +[config] +name = Arch Linux +inherit = linux_dynamic +visible = true diff --git a/resources/common/cleaning_list b/resources/configs/common/cleaning_list similarity index 100% rename from resources/common/cleaning_list rename to resources/configs/common/cleaning_list diff --git a/resources/common/domain_regex_list b/resources/configs/common/domain_regex_list similarity index 100% rename from resources/common/domain_regex_list rename to resources/configs/common/domain_regex_list diff --git a/resources/common/domain_substitution_list b/resources/configs/common/domain_substitution_list similarity index 100% rename from resources/common/domain_substitution_list rename to resources/configs/common/domain_substitution_list diff --git a/resources/common/gn_flags b/resources/configs/common/gn_flags similarity index 100% rename from resources/common/gn_flags rename to resources/configs/common/gn_flags diff --git a/resources/configs/common/metadata.ini b/resources/configs/common/metadata.ini new file mode 100644 index 00000000..68571552 --- /dev/null +++ b/resources/configs/common/metadata.ini @@ -0,0 +1,2 @@ +[config] +name = Common diff --git a/resources/common/patches/patch_order b/resources/configs/common/patch_order similarity index 100% rename from resources/common/patches/patch_order rename to resources/configs/common/patch_order diff --git a/resources/common_debian/gn_flags b/resources/configs/common_debian/gn_flags similarity index 100% rename from resources/common_debian/gn_flags rename to resources/configs/common_debian/gn_flags diff --git a/resources/configs/common_debian/metadata.ini b/resources/configs/common_debian/metadata.ini new file mode 100644 index 00000000..aa6b5b87 --- /dev/null +++ b/resources/configs/common_debian/metadata.ini @@ -0,0 +1,3 @@ +[config] +name = Common Debian +inherit = linux_dynamic diff --git a/resources/common_debian/patches/patch_order b/resources/configs/common_debian/patch_order similarity index 100% rename from resources/common_debian/patches/patch_order rename to resources/configs/common_debian/patch_order diff --git a/resources/configs/debian_stretch/metadata.ini b/resources/configs/debian_stretch/metadata.ini new file mode 100644 index 00000000..355da19d --- /dev/null +++ b/resources/configs/debian_stretch/metadata.ini @@ -0,0 +1,4 @@ +[config] +name = Debian 9.0 (stretch) +inherit = common_debian +visible = true diff --git a/resources/linux_dynamic/cleaning_list b/resources/configs/linux_dynamic/cleaning_list similarity index 100% rename from resources/linux_dynamic/cleaning_list rename to resources/configs/linux_dynamic/cleaning_list diff --git a/resources/linux_dynamic/gn_flags b/resources/configs/linux_dynamic/gn_flags similarity index 100% rename from resources/linux_dynamic/gn_flags rename to resources/configs/linux_dynamic/gn_flags diff --git a/resources/configs/linux_dynamic/metadata.ini b/resources/configs/linux_dynamic/metadata.ini new file mode 100644 index 00000000..a0dbac3d --- /dev/null +++ b/resources/configs/linux_dynamic/metadata.ini @@ -0,0 +1,4 @@ +[config] +name = Linux Dynamic +inherit = common +visible = true diff --git a/resources/linux_dynamic/patches/patch_order b/resources/configs/linux_dynamic/patch_order similarity index 100% rename from resources/linux_dynamic/patches/patch_order rename to resources/configs/linux_dynamic/patch_order diff --git a/resources/linux_static/gn_flags b/resources/configs/linux_static/gn_flags similarity index 100% rename from resources/linux_static/gn_flags rename to resources/configs/linux_static/gn_flags diff --git a/resources/configs/linux_static/metadata.ini b/resources/configs/linux_static/metadata.ini new file mode 100644 index 00000000..747d0d4a --- /dev/null +++ b/resources/configs/linux_static/metadata.ini @@ -0,0 +1,4 @@ +[config] +name = Linux Static +inherit = common +visible = true diff --git a/resources/linux_static/template_readme b/resources/configs/linux_static/template_readme similarity index 100% rename from resources/linux_static/template_readme rename to resources/configs/linux_static/template_readme diff --git a/resources/macos/extra_deps.ini b/resources/configs/macos/extra_deps.ini similarity index 100% rename from resources/macos/extra_deps.ini rename to resources/configs/macos/extra_deps.ini diff --git a/resources/macos/gn_flags b/resources/configs/macos/gn_flags similarity index 100% rename from resources/macos/gn_flags rename to resources/configs/macos/gn_flags diff --git a/resources/configs/macos/metadata.ini b/resources/configs/macos/metadata.ini new file mode 100644 index 00000000..6911c91f --- /dev/null +++ b/resources/configs/macos/metadata.ini @@ -0,0 +1,4 @@ +[config] +name = macOS +inherit = common +visible = true diff --git a/resources/macos/patches/patch_order b/resources/configs/macos/patch_order similarity index 100% rename from resources/macos/patches/patch_order rename to resources/configs/macos/patch_order diff --git a/resources/windows/extra_deps.ini b/resources/configs/windows/extra_deps.ini similarity index 100% rename from resources/windows/extra_deps.ini rename to resources/configs/windows/extra_deps.ini diff --git a/resources/windows/gn_flags b/resources/configs/windows/gn_flags similarity index 100% rename from resources/windows/gn_flags rename to resources/configs/windows/gn_flags diff --git a/resources/configs/windows/metadata.ini b/resources/configs/windows/metadata.ini new file mode 100644 index 00000000..c772e28e --- /dev/null +++ b/resources/configs/windows/metadata.ini @@ -0,0 +1,4 @@ +[config] +name = Windows +inherit = common +visible = true diff --git a/resources/windows/patches/patch_order b/resources/configs/windows/patch_order similarity index 100% rename from resources/windows/patches/patch_order rename to resources/configs/windows/patch_order diff --git a/resources/linux_dynamic/scripts/unbundle b/resources/linux_dynamic/scripts/unbundle deleted file mode 100755 index fcf7a573..00000000 --- a/resources/linux_dynamic/scripts/unbundle +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/python3 - -import os -import sys -import shutil - -sys.path.append("build/linux/unbundle") - -import replace_gn_files - -def strip(path): - if os.path.exists(path): - for filename in os.listdir(path): - remove=True - for extension in ('.py','.gn','.gni','google','chromium'): - if filename.endswith(extension): - remove=False - if remove: - removal=os.path.join(path,filename) - print('removing: %s'%removal) - if os.path.isdir(removal): - shutil.rmtree(removal) - else: - os.remove(removal) - -keepers = () - -for lib,rule in replace_gn_files.REPLACEMENTS.items(): - if lib not in keepers: - # remove conflicting embedded third party source files - strip(os.path.dirname(rule)) - strip(os.path.join('third_party',lib)) - # remove the gn file that builds the embedded library - if os.path.lexists(rule): - os.remove(rule) - # create a symlink to the unbundle gn file - symlink = "ln -s " - path = os.path.split(rule) - while path[0] != '': - path = os.path.split(path[0]) - symlink += '../' - symlink += "build/linux/unbundle/%s.gn %s"%(lib,rule) - if os.system(symlink): - raise RuntimeError("error creating symlink",symlink) - -# libjpeg_turbo is unlike all the others, so clean it manually here -strip('third_party/libjpeg_turbo') diff --git a/resources/common_debian/dpkg_dir/changelog.in b/resources/packaging/debian/changelog.in similarity index 100% rename from resources/common_debian/dpkg_dir/changelog.in rename to resources/packaging/debian/changelog.in diff --git a/resources/common_debian/dpkg_dir/chrome-sandbox.install.in b/resources/packaging/debian/chrome-sandbox.install.in similarity index 100% rename from resources/common_debian/dpkg_dir/chrome-sandbox.install.in rename to resources/packaging/debian/chrome-sandbox.install.in diff --git a/resources/common_debian/dpkg_dir/chrome-sandbox.lintian-overrides b/resources/packaging/debian/chrome-sandbox.lintian-overrides similarity index 100% rename from resources/common_debian/dpkg_dir/chrome-sandbox.lintian-overrides rename to resources/packaging/debian/chrome-sandbox.lintian-overrides diff --git a/resources/common_debian/dpkg_dir/chromedriver.install.in b/resources/packaging/debian/chromedriver.install.in similarity index 100% rename from resources/common_debian/dpkg_dir/chromedriver.install.in rename to resources/packaging/debian/chromedriver.install.in diff --git a/resources/common_debian/dpkg_dir/chromium-l10n.install.in b/resources/packaging/debian/chromium-l10n.install.in similarity index 100% rename from resources/common_debian/dpkg_dir/chromium-l10n.install.in rename to resources/packaging/debian/chromium-l10n.install.in diff --git a/resources/common_debian/dpkg_dir/chromium.desktop b/resources/packaging/debian/chromium.desktop similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.desktop rename to resources/packaging/debian/chromium.desktop diff --git a/resources/common_debian/dpkg_dir/chromium.dirs b/resources/packaging/debian/chromium.dirs similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.dirs rename to resources/packaging/debian/chromium.dirs diff --git a/resources/common_debian/dpkg_dir/chromium.install.in b/resources/packaging/debian/chromium.install.in similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.install.in rename to resources/packaging/debian/chromium.install.in diff --git a/resources/common_debian/dpkg_dir/chromium.links b/resources/packaging/debian/chromium.links similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.links rename to resources/packaging/debian/chromium.links diff --git a/resources/common_debian/dpkg_dir/chromium.lintian-overrides b/resources/packaging/debian/chromium.lintian-overrides similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.lintian-overrides rename to resources/packaging/debian/chromium.lintian-overrides diff --git a/resources/common_debian/dpkg_dir/chromium.manpages.in b/resources/packaging/debian/chromium.manpages.in similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.manpages.in rename to resources/packaging/debian/chromium.manpages.in diff --git a/resources/common_debian/dpkg_dir/chromium.postinst b/resources/packaging/debian/chromium.postinst similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.postinst rename to resources/packaging/debian/chromium.postinst diff --git a/resources/common_debian/dpkg_dir/chromium.prerm b/resources/packaging/debian/chromium.prerm similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.prerm rename to resources/packaging/debian/chromium.prerm diff --git a/resources/common_debian/dpkg_dir/chromium.xml b/resources/packaging/debian/chromium.xml similarity index 100% rename from resources/common_debian/dpkg_dir/chromium.xml rename to resources/packaging/debian/chromium.xml diff --git a/resources/common_debian/dpkg_dir/clean b/resources/packaging/debian/clean similarity index 100% rename from resources/common_debian/dpkg_dir/clean rename to resources/packaging/debian/clean diff --git a/resources/common_debian/dpkg_dir/compat b/resources/packaging/debian/compat similarity index 100% rename from resources/common_debian/dpkg_dir/compat rename to resources/packaging/debian/compat diff --git a/resources/common_debian/dpkg_dir/control b/resources/packaging/debian/control similarity index 100% rename from resources/common_debian/dpkg_dir/control rename to resources/packaging/debian/control diff --git a/resources/common_debian/dpkg_dir/default-flags b/resources/packaging/debian/default-flags similarity index 100% rename from resources/common_debian/dpkg_dir/default-flags rename to resources/packaging/debian/default-flags diff --git a/resources/common_debian/dpkg_dir/master_preferences b/resources/packaging/debian/master_preferences similarity index 100% rename from resources/common_debian/dpkg_dir/master_preferences rename to resources/packaging/debian/master_preferences diff --git a/resources/common_debian/dpkg_dir/presubj b/resources/packaging/debian/presubj similarity index 100% rename from resources/common_debian/dpkg_dir/presubj rename to resources/packaging/debian/presubj diff --git a/resources/common_debian/dpkg_dir/rules.in b/resources/packaging/debian/rules.in similarity index 100% rename from resources/common_debian/dpkg_dir/rules.in rename to resources/packaging/debian/rules.in diff --git a/resources/common_debian/dpkg_dir/scripts/chromium b/resources/packaging/debian/scripts/chromium similarity index 100% rename from resources/common_debian/dpkg_dir/scripts/chromium rename to resources/packaging/debian/scripts/chromium diff --git a/resources/common_debian/dpkg_dir/source/format b/resources/packaging/debian/source/format similarity index 100% rename from resources/common_debian/dpkg_dir/source/format rename to resources/packaging/debian/source/format diff --git a/resources/common_debian/dpkg_dir/source/lintian-overrides b/resources/packaging/debian/source/lintian-overrides similarity index 100% rename from resources/common_debian/dpkg_dir/source/lintian-overrides rename to resources/packaging/debian/source/lintian-overrides diff --git a/resources/common_debian/patches/common_debian/arm64-gcc-toolchain.patch b/resources/patches/common_debian/arm64-gcc-toolchain.patch similarity index 100% rename from resources/common_debian/patches/common_debian/arm64-gcc-toolchain.patch rename to resources/patches/common_debian/arm64-gcc-toolchain.patch diff --git a/resources/common_debian/patches/common_debian/arm64-gn.patch b/resources/patches/common_debian/arm64-gn.patch similarity index 100% rename from resources/common_debian/patches/common_debian/arm64-gn.patch rename to resources/patches/common_debian/arm64-gn.patch diff --git a/resources/common/patches/debian/build-flags.patch b/resources/patches/debian/build-flags.patch similarity index 100% rename from resources/common/patches/debian/build-flags.patch rename to resources/patches/debian/build-flags.patch diff --git a/resources/common/patches/debian/disable/default-browser-warning.patch b/resources/patches/debian/disable/default-browser-warning.patch similarity index 100% rename from resources/common/patches/debian/disable/default-browser-warning.patch rename to resources/patches/debian/disable/default-browser-warning.patch diff --git a/resources/common/patches/debian/disable/extension-updater.patch b/resources/patches/debian/disable/extension-updater.patch similarity index 100% rename from resources/common/patches/debian/disable/extension-updater.patch rename to resources/patches/debian/disable/extension-updater.patch diff --git a/resources/common/patches/debian/disable/external-components.patch b/resources/patches/debian/disable/external-components.patch similarity index 100% rename from resources/common/patches/debian/disable/external-components.patch rename to resources/patches/debian/disable/external-components.patch diff --git a/resources/common/patches/debian/disable/google-api-warning.patch b/resources/patches/debian/disable/google-api-warning.patch similarity index 100% rename from resources/common/patches/debian/disable/google-api-warning.patch rename to resources/patches/debian/disable/google-api-warning.patch diff --git a/resources/common/patches/debian/disable/pings.patch b/resources/patches/debian/disable/pings.patch similarity index 100% rename from resources/common/patches/debian/disable/pings.patch rename to resources/patches/debian/disable/pings.patch diff --git a/resources/common/patches/debian/disable/promo.patch b/resources/patches/debian/disable/promo.patch similarity index 100% rename from resources/common/patches/debian/disable/promo.patch rename to resources/patches/debian/disable/promo.patch diff --git a/resources/common/patches/debian/glibc2.24.patch b/resources/patches/debian/glibc2.24.patch similarity index 100% rename from resources/common/patches/debian/glibc2.24.patch rename to resources/patches/debian/glibc2.24.patch diff --git a/resources/common/patches/debian/gn.patch b/resources/patches/debian/gn.patch similarity index 100% rename from resources/common/patches/debian/gn.patch rename to resources/patches/debian/gn.patch diff --git a/resources/common/patches/debian/gpu-timeout.patch b/resources/patches/debian/gpu-timeout.patch similarity index 100% rename from resources/common/patches/debian/gpu-timeout.patch rename to resources/patches/debian/gpu-timeout.patch diff --git a/resources/common/patches/debian/ps-print.patch b/resources/patches/debian/ps-print.patch similarity index 100% rename from resources/common/patches/debian/ps-print.patch rename to resources/patches/debian/ps-print.patch diff --git a/resources/common/patches/inox-patchset/add-duckduckgo-search-engine.patch b/resources/patches/inox-patchset/add-duckduckgo-search-engine.patch similarity index 100% rename from resources/common/patches/inox-patchset/add-duckduckgo-search-engine.patch rename to resources/patches/inox-patchset/add-duckduckgo-search-engine.patch diff --git a/resources/common/patches/inox-patchset/chromium-icu58.patch b/resources/patches/inox-patchset/chromium-icu58.patch similarity index 100% rename from resources/common/patches/inox-patchset/chromium-icu58.patch rename to resources/patches/inox-patchset/chromium-icu58.patch diff --git a/resources/common/patches/inox-patchset/chromium-sandbox-pie.patch b/resources/patches/inox-patchset/chromium-sandbox-pie.patch similarity index 100% rename from resources/common/patches/inox-patchset/chromium-sandbox-pie.patch rename to resources/patches/inox-patchset/chromium-sandbox-pie.patch diff --git a/resources/common/patches/inox-patchset/chromium-widevine.patch b/resources/patches/inox-patchset/chromium-widevine.patch similarity index 100% rename from resources/common/patches/inox-patchset/chromium-widevine.patch rename to resources/patches/inox-patchset/chromium-widevine.patch diff --git a/resources/common/patches/inox-patchset/disable-autofill-download-manager.patch b/resources/patches/inox-patchset/disable-autofill-download-manager.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-autofill-download-manager.patch rename to resources/patches/inox-patchset/disable-autofill-download-manager.patch diff --git a/resources/common/patches/inox-patchset/disable-battery-status-service.patch b/resources/patches/inox-patchset/disable-battery-status-service.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-battery-status-service.patch rename to resources/patches/inox-patchset/disable-battery-status-service.patch diff --git a/resources/common/patches/inox-patchset/disable-default-extensions.patch b/resources/patches/inox-patchset/disable-default-extensions.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-default-extensions.patch rename to resources/patches/inox-patchset/disable-default-extensions.patch diff --git a/resources/common/patches/inox-patchset/disable-first-run-behaviour.patch b/resources/patches/inox-patchset/disable-first-run-behaviour.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-first-run-behaviour.patch rename to resources/patches/inox-patchset/disable-first-run-behaviour.patch diff --git a/resources/common/patches/inox-patchset/disable-gcm-status-check.patch b/resources/patches/inox-patchset/disable-gcm-status-check.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-gcm-status-check.patch rename to resources/patches/inox-patchset/disable-gcm-status-check.patch diff --git a/resources/common/patches/inox-patchset/disable-google-ipv6-probes.patch b/resources/patches/inox-patchset/disable-google-ipv6-probes.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-google-ipv6-probes.patch rename to resources/patches/inox-patchset/disable-google-ipv6-probes.patch diff --git a/resources/common/patches/inox-patchset/disable-google-url-tracker.patch b/resources/patches/inox-patchset/disable-google-url-tracker.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-google-url-tracker.patch rename to resources/patches/inox-patchset/disable-google-url-tracker.patch diff --git a/resources/common/patches/inox-patchset/disable-missing-key-warning.patch b/resources/patches/inox-patchset/disable-missing-key-warning.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-missing-key-warning.patch rename to resources/patches/inox-patchset/disable-missing-key-warning.patch diff --git a/resources/common/patches/inox-patchset/disable-new-avatar-menu.patch b/resources/patches/inox-patchset/disable-new-avatar-menu.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-new-avatar-menu.patch rename to resources/patches/inox-patchset/disable-new-avatar-menu.patch diff --git a/resources/common/patches/inox-patchset/disable-translation-lang-fetch.patch b/resources/patches/inox-patchset/disable-translation-lang-fetch.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-translation-lang-fetch.patch rename to resources/patches/inox-patchset/disable-translation-lang-fetch.patch diff --git a/resources/common/patches/inox-patchset/disable-update-pings.patch b/resources/patches/inox-patchset/disable-update-pings.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-update-pings.patch rename to resources/patches/inox-patchset/disable-update-pings.patch diff --git a/resources/common/patches/inox-patchset/disable-web-resource-service.patch b/resources/patches/inox-patchset/disable-web-resource-service.patch similarity index 100% rename from resources/common/patches/inox-patchset/disable-web-resource-service.patch rename to resources/patches/inox-patchset/disable-web-resource-service.patch diff --git a/resources/common/patches/inox-patchset/fix-building-without-safebrowsing.patch b/resources/patches/inox-patchset/fix-building-without-safebrowsing.patch similarity index 100% rename from resources/common/patches/inox-patchset/fix-building-without-safebrowsing.patch rename to resources/patches/inox-patchset/fix-building-without-safebrowsing.patch diff --git a/resources/common/patches/inox-patchset/modify-default-prefs.patch b/resources/patches/inox-patchset/modify-default-prefs.patch similarity index 100% rename from resources/common/patches/inox-patchset/modify-default-prefs.patch rename to resources/patches/inox-patchset/modify-default-prefs.patch diff --git a/resources/common/patches/inox-patchset/restore-classic-ntp.patch b/resources/patches/inox-patchset/restore-classic-ntp.patch similarity index 100% rename from resources/common/patches/inox-patchset/restore-classic-ntp.patch rename to resources/patches/inox-patchset/restore-classic-ntp.patch diff --git a/resources/common/patches/iridium-browser/Remove-EV-certificates.patch b/resources/patches/iridium-browser/Remove-EV-certificates.patch similarity index 100% rename from resources/common/patches/iridium-browser/Remove-EV-certificates.patch rename to resources/patches/iridium-browser/Remove-EV-certificates.patch diff --git a/resources/common/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/resources/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch similarity index 100% rename from resources/common/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch rename to resources/patches/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch diff --git a/resources/common/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch b/resources/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch similarity index 100% rename from resources/common/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch rename to resources/patches/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch diff --git a/resources/common/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch b/resources/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch similarity index 100% rename from resources/common/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch rename to resources/patches/iridium-browser/hotword-disable-at-build-time-by-default.patch diff --git a/resources/common/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch b/resources/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch similarity index 100% rename from resources/common/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch rename to resources/patches/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch diff --git a/resources/common/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch b/resources/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch similarity index 100% rename from resources/common/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch rename to resources/patches/iridium-browser/net-add-trk-scheme-and-help-identify-URLs-being-retr.patch diff --git a/resources/common/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch b/resources/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch similarity index 100% rename from resources/common/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch rename to resources/patches/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch diff --git a/resources/common/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch b/resources/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch similarity index 100% rename from resources/common/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch rename to resources/patches/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch diff --git a/resources/common/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch b/resources/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch similarity index 100% rename from resources/common/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch rename to resources/patches/iridium-browser/prefs-do-not-store-passwords-by-default.patch diff --git a/resources/common/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch b/resources/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch similarity index 100% rename from resources/common/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch rename to resources/patches/iridium-browser/prefs-only-keep-cookies-until-exit.patch diff --git a/resources/common/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch b/resources/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch similarity index 100% rename from resources/common/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch rename to resources/patches/iridium-browser/promo-disable-Google-promotion-fetching.patch diff --git a/resources/common/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch b/resources/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch similarity index 100% rename from resources/common/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch rename to resources/patches/iridium-browser/safe_browsing-disable-incident-reporting.patch diff --git a/resources/common/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/resources/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch similarity index 100% rename from resources/common/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch rename to resources/patches/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch diff --git a/resources/common/patches/iridium-browser/safe_browsing-support-trk-prefix.patch b/resources/patches/iridium-browser/safe_browsing-support-trk-prefix.patch similarity index 100% rename from resources/common/patches/iridium-browser/safe_browsing-support-trk-prefix.patch rename to resources/patches/iridium-browser/safe_browsing-support-trk-prefix.patch diff --git a/resources/common/patches/iridium-browser/updater-disable-auto-update.patch b/resources/patches/iridium-browser/updater-disable-auto-update.patch similarity index 100% rename from resources/common/patches/iridium-browser/updater-disable-auto-update.patch rename to resources/patches/iridium-browser/updater-disable-auto-update.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/chromedriver-revision.patch b/resources/patches/linux_dynamic/chromedriver-revision.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/chromedriver-revision.patch rename to resources/patches/linux_dynamic/chromedriver-revision.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/gtk3theme.patch b/resources/patches/linux_dynamic/gtk3theme.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/gtk3theme.patch rename to resources/patches/linux_dynamic/gtk3theme.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/manpage.patch b/resources/patches/linux_dynamic/manpage.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/manpage.patch rename to resources/patches/linux_dynamic/manpage.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/master-preferences.patch b/resources/patches/linux_dynamic/master-preferences.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/master-preferences.patch rename to resources/patches/linux_dynamic/master-preferences.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/system/event.patch b/resources/patches/linux_dynamic/system/event.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/system/event.patch rename to resources/patches/linux_dynamic/system/event.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/system/ffmpeg.patch b/resources/patches/linux_dynamic/system/ffmpeg.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/system/ffmpeg.patch rename to resources/patches/linux_dynamic/system/ffmpeg.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/system/icu.patch b/resources/patches/linux_dynamic/system/icu.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/system/icu.patch rename to resources/patches/linux_dynamic/system/icu.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/system/nspr.patch b/resources/patches/linux_dynamic/system/nspr.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/system/nspr.patch rename to resources/patches/linux_dynamic/system/nspr.patch diff --git a/resources/linux_dynamic/patches/linux_dynamic/system/vpx.patch b/resources/patches/linux_dynamic/system/vpx.patch similarity index 100% rename from resources/linux_dynamic/patches/linux_dynamic/system/vpx.patch rename to resources/patches/linux_dynamic/system/vpx.patch diff --git a/resources/common/patches/ungoogled-chromium/change-trace-infobar-message.patch b/resources/patches/ungoogled-chromium/change-trace-infobar-message.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/change-trace-infobar-message.patch rename to resources/patches/ungoogled-chromium/change-trace-infobar-message.patch diff --git a/resources/common/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch b/resources/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch rename to resources/patches/ungoogled-chromium/clear-http-auth-cache-menu-item.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-crash-reporter.patch b/resources/patches/ungoogled-chromium/disable-crash-reporter.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-crash-reporter.patch rename to resources/patches/ungoogled-chromium/disable-crash-reporter.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-domain-reliability.patch b/resources/patches/ungoogled-chromium/disable-domain-reliability.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-domain-reliability.patch rename to resources/patches/ungoogled-chromium/disable-domain-reliability.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-download-quarantine.patch b/resources/patches/ungoogled-chromium/disable-download-quarantine.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-download-quarantine.patch rename to resources/patches/ungoogled-chromium/disable-download-quarantine.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-formatting-in-omnibox.patch b/resources/patches/ungoogled-chromium/disable-formatting-in-omnibox.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-formatting-in-omnibox.patch rename to resources/patches/ungoogled-chromium/disable-formatting-in-omnibox.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-gaia.patch b/resources/patches/ungoogled-chromium/disable-gaia.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-gaia.patch rename to resources/patches/ungoogled-chromium/disable-gaia.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-gcm.patch b/resources/patches/ungoogled-chromium/disable-gcm.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-gcm.patch rename to resources/patches/ungoogled-chromium/disable-gcm.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-google-host-detection.patch b/resources/patches/ungoogled-chromium/disable-google-host-detection.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-google-host-detection.patch rename to resources/patches/ungoogled-chromium/disable-google-host-detection.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-intranet-redirect-detector.patch b/resources/patches/ungoogled-chromium/disable-intranet-redirect-detector.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-intranet-redirect-detector.patch rename to resources/patches/ungoogled-chromium/disable-intranet-redirect-detector.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-ipv6-pinging.patch b/resources/patches/ungoogled-chromium/disable-ipv6-pinging.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-ipv6-pinging.patch rename to resources/patches/ungoogled-chromium/disable-ipv6-pinging.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch b/resources/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch rename to resources/patches/ungoogled-chromium/disable-logging-urls-to-stderr.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-profile-avatar-downloading.patch b/resources/patches/ungoogled-chromium/disable-profile-avatar-downloading.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-profile-avatar-downloading.patch rename to resources/patches/ungoogled-chromium/disable-profile-avatar-downloading.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-signin.patch b/resources/patches/ungoogled-chromium/disable-signin.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-signin.patch rename to resources/patches/ungoogled-chromium/disable-signin.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-translate.patch b/resources/patches/ungoogled-chromium/disable-translate.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-translate.patch rename to resources/patches/ungoogled-chromium/disable-translate.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-unload-javascript-dialog-box.patch b/resources/patches/ungoogled-chromium/disable-unload-javascript-dialog-box.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-unload-javascript-dialog-box.patch rename to resources/patches/ungoogled-chromium/disable-unload-javascript-dialog-box.patch diff --git a/resources/common/patches/ungoogled-chromium/disable-untraceable-urls.patch b/resources/patches/ungoogled-chromium/disable-untraceable-urls.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/disable-untraceable-urls.patch rename to resources/patches/ungoogled-chromium/disable-untraceable-urls.patch diff --git a/resources/common/patches/ungoogled-chromium/enable-page-saving-on-more-pages.patch b/resources/patches/ungoogled-chromium/enable-page-saving-on-more-pages.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/enable-page-saving-on-more-pages.patch rename to resources/patches/ungoogled-chromium/enable-page-saving-on-more-pages.patch diff --git a/resources/common/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch b/resources/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch rename to resources/patches/ungoogled-chromium/fix-building-without-one-click-signin.patch diff --git a/resources/common/patches/ungoogled-chromium/gn-modify-hardcoded-settings.patch b/resources/patches/ungoogled-chromium/gn-modify-hardcoded-settings.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/gn-modify-hardcoded-settings.patch rename to resources/patches/ungoogled-chromium/gn-modify-hardcoded-settings.patch diff --git a/resources/common/patches/ungoogled-chromium/intercept-all-modified-domains.patch b/resources/patches/ungoogled-chromium/intercept-all-modified-domains.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/intercept-all-modified-domains.patch rename to resources/patches/ungoogled-chromium/intercept-all-modified-domains.patch diff --git a/resources/common/patches/ungoogled-chromium/popups-to-tabs.patch b/resources/patches/ungoogled-chromium/popups-to-tabs.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/popups-to-tabs.patch rename to resources/patches/ungoogled-chromium/popups-to-tabs.patch diff --git a/resources/common/patches/ungoogled-chromium/prevent-trace-url-requests.patch b/resources/patches/ungoogled-chromium/prevent-trace-url-requests.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/prevent-trace-url-requests.patch rename to resources/patches/ungoogled-chromium/prevent-trace-url-requests.patch diff --git a/resources/common/patches/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch b/resources/patches/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch rename to resources/patches/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch diff --git a/resources/common/patches/ungoogled-chromium/remove-get-help-button.patch b/resources/patches/ungoogled-chromium/remove-get-help-button.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/remove-get-help-button.patch rename to resources/patches/ungoogled-chromium/remove-get-help-button.patch diff --git a/resources/common/patches/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch b/resources/patches/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch similarity index 100% rename from resources/common/patches/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch rename to resources/patches/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch diff --git a/resources/macos/patches/ungoogled-macos/add-trknotify-gn-dependency.patch b/resources/patches/ungoogled-macos/add-trknotify-gn-dependency.patch similarity index 100% rename from resources/macos/patches/ungoogled-macos/add-trknotify-gn-dependency.patch rename to resources/patches/ungoogled-macos/add-trknotify-gn-dependency.patch diff --git a/resources/macos/patches/ungoogled-macos/disable-symbol-order-verification.patch b/resources/patches/ungoogled-macos/disable-symbol-order-verification.patch similarity index 100% rename from resources/macos/patches/ungoogled-macos/disable-symbol-order-verification.patch rename to resources/patches/ungoogled-macos/disable-symbol-order-verification.patch diff --git a/resources/macos/patches/ungoogled-macos/fix-widevine-macos.patch b/resources/patches/ungoogled-macos/fix-widevine-macos.patch similarity index 100% rename from resources/macos/patches/ungoogled-macos/fix-widevine-macos.patch rename to resources/patches/ungoogled-macos/fix-widevine-macos.patch diff --git a/resources/windows/patches/ungoogled-windows/windows-disable-reorder-fix-linking.patch b/resources/patches/ungoogled-windows/windows-disable-reorder-fix-linking.patch similarity index 100% rename from resources/windows/patches/ungoogled-windows/windows-disable-reorder-fix-linking.patch rename to resources/patches/ungoogled-windows/windows-disable-reorder-fix-linking.patch diff --git a/resources/windows/patches/ungoogled-windows/windows-fix-gn-bootstrap.patch b/resources/patches/ungoogled-windows/windows-fix-gn-bootstrap.patch similarity index 100% rename from resources/windows/patches/ungoogled-windows/windows-fix-gn-bootstrap.patch rename to resources/patches/ungoogled-windows/windows-fix-gn-bootstrap.patch diff --git a/resources/windows/patches/ungoogled-windows/windows-fix-missing-include-es_parser_adts-cc.patch b/resources/patches/ungoogled-windows/windows-fix-missing-include-es_parser_adts-cc.patch similarity index 100% rename from resources/windows/patches/ungoogled-windows/windows-fix-missing-include-es_parser_adts-cc.patch rename to resources/patches/ungoogled-windows/windows-fix-missing-include-es_parser_adts-cc.patch diff --git a/resources/windows/patches/ungoogled-windows/windows-use-system-binaries.patch b/resources/patches/ungoogled-windows/windows-use-system-binaries.patch similarity index 100% rename from resources/windows/patches/ungoogled-windows/windows-use-system-binaries.patch rename to resources/patches/ungoogled-windows/windows-use-system-binaries.patch