mirror of
				https://aur.archlinux.org/firedragon.git
				synced 2025-11-04 07:56:59 +00:00 
			
		
		
		
	Fix
This commit is contained in:
		
							
								
								
									
										9
									
								
								.SRCINFO
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								.SRCINFO
									
									
									
									
									
								
							@@ -16,6 +16,7 @@ pkgbase = firedragon
 | 
				
			|||||||
	makedepends = mesa
 | 
						makedepends = mesa
 | 
				
			||||||
	makedepends = imake
 | 
						makedepends = imake
 | 
				
			||||||
	makedepends = inetutils
 | 
						makedepends = inetutils
 | 
				
			||||||
 | 
						makedepends = ccache
 | 
				
			||||||
	makedepends = rust
 | 
						makedepends = rust
 | 
				
			||||||
	makedepends = mozilla-common
 | 
						makedepends = mozilla-common
 | 
				
			||||||
	makedepends = xorg-server-xwayland
 | 
						makedepends = xorg-server-xwayland
 | 
				
			||||||
@@ -67,14 +68,12 @@ pkgbase = firedragon
 | 
				
			|||||||
	source_x86_64 = git+https://gitlab.com/dr460nf1r3/settings.git
 | 
						source_x86_64 = git+https://gitlab.com/dr460nf1r3/settings.git
 | 
				
			||||||
	source_x86_64 = remove_addons.patch
 | 
						source_x86_64 = remove_addons.patch
 | 
				
			||||||
	source_x86_64 = context-menu.patch
 | 
						source_x86_64 = context-menu.patch
 | 
				
			||||||
	source_x86_64 = 0001-Use-remoting-name-for-GDK-application-names.patch
 | 
					 | 
				
			||||||
	sha512sums_x86_64 = SKIP
 | 
						sha512sums_x86_64 = SKIP
 | 
				
			||||||
	sha512sums_x86_64 = 1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290
 | 
						sha512sums_x86_64 = 7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e
 | 
				
			||||||
	sha512sums_x86_64 = SKIP
 | 
						sha512sums_x86_64 = SKIP
 | 
				
			||||||
	sha512sums_x86_64 = SKIP
 | 
						sha512sums_x86_64 = SKIP
 | 
				
			||||||
	sha512sums_x86_64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
 | 
						sha512sums_x86_64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
 | 
				
			||||||
	sha512sums_x86_64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
 | 
						sha512sums_x86_64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
 | 
				
			||||||
	sha512sums_x86_64 = fd83824398fa5a2d3be8e82316c0c5eebe5a1e49c0b2e4eb6da3f4241c613dd21bb6fdb1eb8d4000007a02c5538e0db7fcd1e8e019a88147297628f2e0536fc9
 | 
					 | 
				
			||||||
	source_aarch64 = hg+https://hg.mozilla.org/mozilla-unified#revision=autoland
 | 
						source_aarch64 = hg+https://hg.mozilla.org/mozilla-unified#revision=autoland
 | 
				
			||||||
	source_aarch64 = firedragon.desktop
 | 
						source_aarch64 = firedragon.desktop
 | 
				
			||||||
	source_aarch64 = git+https://gitlab.com/dr460nf1r3/common.git
 | 
						source_aarch64 = git+https://gitlab.com/dr460nf1r3/common.git
 | 
				
			||||||
@@ -83,15 +82,13 @@ pkgbase = firedragon
 | 
				
			|||||||
	source_aarch64 = context-menu.patch
 | 
						source_aarch64 = context-menu.patch
 | 
				
			||||||
	source_aarch64 = arm.patch
 | 
						source_aarch64 = arm.patch
 | 
				
			||||||
	source_aarch64 = build-arm-libopus.patch
 | 
						source_aarch64 = build-arm-libopus.patch
 | 
				
			||||||
	source_aarch64 = 0001-Use-remoting-name-for-GDK-application-names.patch
 | 
					 | 
				
			||||||
	sha512sums_aarch64 = SKIP
 | 
						sha512sums_aarch64 = SKIP
 | 
				
			||||||
	sha512sums_aarch64 = 1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290
 | 
						sha512sums_aarch64 = 7fdfc23fbf637ef036f51b439e56a84fd12d7f50a894b7318d287da1584ed8be1958c1e403735e9edab8888699f3a68df5c69854d4b87187af1c76734644e44e
 | 
				
			||||||
	sha512sums_aarch64 = SKIP
 | 
						sha512sums_aarch64 = SKIP
 | 
				
			||||||
	sha512sums_aarch64 = SKIP
 | 
						sha512sums_aarch64 = SKIP
 | 
				
			||||||
	sha512sums_aarch64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
 | 
						sha512sums_aarch64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
 | 
				
			||||||
	sha512sums_aarch64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
 | 
						sha512sums_aarch64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
 | 
				
			||||||
	sha512sums_aarch64 = 7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f
 | 
						sha512sums_aarch64 = 7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f
 | 
				
			||||||
	sha512sums_aarch64 = 6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35
 | 
						sha512sums_aarch64 = 6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35
 | 
				
			||||||
	sha512sums_aarch64 = fd83824398fa5a2d3be8e82316c0c5eebe5a1e49c0b2e4eb6da3f4241c613dd21bb6fdb1eb8d4000007a02c5538e0db7fcd1e8e019a88147297628f2e0536fc9
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
pkgname = firedragon
 | 
					pkgname = firedragon
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,42 +0,0 @@
 | 
				
			|||||||
