forked from berlogue/opera-stable-libffmpeg
-
Notifications
You must be signed in to change notification settings - Fork 0
/
chromium-names.patch
91 lines (81 loc) · 2.73 KB
/
chromium-names.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
Replace hard-coded "chromium-browser" with package name.
* Fixes Icon key in chrome-apps.directory.
https://bugzilla.rpmfusion.org/show_bug.cgi?id=5895
* Fixes PulseAudio application name and icon
as seen from pavucontrol.
* Prevents showing "Chromium isn't your default browser",
when the browser is launched directly without the wrapper.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -5149,6 +5149,7 @@ static_library("browser") {
"upgrade_detector/directory_monitor.h",
"upgrade_detector/get_installed_version_linux.cc",
]
+ configs += [ "//third_party/rpm_fusion:defines" ]
deps += [ "//chrome/app/theme:chrome_unscaled_resources_grit" ]
if (use_dbus) {
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -415,7 +415,7 @@ std::string GetIconName() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return "google-chrome";
#else // BUILDFLAG(CHROMIUM_BRANDING)
- return "chromium-browser";
+ return RPM_FUSION_PACKAGE_NAME;
#endif
}
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -83,6 +83,7 @@ source_set("channel_info") {
deps += [ "//chromeos/crosapi/cpp" ]
} else if (is_posix) {
sources += [ "channel_info_posix.cc" ]
+ configs += [ "//third_party/rpm_fusion:defines" ]
}
}
--- a/chrome/common/channel_info_posix.cc
+++ b/chrome/common/channel_info_posix.cc
@@ -96,7 +96,7 @@ std::string GetDesktopName(base::Environ
std::string name;
if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty())
return name;
- return "chromium-browser.desktop";
+ return RPM_FUSION_PACKAGE_NAME ".desktop";
#endif
}
#endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
--- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn
@@ -294,6 +294,8 @@ source_set("audio") {
"pulse/pulse_util.h",
]
+ configs += [ "//third_party/rpm_fusion:defines" ]
+
deps += [ "//build:branding_buildflags" ]
if (link_pulseaudio) {
--- a/media/audio/pulse/pulse_util.cc
+++ b/media/audio/pulse/pulse_util.cc
@@ -37,8 +37,8 @@ namespace {
constexpr char kBrowserDisplayName[] = "google-chrome";
#define PRODUCT_STRING "Google Chrome"
#else
-constexpr char kBrowserDisplayName[] = "chromium-browser";
-#define PRODUCT_STRING "Chromium"
+constexpr char kBrowserDisplayName[] = RPM_FUSION_PACKAGE_NAME;
+#define PRODUCT_STRING RPM_FUSION_MENU_NAME
#endif
#if defined(DLOPEN_PULSEAUDIO)
--- /dev/null
+++ b/third_party/rpm_fusion/BUILD.gn
@@ -0,0 +1,11 @@
+declare_args() {
+ rpm_fusion_package_name = "chromium-browser"
+ rpm_fusion_menu_name = "Chromium"
+}
+
+config("defines") {
+ defines = [
+ "RPM_FUSION_PACKAGE_NAME=\"$rpm_fusion_package_name\"",
+ "RPM_FUSION_MENU_NAME=\"$rpm_fusion_menu_name\"",
+ ]
+}