[tor-commits] [tor-messenger-build/master] Add a patch for tor-launcher skin chrome:// uris

[arlo@xxxxxxxxxxxxxx]

commit 581ba7d2f5f9c22d9c9182a45c12bcf8c1f57e6e
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Fri Feb 9 17:14:05 2018 -0500

    Add a patch for tor-launcher skin chrome:// uris
    
    It is unclear why this is necessary.
---
 .../0001-Workaround-for-chrome-uri-skin-path.patch | 35 ++++++++++++++++++++++
 projects/tor-launcher/build                        |  1 +
 projects/tor-launcher/config                       |  1 +
 3 files changed, 37 insertions(+)

diff --git a/projects/tor-launcher/0001-Workaround-for-chrome-uri-skin-path.patch b/projects/tor-launcher/0001-Workaround-for-chrome-uri-skin-path.patch
new file mode 100644
index 0000000..fc3f80a
--- /dev/null
+++ b/projects/tor-launcher/0001-Workaround-for-chrome-uri-skin-path.patch
@@ -0,0 +1,35 @@
+From 6bb9cd2f4993d4a863d55da06e2e781d4003fd33 Mon Sep 17 00:00:00 2001
+From: Arlo Breault <arlolra@xxxxxxxxx>
+Date: Fri, 9 Feb 2018 17:10:50 -0500
+Subject: [PATCH] Workaround for chrome:// uri skin path
+
+---
+ chrome.manifest.in                      | 2 ++
+ src/chrome/content/network-settings.css | 1 +
+ 2 files changed, 3 insertions(+)
+ create mode 120000 src/chrome/content/network-settings.css
+
+diff --git a/chrome.manifest.in b/chrome.manifest.in
+index a869569..829d1c8 100644
+--- a/chrome.manifest.in
++++ b/chrome.manifest.in
+@@ -5,6 +5,8 @@ content torlauncher chrome/content/
+ 
+ skin torlauncher classic/1.0 chrome/skin/
+ 
++override chrome://torlauncher/skin/network-settings.css chrome://torlauncher/content/network-settings.css
++
+ resource torlauncher ./
+ 
+ # Firefox 4-style component registration
+diff --git a/src/chrome/content/network-settings.css b/src/chrome/content/network-settings.css
+new file mode 120000
+index 0000000..f694612
+--- /dev/null
++++ b/src/chrome/content/network-settings.css
+@@ -0,0 +1 @@
++../skin/network-settings.css
+\ No newline at end of file
+-- 
+2.16.1
+
diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build
index f9cf764..fc32c5d 100644
--- a/projects/tor-launcher/build
+++ b/projects/tor-launcher/build
@@ -2,6 +2,7 @@
 [% c("var/set_default_env") -%]
 tar xvf [% project %]-[% c('version') %].tar.gz
 cd [% project %]-[% c('version') %]
+patch -p1 < ../0001-Workaround-for-chrome-uri-skin-path.patch
 [% IF c("var/tor_control_port") -%]
 patch -p1 < ../controlport.patch
 [% END -%]
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 67a31b3..38874b3 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -14,4 +14,5 @@ input_files:
     refresh_input: 1
     enable: '[% c("var/tor_control_port") %]'
   - filename: tm-logo.svg
+  - filename: 0001-Workaround-for-chrome-uri-skin-path.patch
   - project: container-image

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits