fix branding on linux (#20)

* patches/branding: change default user dir location

* package: clear tarball_dir before (re)packaging

* package: name icon "helium" instead of "chromium"

* package: ship 256x256 icon instead of 48x48

* patches/helium: additional chromium -> helium renames

Author: dumbmoron

package/helium.desktop

@@ -6,7 +6,7 @@ Comment=Access the Internet
 Exec=chromium %U
 StartupNotify=true
 Terminal=false
-Icon=chromium
+Icon=helium
 Type=Application
 Categories=Network;WebBrowser;
 MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;

patches/helium/linux/change-chromium-branding.patch

@@ -0,0 +1,134 @@
+--- a/chrome/BUILD.gn
++++ b/chrome/BUILD.gn
+@@ -1792,7 +1792,7 @@ if (is_linux || is_chromeos) {
+     ]
+     if (is_linux) {
+       sources += [
+-        "//chrome/app/theme/$branding_path_component/linux/product_logo_48.png",
++        "//chrome/app/theme/$branding_path_component/linux/product_logo_256.png",
+       ]
+     } else {
+       sources +=
+--- a/chrome/common/channel_info_posix.cc
++++ b/chrome/common/channel_info_posix.cc
+@@ -81,18 +81,13 @@ std::string GetChannelName(WithExtendedS
+ }
+ 
+ std::string GetChannelSuffixForDataDir() {
+-  switch (GetChannel()) {
+-    case version_info::Channel::BETA:
+-      return "-beta";
+-    case version_info::Channel::DEV:
+-      return "-unstable";
+-    case version_info::Channel::CANARY:
+-      return "-canary";
+-    default:
++#if !defined(OFFICIAL_BUILD)
++  return ".dev";
++#else
+       // Stable, extended stable, and unknown (e.g. in unbranded builds) don't
+       // get a suffix.
+       return std::string();
+-  }
++#endif
+ }
+ 
+ #if BUILDFLAG(IS_LINUX)
+@@ -148,11 +143,11 @@ std::string GetDesktopName(base::Environ
+   // Allow $CHROME_DESKTOP to override the built-in value, so that development
+   // versions can set themselves as the default without interfering with
+   // non-official, packaged versions using the built-in value.
+-  std::optional<std::string> name = env->GetVar("CHROME_DESKTOP");
++  std::optional<std::string> name = env->GetVar("HELIUM_DESKTOP");
+   if (name.has_value() && !name.value().empty()) {
+     return name.value();
+   }
+-  return "chromium-browser.desktop";
++  return "helium.desktop";
+ #endif
+ }
+ #endif  // BUILDFLAG(IS_LINUX)
+--- a/chrome/common/chrome_paths_linux.cc
++++ b/chrome/common/chrome_paths_linux.cc
+@@ -81,7 +81,7 @@ bool GetDefaultUserDataDirectory(base::F
+   std::unique_ptr<base::Environment> env(base::Environment::Create());
+   base::FilePath config_dir;
+   std::optional<std::string> chrome_config_home_str =
+-      env->GetVar("CHROME_CONFIG_HOME");
++      env->GetVar("HELIUM_CONFIG_HOME");
+   if (chrome_config_home_str.has_value() &&
+       base::IsStringUTF8(chrome_config_home_str.value())) {
+     config_dir = base::FilePath::FromUTF8Unsafe(chrome_config_home_str.value());
+@@ -90,13 +90,7 @@ bool GetDefaultUserDataDirectory(base::F
+         GetXDGDirectory(env.get(), kXdgConfigHomeEnvVar, kDotConfigDir);
+   }
+ 
+-#if BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING)
+-  std::string data_dir_basename = "google-chrome-for-testing";
+-#elif BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-  std::string data_dir_basename = "google-chrome";
+-#else
+-  std::string data_dir_basename = "chromium";
+-#endif
++  std::string data_dir_basename = "net.imput.helium";
+   *result = config_dir.Append(data_dir_basename + GetChannelSuffixForDataDir());
+   return true;
+ }
+--- a/chrome/installer/linux/common/chromium-browser.info
++++ b/chrome/installer/linux/common/chromium-browser.info
+@@ -6,7 +6,7 @@
+ # chromium-browser packages for various platforms.
+ 
+ # Base name of the package.
+-PACKAGE="chromium-browser"
++PACKAGE="helium"
+ 
+ # Filename of the main executable (for generating launcher scripts, etc.)
+ PROGNAME=chrome
+@@ -18,7 +18,7 @@ INSTALLDIR=/opt/chromium.org/chromium
+ ENROLLMENTDIR=/etc/chromium/policies/enrollment
+ 
+ # Display string for desktop menu/icon.
+-MENUNAME="Chromium Web Browser"
++MENUNAME="Helium"
+ 
+ # Brief package description.
+ SHORTDESC="The web browser from the Chromium projects"
+@@ -27,16 +27,16 @@ SHORTDESC="The web browser from the Chro
+ FULLDESC="Chromium is a browser that combines a minimal design with sophisticated technology to make the web faster, safer, and easier."
+ 
+ # Package maintainer information.
+-MAINTNAME="Chromium Linux Team"
+-MAINTMAIL="chromium-packagers@chromium.org"
+-PRODUCTURL="https://www.chromium.org/Home"
++MAINTNAME="imput"
++MAINTMAIL="helium@imput.net"
++PRODUCTURL="https://helium.computer"
+ 
+-PROJECT_LICENSE="BSD-3-Clause and LGPL-2.1+ and Apache-2.0 and IJG and MIT and GPL-2.0+ and ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)"
++PROJECT_LICENSE="GPL-3.0 and BSD-3-Clause and LGPL-2.1+ and Apache-2.0 and IJG and MIT and GPL-2.0+ and ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)"
+ 
+-DEVELOPER_NAME="The Chromium Authors"
++DEVELOPER_NAME="The Helium Authors"
+ 
+-BUGTRACKERURL="https://www.chromium.org/for-testers/bug-reporting-guidelines"
++BUGTRACKERURL="https://github.com/imputnet/helium-linux/issues"
+ 
+-HELPURL="https://chromium.googlesource.com/chromium/src/+/main/docs/linux/debugging.md"
++HELPURL="https://helium.computer/"
+ 
+-RDN="org.chromium.Chromium"
++RDN="net.imput.helium"
+--- a/media/audio/pulse/pulse_util.cc
++++ b/media/audio/pulse/pulse_util.cc
+@@ -44,8 +44,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[] = "helium";
++#define PRODUCT_STRING "Helium"
+ #endif
+ 
+ #if defined(DLOPEN_PULSEAUDIO)

patches/series

@@ -1,3 +1,5 @@
 ungoogled-chromium/portablelinux/drop-nodejs-version-check.patch
 ungoogled-chromium/portablelinux/use-oauth2-client-switches-as-default.patch
 ungoogled-chromium/portablelinux/fix-compiling-on-arm64.patch
+
+helium/linux/change-chromium-branding.patch

scripts/package.sh

@@ -42,7 +42,7 @@ libqt6_shim.so
 libvk_swiftshader.so
 libvulkan.so.1
 locales/
-product_logo_48.png
+product_logo_256.png
 resources.pak
 v8_context_snapshot.bin
 vk_swiftshader_icd.json
@@ -51,6 +51,7 @@ xdg-settings"
 
 echo "copying release files and creating $_tarball_name.tar.xz"
 
+rm -rf "$_tarball_dir"
 mkdir -p "$_tarball_dir"
 
 for file in $_files; do
@@ -68,7 +69,7 @@ tar vcf - "$_tarball_name" \
 
 # create AppImage
 rm -rf "$_app_dir"
-mkdir -p "$_app_dir/opt/helium/" "$_app_dir/usr/share/icons/hicolor/48x48/apps/"
+mkdir -p "$_app_dir/opt/helium/" "$_app_dir/usr/share/icons/hicolor/256x256/apps/"
 cp -r "$_tarball_dir"/* "$_app_dir/opt/helium/"
 cp "$_root_dir/package/helium.desktop" "$_app_dir"
 sed -i -e 's|Exec=chromium|Exec=AppRun|g' "$_app_dir/helium.desktop"
@@ -83,8 +84,9 @@ export CHROME_WRAPPER="${THIS}"
 EOF
 chmod a+x "$_app_dir/AppRun"
 
-cp "${_app_dir}/opt/helium/product_logo_48.png" "$_app_dir/usr/share/icons/hicolor/48x48/apps/chromium.png"
-cp "${_app_dir}/usr/share/icons/hicolor/48x48/apps/chromium.png" "$_app_dir"
+for out in "$_app_dir/helium.png" "${_app_dir}/usr/share/icons/hicolor/256x256/apps/helium.png"; do
+    cp "${_app_dir}/opt/helium/product_logo_256.png" "$out"
+done
 
 export APPIMAGETOOL_APP_NAME="Helium"
 export VERSION="$_version"