Date: Monday, July 15, 2019 @ 18:08:15 Author: heftig Revision: 489879
69.0b4-2 Added: firefox-developer-edition/trunk/0001-Use-remoting-name-for-GDK-application-names.patch Modified: firefox-developer-edition/trunk/PKGBUILD firefox-developer-edition/trunk/firefox-developer-edition.desktop firefox-developer-edition/trunk/firefox-install-dir.patch --------------------------------------------------------+ 0001-Use-remoting-name-for-GDK-application-names.patch | 56 +++++++++++++++ PKGBUILD | 51 +++++++------ firefox-developer-edition.desktop | 43 +++++++++-- firefox-install-dir.patch | 51 ++++++------- 4 files changed, 145 insertions(+), 56 deletions(-) Added: 0001-Use-remoting-name-for-GDK-application-names.patch =================================================================== --- 0001-Use-remoting-name-for-GDK-application-names.patch (rev 0) +++ 0001-Use-remoting-name-for-GDK-application-names.patch 2019-07-15 18:08:15 UTC (rev 489879) @@ -0,0 +1,56 @@ +From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001 +Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steff...@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Mon, 25 Mar 2019 20:30:11 +0100 +Subject: [PATCH] Use remoting name for GDK application names + +--- + toolkit/xre/nsAppRunner.cpp | 6 +----- + widget/gtk/nsAppShell.cpp | 7 +++---- + 2 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +index 0b808ef215f06..28911c0ffeaec 100644 +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { + // consistently. + + // Set program name to the one defined in application.ini. +- { +- nsAutoCString program(gAppData->name); +- ToLowerCase(program); +- g_set_prgname(program.get()); +- } ++ g_set_prgname(gAppData->remotingName); + + // Initialize GTK here for splash. + +diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp +index 0686ff814916b..ae4a4ea55f420 100644 +--- a/widget/gtk/nsAppShell.cpp ++++ b/widget/gtk/nsAppShell.cpp +@@ -24,6 +24,7 @@ + # include "WakeLockListener.h" + #endif + #include "gfxPlatform.h" ++#include "nsAppRunner.h" + #include "ScreenHelperGTK.h" + #include "HeadlessScreenHelper.h" + #include "mozilla/widget/ScreenManager.h" +@@ -171,10 +172,8 @@ nsresult nsAppShell::Init() { + // option when program uses gdk_set_program_class(). + // + // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 +- nsAutoString brandName; +- mozilla::widget::WidgetUtils::GetBrandShortName(brandName); +- if (!brandName.IsEmpty()) { +- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get()); ++ if (gAppData) { ++ gdk_set_program_class(gAppData->remotingName); + } + } + +-- +2.21.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-07-15 15:50:11 UTC (rev 489878) +++ PKGBUILD 2019-07-15 18:08:15 UTC (rev 489879) @@ -3,32 +3,34 @@ pkgname=firefox-developer-edition pkgver=69.0b4 -pkgrel=1 +pkgrel=2 pkgdesc="Developer Edition of the popular Firefox web browser" arch=('x86_64') license=('MPL' 'GPL' 'LGPL') url="https://www.mozilla.org/firefox/channel/#developer" -depends=('gtk3' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' - 'dbus-glib' 'ffmpeg' 'nss' 'sqlite' 'ttf-font' 'libpulse') -makedepends=('unzip' 'zip' 'diffutils' 'python2' 'python' 'yasm' 'mesa' 'imake' 'inetutils' - 'xorg-server-xvfb' 'autoconf2.13' 'rust' 'mercurial' 'clang' 'llvm' 'jack' - 'gtk2' 'nodejs' 'python2-psutil' 'cbindgen' 'nasm') +depends=('gtk3' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' + 'ffmpeg' 'nss' 'sqlite' 'ttf-font' 'libpulse') +makedepends=('unzip' 'zip' 'diffutils' 'python2-setuptools' 'yasm' 'mesa' 'imake' 'inetutils' + 'xorg-server-xvfb' 'autoconf2.13' 'rust' 'clang' 'llvm' 'jack' 'gtk2' + 'python' 'nodejs' 'python2-psutil' 'cbindgen' 'nasm') optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' 'speech-dispatcher: Text-to-Speech' - 'hunspell-en_US: Spell Checking, American English') + 'hunspell-en_US: Spell checking, American English') replaces=('firefox-developer') options=(!emptydirs !makeflags !strip) -_repo=https://hg.mozilla.org/mozilla-unified -source=("hg+$_repo#tag=DEVEDITION_${pkgver//./_}_RELEASE" - "$pkgname".desktop - firefox-symbolic.svg - firefox-install-dir.patch) -sha512sums=('SKIP' - '12617f60e01420350b8d9c7c1c3a2a5ba0f2c46df31b0e23e51093ebd68019ced7d193a01d964421b91e1b444ce4ab499523f21cd3a39a2ffac8883d096ac195' - 'ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8' - '8fdf6a65e78406251075168c8310bb12c9b8419b3e51f59b1aa6244ef48ef1d201aae8bfdd5faa1da79242d9967fce959cbeffa54991ff39691f16168111b248') +source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} + firefox-install-dir.patch + 0001-Use-remoting-name-for-GDK-application-names.patch + "$pkgname".desktop firefox-symbolic.svg) +sha512sums=('78087d9ec90d4c258dd0cf83b006058f8e55805e49c24b53793dfea5742e370313772bf0c4ca30066aca1ef37668ea32bf74f22b7d382f6d6de4f924b8f9ca53' + 'SKIP' + 'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e' + '40c931b8abbe5880122dbcc93d457e04e9b4f2bc3e0275e9e3e35dd347fe0658f9446c89e99553203be8a8c9ab6f4ca872a7aedc514920c107b9235c04df91dc' + 'c212158fe76b1e6228adba9214e2881458b81f38564149719dd18b121f962285bf54603a5bea93c27cb09be851b1d70091a2ce2eb5294c9d75f7619e06d549be' + 'ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8') +validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <rele...@mozilla.com> # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -43,9 +45,13 @@ _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff prepare() { - cd mozilla-unified + mkdir mozbuild + cd firefox-${pkgver%b*} patch -Np1 -i ../firefox-install-dir.patch + # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 + patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch + echo -n "$_google_api_key" > google-api-key echo -n "$_mozilla_api_key" > mozilla-api-key @@ -92,16 +98,14 @@ ac_add_options --enable-jack ac_add_options --enable-startup-notification ac_add_options --enable-crashreporter +ac_add_options --disable-gconf ac_add_options --disable-updater -ac_add_options --disable-gconf - END } build() { - cd mozilla-unified + cd firefox-${pkgver%b*} - export MOZ_SOURCE_REPO="$_repo" export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="$srcdir/mozbuild" @@ -108,18 +112,17 @@ # LTO needs more open files ulimit -n 4096 - xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build + xvfb-run -a -n 95 -s "-screen 0 1600x1200x24" ./mach build ./mach buildsymbols } package() { - cd mozilla-unified + cd firefox-${pkgver%b*} DESTDIR="$pkgdir" ./mach install find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" install -Dm644 /dev/stdin "$_vendorjs" << END - // Use LANG environment variable to choose locale. pref("intl.locale.requested", ""); Modified: firefox-developer-edition.desktop =================================================================== --- firefox-developer-edition.desktop 2019-07-15 15:50:11 UTC (rev 489878) +++ firefox-developer-edition.desktop 2019-07-15 18:08:15 UTC (rev 489879) @@ -2,7 +2,7 @@ Version=1.0 Name=Firefox Developer Edition GenericName=Web Browser -GenericName[ar]=متصفح وِب +GenericName[ar]=متصفح ويب GenericName[ast]=Restolador Web GenericName[bn]=ওয়েব ব্রাউজার GenericName[ca]=Navegador web @@ -19,7 +19,7 @@ GenericName[he]=דפדפן אינטרנט GenericName[hr]=Web preglednik GenericName[hu]=Webböngésző -GenericName[it]=Browser Web +GenericName[it]=Browser web GenericName[ja]=ウェブ・ブラウザ GenericName[ko]=웹 브라우저 GenericName[ku]=Geroka torê @@ -42,8 +42,8 @@ GenericName[vi]=Trình duyệt Web GenericName[zh_CN]=网络浏览器 GenericName[zh_TW]=網路瀏覽器 -Comment=Browse the Web -Comment[ar]=تصفح الوِب +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية Comment[ast]=Restola pela Rede Comment[bn]=ইন্টারনেট ব্রাউজ করুন Comment[ca]=Navegueu per el web @@ -83,15 +83,44 @@ Comment[vi]=Để duyệt các trang web Comment[zh_CN]=浏览互联网 Comment[zh_TW]=瀏覽網際網路 +Keywords=Internet;WWW;Browser;Web;Explorer +Keywords[ar]=انترنت;إنترنت;متصفح;ويب;وب +Keywords[ast]=Internet;WWW;Restolador;Web;Esplorador +Keywords[ca]=Internet;WWW;Navegador;Web;Explorador;Explorer +Keywords[cs]=Internet;WWW;Prohlížeč;Web;Explorer +Keywords[da]=Internet;Internettet;WWW;Browser;Browse;Web;Surf;Nettet +Keywords[de]=Internet;WWW;Browser;Web;Explorer;Webseite;Site;surfen;online;browsen +Keywords[el]=Internet;WWW;Browser;Web;Explorer;Διαδίκτυο;Περιηγητής;Firefox;Φιρεφοχ;Ιντερνετ +Keywords[es]=Explorador;Internet;WWW +Keywords[fi]=Internet;WWW;Browser;Web;Explorer;selain;Internet-selain;internetselain;verkkoselain;netti;surffaa +Keywords[fr]=Internet;WWW;Browser;Web;Explorer;Fureteur;Surfer;Navigateur +Keywords[he]=דפדפן;אינטרנט;רשת;אתרים;אתר;פיירפוקס;מוזילה; +Keywords[hr]=Internet;WWW;preglednik;Web +Keywords[hu]=Internet;WWW;Böngésző;Web;Háló;Net;Explorer +Keywords[it]=Internet;WWW;Browser;Web;Navigatore +Keywords[is]=Internet;WWW;Vafri;Vefur;Netvafri;Flakk +Keywords[ja]=Internet;WWW;Web;インターネット;ブラウザ;ウェブ;エクスプローラ +Keywords[nb]=Internett;WWW;Nettleser;Explorer;Web;Browser;Nettside +Keywords[nl]=Internet;WWW;Browser;Web;Explorer;Verkenner;Website;Surfen;Online +Keywords[pt]=Internet;WWW;Browser;Web;Explorador;Navegador +Keywords[pt_BR]=Internet;WWW;Browser;Web;Explorador;Navegador +Keywords[ru]=Internet;WWW;Browser;Web;Explorer;интернет;браузер;веб;файрфокс;огнелис +Keywords[sk]=Internet;WWW;Prehliadač;Web;Explorer +Keywords[sl]=Internet;WWW;Browser;Web;Explorer;Brskalnik;Splet +Keywords[tr]=İnternet;WWW;Tarayıcı;Web;Gezgin;Web sitesi;Site;sörf;çevrimiçi;tara +Keywords[uk]=Internet;WWW;Browser;Web;Explorer;Інтернет;мережа;переглядач;оглядач;браузер;веб;файрфокс;вогнелис;перегляд +Keywords[vi]=Internet;WWW;Browser;Web;Explorer;Trình duyệt;Trang web +Keywords[zh_CN]=Internet;WWW;Browser;Web;Explorer;网页;浏览;上网;火狐;Firefox;ff;互联网;网站; +Keywords[zh_TW]=Internet;WWW;Browser;Web;Explorer;網際網路;網路;瀏覽器;上網;網頁;火狐 Exec=/usr/lib/firefox-developer-edition/firefox %u Icon=firefox-developer-edition Terminal=false +X-MultipleArgs=false Type=Application -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall; StartupNotify=true -StartupWMClass=Firefox Developer Edition +StartupWMClass=firefoxdeveloperedition Categories=Network;WebBrowser; -Keywords=web;browser;internet; Actions=new-window;new-private-window; [Desktop Action new-window] Modified: firefox-install-dir.patch =================================================================== --- firefox-install-dir.patch 2019-07-15 15:50:11 UTC (rev 489878) +++ firefox-install-dir.patch 2019-07-15 18:08:15 UTC (rev 489879) @@ -1,6 +1,22 @@ -diff -r 0c5a115449a3 config/baseconfig.mk ---- a/config/baseconfig.mk Wed Jan 17 17:20:41 2018 -0500 -+++ b/config/baseconfig.mk Sat Jan 20 21:54:40 2018 -0500 + browser/branding/aurora/configure.sh | 1 - + config/baseconfig.mk | 2 +- + toolkit/mozapps/installer/packager.mk | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) + +diff --git c/browser/branding/aurora/configure.sh i/browser/branding/aurora/configure.sh +index 19d4ff057f73..2c79e136cc67 100644 +--- c/browser/branding/aurora/configure.sh ++++ i/browser/branding/aurora/configure.sh +@@ -3,5 +3,4 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + MOZ_APP_DISPLAYNAME="Firefox Developer Edition" +-MOZ_APP_REMOTINGNAME=firefox-dev + MOZ_DEV_EDITION=1 +diff --git c/config/baseconfig.mk i/config/baseconfig.mk +index 3ef3af95d611..81530dface0a 100644 +--- c/config/baseconfig.mk ++++ i/config/baseconfig.mk @@ -2,7 +2,7 @@ # directly in python/mozbuild/mozbuild/base.py for gmake validation. # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending @@ -10,10 +26,11 @@ ifeq (.,$(DEPTH)) DIST = dist else -diff -r 0c5a115449a3 toolkit/mozapps/installer/packager.mk ---- a/toolkit/mozapps/installer/packager.mk Wed Jan 17 17:20:41 2018 -0500 -+++ b/toolkit/mozapps/installer/packager.mk Sat Jan 20 21:54:40 2018 -0500 -@@ -140,8 +140,8 @@ +diff --git c/toolkit/mozapps/installer/packager.mk i/toolkit/mozapps/installer/packager.mk +index 64f902a26942..d3313dacbcb7 100644 +--- c/toolkit/mozapps/installer/packager.mk ++++ i/toolkit/mozapps/installer/packager.mk +@@ -138,8 +138,8 @@ endif (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ (cd $(DESTDIR)$(installdir) && tar -xf -) $(NSINSTALL) -D $(DESTDIR)$(bindir) @@ -22,21 +39,5 @@ + $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)-developer-edition + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)-developer-edition - checksum: - mkdir -p `dirname $(CHECKSUM_FILE)` -diff -r 0c5a115449a3 toolkit/xre/nsAppRunner.cpp ---- a/toolkit/xre/nsAppRunner.cpp Wed Jan 17 17:20:41 2018 -0500 -+++ b/toolkit/xre/nsAppRunner.cpp Sat Jan 20 21:54:40 2018 -0500 -@@ -3866,7 +3866,11 @@ - // consistently. - - // Set program name to the one defined in application.ini. -- { -+ if (strcmp(gAppData->name, "Firefox") == 0) { -+ // HACK to make GNOME Shell distinguish this -+ // app from regular Firefox -+ g_set_prgname("firefox-developer-edition"); -+ } else { - nsAutoCString program(gAppData->name); - ToLowerCase(program); - g_set_prgname(program.get()); + upload: + $(PYTHON) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) $(UPLOAD_FILES)