--- a/toolkit/xre/nsAppRunner.cpp
 | 
					 | 
				
			||||||
+++ b/toolkit/xre/nsAppRunner.cpp
 | 
					 | 
				
			||||||
@@ -4315,11 +4315,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.
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
--- 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"
 | 
					 | 
				
			||||||
@@ -153,13 +154,9 @@ nsresult nsAppShell::Init() {
 | 
					 | 
				
			||||||
       // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
 | 
					 | 
				
			||||||
       //
 | 
					 | 
				
			||||||
       // Only bother doing this for the parent process, since it's the one
 | 
					 | 
				
			||||||
-      // creating top-level windows. (At this point, a child process hasn't
 | 
					 | 
				
			||||||
-      // received the list of registered chrome packages, so the
 | 
					 | 
				
			||||||
-      // GetBrandShortName call would fail anyway.)
 | 
					 | 
				
			||||||
-      nsAutoString brandName;
 | 
					 | 
				
			||||||
-      mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
 | 
					 | 
				
			||||||
-      if (!brandName.IsEmpty()) {
 | 
					 | 
				
			||||||
-        gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
 | 
					 | 
				
			||||||
+      // creating top-level windows.
 | 
					 | 
				
			||||||
+      if (gAppData) {
 | 
					 | 
				
			||||||
+        gdk_set_program_class(gAppData->remotingName);
 | 
					 | 
				
			||||||
       }
 | 
					 | 
				
			||||||
     }
 | 
					 | 
				
			||||||
   }
 | 
					 | 
				
			||||||
							
								
								
									
										22
									
								
								PKGBUILD
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								PKGBUILD
									
									
									
									
									
								
							@@ -18,7 +18,7 @@ url="https://gitlab.com/dr460nf1r3/settings/"
 | 
				
			|||||||
depends=(gtk3 libxt mime-types dbus-glib
 | 
					depends=(gtk3 libxt mime-types dbus-glib
 | 
				
			||||||
         ffmpeg nss-hg ttf-font libpulse
 | 
					         ffmpeg nss-hg ttf-font libpulse
 | 
				
			||||||
         libvpx libjpeg zlib icu libevent libpipewire02)
 | 
					         libvpx libjpeg zlib icu libevent libpipewire02)
 | 
				
			||||||
makedepends=(unzip zip diffutils yasm mesa imake inetutils
 | 
					makedepends=(unzip zip diffutils yasm mesa imake inetutils ccache
 | 
				
			||||||
             rust mozilla-common xorg-server-xwayland xorg-server-xvfb
 | 
					             rust mozilla-common xorg-server-xwayland xorg-server-xvfb
 | 
				
			||||||
             autoconf2.13 mercurial clang llvm jack gtk2 nodejs cbindgen nasm
 | 
					             autoconf2.13 mercurial clang llvm jack gtk2 nodejs cbindgen nasm
 | 
				
			||||||
             python-setuptools python-psutil python-zstandard git binutils lld)
 | 
					             python-setuptools python-psutil python-zstandard git binutils lld)
 | 
				
			||||||
@@ -33,7 +33,6 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
 | 
				
			|||||||
options=(!emptydirs !makeflags !strip)
 | 
					options=(!emptydirs !makeflags !strip)
 | 
				
			||||||
replaces=('dragonwolf')
 | 
					replaces=('dragonwolf')
 | 
				
			||||||
_linux_commit=e123b80f7df1ad9043435f345c426717ca323579
 | 
					_linux_commit=e123b80f7df1ad9043435f345c426717ca323579
 | 
				
			||||||
_settings_commit=c5c75a39dd91a8772255a78493853be6553262b2
 | 
					 | 
				
			||||||
_repo=https://hg.mozilla.org/mozilla-unified
 | 
					_repo=https://hg.mozilla.org/mozilla-unified
 | 
				
			||||||
install=firedragon.install
 | 
					install=firedragon.install
 | 
				
			||||||
