Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include brave_[100|200]_percent.pak to linux install package #218

Merged
merged 1 commit into from
Jul 5, 2018
Merged

Include brave_[100|200]_percent.pak to linux install package #218

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions patches/chrome-installer-linux-common-installer.include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 58b80612445aa0616462805f464bcae0b3ee1c3e..b9d7e55692a730286fac55b1f997008012fdafca 100644
index 58b80612445aa0616462805f464bcae0b3ee1c3e..5acee06845fe2f94ef51f5ddbf9261a33fa4df5d 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -75,6 +75,7 @@ process_template() (
Expand All @@ -10,13 +10,17 @@ index 58b80612445aa0616462805f464bcae0b3ee1c3e..b9d7e55692a730286fac55b1f9970080
-e "s#@@PROGNAME@@#${PROGNAME}#g" \
-e "s#@@CHANNEL@@#${CHANNEL}#g" \
-e "s#@@COMPANY_FULLNAME@@#${COMPANY_FULLNAME}#g" \
@@ -154,6 +155,15 @@ stage_install_common() {
@@ -154,6 +155,19 @@ stage_install_common() {
install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
fi

+ # brave_resources.pak, contains customization, shields
+ install -m 644 "${BUILDDIR}/brave_resources.pak" "${STAGEDIR}/${INSTALLDIR}/"
+
+ # brave_[100|200]_resources.pak for scaled resources
+ install -m 644 "${BUILDDIR}/brave_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
+ install -m 644 "${BUILDDIR}/brave_200_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
+
+ # localization files for Brave extension
+ install -d -m 755 "${STAGEDIR}/${INSTALLDIR}/resources/brave_extension/_locales"
+ cp -a "${BUILDDIR}/resources/brave_extension/_locales" "${STAGEDIR}/${INSTALLDIR}/resources/brave_extension"
Expand All @@ -26,7 +30,7 @@ index 58b80612445aa0616462805f464bcae0b3ee1c3e..b9d7e55692a730286fac55b1f9970080
# ICU data file; Necessary when the GN icu_use_data_file flag is true.
install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"

@@ -381,7 +391,7 @@ stage_install_common() {
@@ -381,7 +395,7 @@ stage_install_common() {
exit 1
fi
local expected_perms=777
Expand Down