diff --git a/extra/firefox/build b/extra/firefox/build index 76949f48..8de29159 100755 --- a/extra/firefox/build +++ b/extra/firefox/build @@ -4,6 +4,9 @@ for p in *.patch; do patch -p1 < "$p" done +mv widget/x11/keysym2ucs.c widget/gtk/keysym2ucs.c +mv widget/x11/keysym2ucs.h widget/gtk/keysym2ucs.h + # Build autoconf 2.13 for Firefox's sole use. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642 ( diff --git a/extra/firefox/checksums b/extra/firefox/checksums index 04d521cb..f08db804 100644 --- a/extra/firefox/checksums +++ b/extra/firefox/checksums @@ -1,9 +1,9 @@ -c9f127741beabde78b021dc95b1740259d01677d461400682cb30e072126f075 +fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 -e7b948b4680e5de9552a03995482d41ffad1b59569736693648bd4d570b952aa +ba6e380bc3d2cbd1b3a505ab97687498335c334d8a4be7f465ad30ee366806c7 86ce49e650dd117f0f2928a7f810a58df526b1087c274d35eeb9c5bbf09eac5b 4a232e3aa3973894a58c126b9e901c924d4e1ca3e00c4fc82d08de4b880183a9 -ee8f36e22d955bdbad10e93813e928e783c965dc640c4bcea8b95ef9d0b9d23d +1fe6fbb6a45596f6694f5d7dd2896f59d46754a3d6e01f78dd8c9a2e9d7a3c9e diff --git a/extra/firefox/patches/fix-clang-as.patch b/extra/firefox/patches/fix-clang-as.patch index 6fe268b4..125487d2 100644 --- a/extra/firefox/patches/fix-clang-as.patch +++ b/extra/firefox/patches/fix-clang-as.patch @@ -1,5 +1,4 @@ diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile -index 0b8c6f42fa..e9668e100d 100644 --- a/security/nss/lib/freebl/Makefile +++ b/security/nss/lib/freebl/Makefile @@ -753,7 +753,6 @@ $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(OBJ_SUFFIX): CFLAGS += -mssse3 @@ -11,12 +10,11 @@ index 0b8c6f42fa..e9668e100d 100644 endif diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp -index e7703baf8d..3ee3435de0 100644 --- a/security/nss/lib/freebl/freebl.gyp +++ b/security/nss/lib/freebl/freebl.gyp @@ -19,13 +19,10 @@ 'conditions': [ - [ 'cc_is_clang==1', { + [ 'cc_is_clang==1 and force_integrated_as!=1', { 'cflags': [ - '-no-integrated-as', ], @@ -29,12 +27,11 @@ index e7703baf8d..3ee3435de0 100644 }], ], diff --git a/security/nss/lib/freebl/freebl_base.gypi b/security/nss/lib/freebl/freebl_base.gypi -index afbffac729..795bbd87f6 100644 --- a/security/nss/lib/freebl/freebl_base.gypi +++ b/security/nss/lib/freebl/freebl_base.gypi @@ -74,13 +74,10 @@ 'conditions': [ - [ 'cc_is_clang==1 and fuzz!=1 and coverage!=1', { + [ 'cc_is_clang==1 and fuzz!=1 and coverage!=1 and force_integrated_as!=1', { 'cflags': [ - '-no-integrated-as', ], @@ -46,3 +43,6 @@ index afbffac729..795bbd87f6 100644 ], }], ], +-- +2.35.1 + diff --git a/extra/firefox/patches/no-x11.patch b/extra/firefox/patches/no-x11.patch index b1c64d02..ff18f9ba 100644 --- a/extra/firefox/patches/no-x11.patch +++ b/extra/firefox/patches/no-x11.patch @@ -1,18 +1,3 @@ -diff --git a/dom/media/systemservices/video_engine/desktop_device_info_x11.cc b/dom/media/systemservices/video_engine/desktop_device_info_x11.cc -index a9f88f0f90..7cfe45533c 100644 ---- a/dom/media/systemservices/video_engine/desktop_device_info_x11.cc -+++ b/dom/media/systemservices/video_engine/desktop_device_info_x11.cc -@@ -7,10 +7,6 @@ - - #include - --#if !defined(WEBRTC_USE_X11) || !defined(MOZ_X11) --# error Bad build setup, some X11 defines are missing --#endif -- - namespace webrtc { - - DesktopDeviceInfo* DesktopDeviceInfoImpl::Create() { diff --git a/gfx/angle/moz.build.common b/gfx/angle/moz.build.common index 8769a2fe96..6976853b35 100644 --- a/gfx/angle/moz.build.common @@ -440,10 +425,10 @@ index b1e2b58621..576ec91669 100644 for var in ( diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index ce001e9382..80d1694a11 100644 +index d997493..a6cef19 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -4116,6 +4116,7 @@ static void PR_CALLBACK ReadAheadDlls_ThreadStart(void* arg) { +@@ -4493,6 +4493,7 @@ static void PR_CALLBACK ReadAheadDlls_ThreadStart(void* arg) { #if defined(MOZ_WAYLAND) bool IsWaylandEnabled() { @@ -451,16 +436,16 @@ index ce001e9382..80d1694a11 100644 const char* waylandDisplay = PR_GetEnv("WAYLAND_DISPLAY"); if (!waylandDisplay) { return false; -@@ -4145,6 +4146,9 @@ bool IsWaylandEnabled() { - "Running Wayland backend on Gtk3 < 3.22. Expect issues/glitches"); +@@ -4513,6 +4514,9 @@ bool IsWaylandEnabled() { + return true; + } } - return enabled; +# else + return true; +# endif - } - #endif - + # ifdef EARLY_BETA_OR_EARLIER + // Enable by default when we're running on a recent enough GTK version. We'd + // like to check further details like compositor version and so on ideally diff --git a/toolkit/xre/nsGDKErrorHandler.cpp b/toolkit/xre/nsGDKErrorHandler.cpp index 421abdf12f..c7803cf973 100644 --- a/toolkit/xre/nsGDKErrorHandler.cpp @@ -687,19 +672,11 @@ index 38c07bd812..8f2c10894a 100644 if defined('NS_PRINTING'): Classes += [ { -diff --git a/widget/x11/keysym2ucs.c b/widget/gtk/keysym2ucs.c -similarity index 100% -rename from widget/x11/keysym2ucs.c -rename to widget/gtk/keysym2ucs.c -diff --git a/widget/x11/keysym2ucs.h b/widget/gtk/keysym2ucs.h -similarity index 100% -rename from widget/x11/keysym2ucs.h -rename to widget/gtk/keysym2ucs.h diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build -index 1d82fc36c2..98af9fca3d 100644 +index 320318b..d83a256 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -34,15 +34,23 @@ EXPORTS += [ +@@ -34,16 +34,24 @@ EXPORTS += [ EXPORTS.mozilla += ["WidgetUtilsGtk.h"] EXPORTS.mozilla.widget += [ @@ -712,6 +689,7 @@ index 1d82fc36c2..98af9fca3d 100644 ] UNIFIED_SOURCES += [ + "AsyncGtkClipboardRequest.cpp", + "CompositorWidgetChild.cpp", + "CompositorWidgetParent.cpp", "GfxInfo.cpp", @@ -723,7 +701,7 @@ index 1d82fc36c2..98af9fca3d 100644 "MozContainer.cpp", "MPRISServiceHandler.cpp", "NativeKeyBindings.cpp", -@@ -58,6 +66,7 @@ UNIFIED_SOURCES += [ +@@ -59,6 +67,7 @@ UNIFIED_SOURCES += [ "nsLookAndFeel.cpp", "nsSound.cpp", "nsToolkit.cpp", @@ -789,7 +767,7 @@ index 1a86468b4f..eee67ed3a9 100644 union wl_argument; diff --git a/widget/gtk/nsClipboard.cpp b/widget/gtk/nsClipboard.cpp -index 8fdd8e38dc..ea0eaae2de 100644 +index 800fde7..f5e9ef7 100644 --- a/widget/gtk/nsClipboard.cpp +++ b/widget/gtk/nsClipboard.cpp @@ -9,7 +9,9 @@ @@ -802,8 +780,8 @@ index 8fdd8e38dc..ea0eaae2de 100644 +#endif #if defined(MOZ_WAYLAND) # include "nsClipboardWayland.h" - # include "nsClipboardWaylandAsync.h" -@@ -37,7 +39,6 @@ + #endif +@@ -36,7 +38,6 @@ #include "imgIContainer.h" #include @@ -811,7 +789,7 @@ index 8fdd8e38dc..ea0eaae2de 100644 #include "mozilla/Encoding.h" -@@ -106,17 +107,21 @@ nsClipboard::~nsClipboard() { +@@ -134,13 +135,17 @@ nsClipboard::~nsClipboard() { NS_IMPL_ISUPPORTS(nsClipboard, nsIClipboard, nsIObserver) nsresult nsClipboard::Init(void) { @@ -823,11 +801,7 @@ index 8fdd8e38dc..ea0eaae2de 100644 #if defined(MOZ_WAYLAND) - } else if (widget::GdkIsWaylandDisplay()) { + if (widget::GdkIsWaylandDisplay()) { - if (StaticPrefs::widget_wayland_async_clipboard_enabled_AtStartup()) { - mContext = new nsRetrievalContextWaylandAsync(); - } else { - mContext = new nsRetrievalContextWayland(); - } + mContext = new nsRetrievalContextWayland(); + } #endif - } else { diff --git a/extra/firefox/version b/extra/firefox/version index ee72f07a..d821b67b 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -97.0.2 1 +98.0 1