source_x86_64=("hg+$_repo#revision=autoland"
 | 
					source_x86_64=("hg+$_repo#revision=autoland"
 | 
				
			||||||
@@ -41,8 +40,7 @@ source_x86_64=("hg+$_repo#revision=autoland"
 | 
				
			|||||||
               "git+https://gitlab.com/dr460nf1r3/common.git"
 | 
					               "git+https://gitlab.com/dr460nf1r3/common.git"
 | 
				
			||||||
               "git+https://gitlab.com/dr460nf1r3/settings.git"
 | 
					               "git+https://gitlab.com/dr460nf1r3/settings.git"
 | 
				
			||||||
               remove_addons.patch
 | 
					               remove_addons.patch
 | 
				
			||||||
               context-menu.patch
 | 
					               context-menu.patch)
 | 
				
			||||||
               0001-Use-remoting-name-for-GDK-application-names.patch)
 | 
					 | 
				
			||||||
source_aarch64=("hg+$_repo#revision=autoland"
 | 
					source_aarch64=("hg+$_repo#revision=autoland"
 | 
				
			||||||
                $pkgname.desktop
 | 
					                $pkgname.desktop
 | 
				
			||||||
                "git+https://gitlab.com/dr460nf1r3/common.git"
 | 
					                "git+https://gitlab.com/dr460nf1r3/common.git"
 | 
				
			||||||
@@ -50,16 +48,14 @@ source_aarch64=("hg+$_repo#revision=autoland"
 | 
				
			|||||||
                remove_addons.patch
 | 
					                remove_addons.patch
 | 
				
			||||||
                context-menu.patch
 | 
					                context-menu.patch
 | 
				
			||||||
                arm.patch
 | 
					                arm.patch
 | 
				
			||||||
                build-arm-libopus.patch
 | 
					                build-arm-libopus.patch)
 | 
				
			||||||
                0001-Use-remoting-name-for-GDK-application-names.patch)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
sha512sums_x86_64=('SKIP'
 | 
					sha512sums_x86_64=('SKIP'
 | 
				
			||||||
                   '1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
 | 
					                   '1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
 | 
				
			||||||
                   'SKIP'
 | 
					                   'SKIP'
 | 
				
			||||||
                   'SKIP'
 | 
					                   'SKIP'
 | 
				
			||||||
                   '861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3'
 | 
					                   '861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3'
 | 
				
			||||||
                   'bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3'
 | 
					                   'bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3')
 | 
				
			||||||
                   'fd83824398fa5a2d3be8e82316c0c5eebe5a1e49c0b2e4eb6da3f4241c613dd21bb6fdb1eb8d4000007a02c5538e0db7fcd1e8e019a88147297628f2e0536fc9')
 | 
					 | 
				
			||||||
sha512sums_aarch64=('SKIP'
 | 
					sha512sums_aarch64=('SKIP'
 | 
				
			||||||
                    '1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
 | 
					                    '1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
 | 
				
			||||||
                    'SKIP'
 | 
					                    'SKIP'
 | 
				
			||||||
@@ -67,8 +63,7 @@ sha512sums_aarch64=('SKIP'
 | 
				
			|||||||
                    '861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3'
 | 
					                    '861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3'
 | 
				
			||||||
                    'bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3'
 | 
					                    'bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3'
 | 
				
			||||||
                    '7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f'
 | 
					                    '7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f'
 | 
				
			||||||
                    '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35'
 | 
					                    '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35')
 | 
				
			||||||
                    'fd83824398fa5a2d3be8e82316c0c5eebe5a1e49c0b2e4eb6da3f4241c613dd21bb6fdb1eb8d4000007a02c5538e0db7fcd1e8e019a88147297628f2e0536fc9')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
pkgver() {
 | 
					pkgver() {
 | 
				
			||||||
  cd mozilla-unified
 | 
					  cd mozilla-unified
 | 
				
			||||||
@@ -90,10 +85,6 @@ prepare() {
 | 
				
			|||||||
ac_add_options --enable-application=browser
 | 
					ac_add_options --enable-application=browser
 | 
				
			||||||
mk_add_options MOZ_OBJDIR=${PWD@Q}/obj
 | 
					mk_add_options MOZ_OBJDIR=${PWD@Q}/obj
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This supposedly speeds up compilation (We test through dogfooding anyway)
 | 
					 | 
				
			||||||
ac_add_options --disable-tests
 | 
					 | 
				
			||||||
ac_add_options --disable-debug
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
ac_add_options --prefix=/usr
 | 
					ac_add_options --prefix=/usr
 | 
				
			||||||
ac_add_options --enable-release
 | 
					ac_add_options --enable-release
 | 
				
			||||||
ac_add_options --enable-hardening
 | 
					ac_add_options --enable-hardening
 | 
				
			||||||
@@ -175,9 +166,6 @@ ac_add_options --enable-optimize
 | 
				
			|||||||
END
 | 
					END
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
 | 
					 | 
				
			||||||
  patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  # Remove some pre-installed addons that might be questionable
 | 
					  # Remove some pre-installed addons that might be questionable
 | 
				
			||||||
  patch -p1 -i ../remove_addons.patch
 | 
					  patch -p1 -i ../remove_addons.patch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user