diff --git a/www-client/mullvad-browser/mullvad-browser-140.13.0-r1.ebuild b/www-client/mullvad-browser/mullvad-browser-140.13.0-r2.ebuild similarity index 97% rename from www-client/mullvad-browser/mullvad-browser-140.13.0-r1.ebuild rename to www-client/mullvad-browser/mullvad-browser-140.13.0-r2.ebuild index f300f52646..6dada0585c 100644 --- a/www-client/mullvad-browser/mullvad-browser-140.13.0-r1.ebuild +++ b/www-client/mullvad-browser/mullvad-browser-140.13.0-r2.ebuild @@ -1281,8 +1281,8 @@ src_install() { # Prefer the upstream svg file they use when packaging flatpak so it's always up-to-date. insinto /usr/share/icons/hicolor/symbolic/apps - newins "${S}"/browser/installer/linux/app/flatpak/files/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg firefox-symbolic.svg - dosym -r /usr/share/icons/hicolor/symbolic/apps/firefox-symbolic.svg /usr/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg + newins "${S}"/browser/installer/linux/app/flatpak/files/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg mullvad-browser-symbolic.svg + dosym -r /usr/share/icons/hicolor/symbolic/apps/mullvad-browser-symbolic.svg /usr/share/icons/hicolor/symbolic/apps/org.mullvad.browser-symbolic.svg local icon size for icon in "${icon_srcdir}"/default*.png ; do @@ -1328,24 +1328,28 @@ src_install() { if use gnome-shell ; then # Install search provider for Gnome + mv browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini \ + browser/components/shell/search-provider-files/org.mullvad.browser.search-provider.ini insinto /usr/share/gnome-shell/search-providers/ - doins browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini + doins browser/components/shell/search-provider-files/org.mullvad.browser.search-provider.ini + mv browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service \ + browser/components/shell/search-provider-files/org.mullvad.browser.SearchProvider.service insinto /usr/share/dbus-1/services/ - doins browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service + doins browser/components/shell/search-provider-files/org.mullvad.browser.SearchProvider.service # Toggle between rapid and esr desktop file names if [[ -n ${MOZ_ESR} ]] ; then sed -e "s/firefox.desktop/${desktop_filename}/g" \ - -i "${ED}/usr/share/gnome-shell/search-providers/org.mozilla.firefox.search-provider.ini" || - die "Failed to sed org.mozilla.firefox.search-provider.ini file." + -i "${ED}/usr/share/gnome-shell/search-providers/org.mullvad.browser.search-provider.ini" || + die "Failed to sed org.mullvad.browser.search-provider.ini file." fi # Make the dbus service aware of a previous session, bgo#939196 sed -e \ "s/Exec=\/usr\/bin\/firefox/Exec=\/usr\/$(get_libdir)\/firefox\/firefox --dbus-service \/usr\/bin\/firefox/g" \ - -i "${ED}/usr/share/dbus-1/services/org.mozilla.firefox.SearchProvider.service" || - die "Failed to sed org.mozilla.firefox.SearchProvider.service dbus file" + -i "${ED}/usr/share/dbus-1/services/org.mullvad.browser.SearchProvider.service" || + die "Failed to sed org.mullvad.browser.SearchProvider.service dbus file" # Update prefs to enable Gnome search provider cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable gnome-search-provider via prefs" diff --git a/www-client/mullvad-browser/mullvad-browser-153.3.2-r1.ebuild b/www-client/mullvad-browser/mullvad-browser-153.3.2-r2.ebuild similarity index 97% rename from www-client/mullvad-browser/mullvad-browser-153.3.2-r1.ebuild rename to www-client/mullvad-browser/mullvad-browser-153.3.2-r2.ebuild index 333ad5da45..db5b479ec7 100644 --- a/www-client/mullvad-browser/mullvad-browser-153.3.2-r1.ebuild +++ b/www-client/mullvad-browser/mullvad-browser-153.3.2-r2.ebuild @@ -1273,8 +1273,8 @@ src_install() { # Prefer the upstream svg file they use when packaging flatpak so it's always up-to-date. insinto /usr/share/icons/hicolor/symbolic/apps - newins "${S}"/browser/installer/linux/app/flatpak/files/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg firefox-symbolic.svg - dosym -r /usr/share/icons/hicolor/symbolic/apps/firefox-symbolic.svg /usr/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg + newins "${S}"/browser/installer/linux/app/flatpak/files/share/icons/hicolor/symbolic/apps/org.mozilla.firefox-symbolic.svg mullvad-browser-symbolic.svg + dosym -r /usr/share/icons/hicolor/symbolic/apps/mullvad-browser-symbolic.svg /usr/share/icons/hicolor/symbolic/apps/org.mullvad.browser-symbolic.svg local icon size for icon in "${icon_srcdir}"/default*.png ; do @@ -1320,24 +1320,28 @@ src_install() { if use gnome-shell ; then # Install search provider for Gnome + mv browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini \ + browser/components/shell/search-provider-files/org.mullvad.browser.search-provider.ini insinto /usr/share/gnome-shell/search-providers/ - doins browser/components/shell/search-provider-files/org.mozilla.firefox.search-provider.ini + doins browser/components/shell/search-provider-files/org.mullvad.browser.search-provider.ini + mv browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service \ + browser/components/shell/search-provider-files/org.mullvad.browser.SearchProvider.service insinto /usr/share/dbus-1/services/ - doins browser/components/shell/search-provider-files/org.mozilla.firefox.SearchProvider.service + doins browser/components/shell/search-provider-files/org.mullvad.browser.SearchProvider.service # Toggle between rapid and esr desktop file names if [[ -n ${MOZ_ESR} ]] ; then sed -e "s/firefox.desktop/${desktop_filename}/g" \ - -i "${ED}/usr/share/gnome-shell/search-providers/org.mozilla.firefox.search-provider.ini" || - die "Failed to sed org.mozilla.firefox.search-provider.ini file." + -i "${ED}/usr/share/gnome-shell/search-providers/org.mullvad.browser.search-provider.ini" || + die "Failed to sed org.mullvad.browser.search-provider.ini file." fi # Make the dbus service aware of a previous session, bgo#939196 sed -e \ "s/Exec=\/usr\/bin\/firefox/Exec=\/usr\/$(get_libdir)\/firefox\/firefox --dbus-service \/usr\/bin\/firefox/g" \ - -i "${ED}/usr/share/dbus-1/services/org.mozilla.firefox.SearchProvider.service" || - die "Failed to sed org.mozilla.firefox.SearchProvider.service dbus file" + -i "${ED}/usr/share/dbus-1/services/org.mullvad.browser.SearchProvider.service" || + die "Failed to sed org.mullvad.browser.SearchProvider.service dbus file" # Update prefs to enable Gnome search provider cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to enable gnome-search-provider via prefs"