diff options
-rw-r--r-- | 2000_system_harfbuzz_support.patch | 18 | ||||
-rw-r--r-- | 2001_system_graphite2_support.patch | 14 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | mozilla-1516081.patch | 4 | ||||
-rw-r--r-- | unity-menubar.patch | 128 |
5 files changed, 73 insertions, 109 deletions
diff --git a/2000_system_harfbuzz_support.patch b/2000_system_harfbuzz_support.patch index a9a5e967f2c5..e9ec5f17ff28 100644 --- a/2000_system_harfbuzz_support.patch +++ b/2000_system_harfbuzz_support.patch @@ -197,26 +197,16 @@ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -233,16 +233,19 @@ if CONFIG['SERVO_TARGET_DIR']: - OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] - - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] +@@ -226,6 +226,9 @@ + if CONFIG['MOZ_SYSTEM_WEBP']: + OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] + if CONFIG['MOZ_SYSTEM_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBVPX']: - OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] - - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + diff --git a/toolkit/moz.configure b/toolkit/moz.configure --- a/toolkit/moz.configure +++ b/toolkit/moz.configure diff --git a/2001_system_graphite2_support.patch b/2001_system_graphite2_support.patch index e37cafea7bbf..a68196b17806 100644 --- a/2001_system_graphite2_support.patch +++ b/2001_system_graphite2_support.patch @@ -169,12 +169,7 @@ diff --git a/old-configure.in b/old-configure.in diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -236,16 +236,19 @@ if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] - - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - +@@ -229,5 +229,8 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] @@ -183,12 +178,7 @@ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build + if CONFIG['MOZ_SYSTEM_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - - if CONFIG['MOZ_SYSTEM_LIBVPX']: - OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS'] - - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + diff --git a/toolkit/moz.configure b/toolkit/moz.configure --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -16,7 +16,7 @@ _pgo=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=64.0.2 +pkgver=65.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') @@ -36,7 +36,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'speech-dispatcher: Text-to-Speech') provides=("firefox=${pkgver}") conflicts=('firefox') -_patchrev=821cfbe8efcc +_patchrev=87f893cf45b9 options=('!emptydirs') _patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev _repo=https://hg.mozilla.org/mozilla-unified @@ -203,14 +203,14 @@ md5sums=('SKIP' '5cee310a9040ccc5abcf29742b84aeb8' '05bb69d25fb3572c618e3adf1ee7b670' 'd7ce23a18da21c05cd756766e177834f' - '9e1fecba47c5f398b54fd85647c19418' - 'b632f9080acc9d479d446a378b1ed15d' - '0661e259fe57df87fca791f4aeb78da0' - '1ee323eb756e4126bcb828aea07f5766' + 'bf2f398aac1ae3d29ae6477325c50c0f' + 'b2fef35fb6a6a019b597dc559a1d0e12' + 'f1c5db18b8910b80f1933af1f4fe7c2b' + '51d059491a3aba215b6cea959e9c5d05' 'fe24f5ea463013bb7f1c12d12dce41b2' '3fa8bd22d97248de529780f5797178af' - 'f31a90ed4c0b0c15346ea5098765771f' - 'a85ca9c88f49184c8b0feae206f0ba0c' + '554514bf00a7927a85280f19e52a55fb' + '5b0d39aebb1ce84f89bda300320b851f' 'becf6bf9ceb6008401832c855ccadff9' - 'fded487ab30d9ed99a3e5ea6807a0dca' + '79d27c8896913c7d87b148240995ab69' 'f867ae41a722630cc5567e2dcc51676d') diff --git a/mozilla-1516081.patch b/mozilla-1516081.patch index 174bbfb74040..724ccd182af6 100644 --- a/mozilla-1516081.patch +++ b/mozilla-1516081.patch @@ -23,10 +23,10 @@ diff -up firefox-64.0/build/moz.configure/toolchain.configure.1516081 firefox-64 diff -up firefox-64.0/toolkit/components/terminator/nsTerminator.cpp.1516081 firefox-64.0/toolkit/components/terminator/nsTerminator.cpp --- firefox-64.0/toolkit/components/terminator/nsTerminator.cpp.1516081 2019-01-03 15:30:08.207368056 +0100 +++ firefox-64.0/toolkit/components/terminator/nsTerminator.cpp 2019-01-03 15:31:33.445034029 +0100 -@@ -441,6 +441,12 @@ nsTerminator::StartWatchdog() +@@ -419,6 +419,12 @@ } } - # endif + #endif + // Disable watchdog for PGO train builds - writting profile information at + // exit may take time and it is better to make build hang rather than + // silently produce poorly performing binary. diff --git a/unity-menubar.patch b/unity-menubar.patch index 683db2ba312a..d9c9697f0ecd 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -14,9 +14,9 @@ <menu id="file-menu" label="&fileMenu.label;" --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -5702,11 +5702,17 @@ function onViewToolbarsPopupShowing(aEve +@@ -5568,11 +5568,17 @@ function onViewToolbarsPopupShowing(aEve - let toolbarNodes = gNavToolbox.children; + let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); + let shellShowingMenubar = document.documentElement.getAttribute("shellshowingmenubar") == "true"; + @@ -45,7 +45,7 @@ id="organizeButton" label="&organize.label;" --- a/dom/xul/XULPopupElement.cpp +++ b/dom/xul/XULPopupElement.cpp -@@ -180,6 +180,10 @@ XULPopupElement::GetState(nsString& aSta +@@ -157,6 +157,10 @@ void XULPopupElement::GetState(nsString& // set this here in case there's no frame for the popup aState.AssignLiteral("closed"); @@ -53,10 +53,10 @@ + nsAutoString nativeState; +#endif + - nsMenuPopupFrame *menuPopupFrame = do_QueryFrame(GetPrimaryFrame()); + nsMenuPopupFrame* menuPopupFrame = do_QueryFrame(GetPrimaryFrame()); if (menuPopupFrame) { switch (menuPopupFrame->PopupState()) { -@@ -203,6 +207,11 @@ XULPopupElement::GetState(nsString& aSta +@@ -180,6 +184,11 @@ void XULPopupElement::GetState(nsString& break; } } @@ -67,10 +67,10 @@ +#endif } - nsINode* + nsINode* XULPopupElement::GetTriggerNode() const { --- a/dom/xul/moz.build +++ b/dom/xul/moz.build -@@ -73,6 +73,11 @@ LOCAL_INCLUDES += [ +@@ -75,6 +75,11 @@ LOCAL_INCLUDES += [ '/layout/xul', ] @@ -97,7 +97,7 @@ LOCAL_INCLUDES += [ --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -273,6 +273,9 @@ pref("dom.window.event.enabled", false); +@@ -271,6 +271,9 @@ pref("dom.window.event.enabled", false); pref("browser.sessionhistory.max_total_viewers", -1); pref("ui.use_native_colors", true); @@ -109,7 +109,7 @@ // Pop up context menu on mouseup instead of mousedown, if that's the OS default. --- a/toolkit/content/xul.css +++ b/toolkit/content/xul.css -@@ -295,6 +295,18 @@ toolbar[type="menubar"][autohide="true"] +@@ -254,6 +254,18 @@ toolbar[type="menubar"] { } %endif @@ -130,34 +130,23 @@ } --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -39,10 +39,17 @@ UNIFIED_SOURCES += [ - 'nsAppShell.cpp', - 'nsBidiKeyboard.cpp', - 'nsColorPicker.cpp', +@@ -52,6 +52,15 @@ UNIFIED_SOURCES += [ + ] + + SOURCES += [ + 'nsDbusmenu.cpp', - 'nsFilePicker.cpp', - 'nsGtkKeyUtils.cpp', - 'nsImageToPixbuf.cpp', - 'nsLookAndFeel.cpp', ++ 'nsMenu.cpp', # conflicts with X11 headers + 'nsMenuBar.cpp', + 'nsMenuContainer.cpp', + 'nsMenuItem.cpp', + 'nsMenuObject.cpp', + 'nsMenuSeparator.cpp', + 'nsNativeMenuDocListener.cpp', - 'nsNativeThemeGTK.cpp', - 'nsSound.cpp', - 'nsToolkit.cpp', -@@ -55,6 +62,8 @@ UNIFIED_SOURCES += [ - ] - - SOURCES += [ -+ 'nsMenu.cpp', # conflicts with X11 headers + 'nsNativeMenuService.cpp', 'nsWindow.cpp', # conflicts with X11 headers ] -@@ -126,6 +135,7 @@ FINAL_LIBRARY = 'xul' +@@ -119,6 +128,7 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/layout/base', '/layout/generic', @@ -167,7 +156,7 @@ '/widget', --- /dev/null +++ b/widget/gtk/nsDbusmenu.cpp -@@ -0,0 +1,63 @@ +@@ -0,0 +1,61 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -222,10 +211,8 @@ + } + + LOAD_LIBRARY(DbusmenuGlib, "libdbusmenu-glib.so.4") -+#if (MOZ_WIDGET_GTK == 3) ++#ifdef MOZ_WIDGET_GTK + LOAD_LIBRARY(DbusmenuGtk, "libdbusmenu-gtk3.so.4") -+#else -+ LOAD_LIBRARY(DbusmenuGtk, "libdbusmenu-gtk.so.4") +#endif +#undef LOAD_LIBRARY + @@ -2227,7 +2214,7 @@ +#endif /* __nsMenuContainer_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuItem.cpp -@@ -0,0 +1,767 @@ +@@ -0,0 +1,765 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -2265,9 +2252,7 @@ + +#include <gdk/gdk.h> +#include <gdk/gdkkeysyms.h> -+#if (MOZ_WIDGET_GTK == 3) +#include <gdk/gdkkeysyms-compat.h> -+#endif +#include <gdk/gdkx.h> +#include <gtk/gtk.h> + @@ -5161,8 +5146,8 @@ #include "nsIComponentRegistrar.h" #include "nsComponentManagerUtils.h" #include "mozilla/gfx/2D.h" -@@ -78,6 +80,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxI - } +@@ -81,6 +83,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxI + } // namespace mozilla #endif +NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsNativeMenuService, @@ -5171,33 +5156,33 @@ #ifdef NS_PRINTING NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecGTK) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSettingsServiceGTK, Init) -@@ -187,6 +192,7 @@ NS_DEFINE_NAMED_CID(NS_IMAGE_TO_PIXBUF_C +@@ -182,6 +187,7 @@ NS_DEFINE_NAMED_CID(NS_IMAGE_TO_PIXBUF_C NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID); NS_DEFINE_NAMED_CID(NS_GFXINFO_CID); #endif +NS_DEFINE_NAMED_CID(NS_NATIVEMENUSERVICE_CID); - static const mozilla::Module::CIDEntry kWidgetCIDs[] = { -@@ -219,6 +225,7 @@ static const mozilla::Module::CIDEntry k - { &kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceGTKConstructor }, - { &kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor }, + {&kNS_APPSHELL_CID, false, nullptr, nsAppShellConstructor, +@@ -225,6 +231,7 @@ static const mozilla::Module::CIDEntry k + {&kNS_IDLE_SERVICE_CID, false, nullptr, nsIdleServiceGTKConstructor}, + {&kNS_GFXINFO_CID, false, nullptr, mozilla::widget::GfxInfoConstructor}, #endif -+ { &kNS_NATIVEMENUSERVICE_CID, true, nullptr, nsNativeMenuServiceConstructor }, - { nullptr } - }; ++ {&kNS_NATIVEMENUSERVICE_CID, true, nullptr, nsNativeMenuServiceConstructor}, + {nullptr}}; -@@ -252,6 +259,7 @@ static const mozilla::Module::ContractID - { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID }, - { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID }, + static const mozilla::Module::ContractIDEntry kWidgetContracts[] = { +@@ -263,6 +270,7 @@ static const mozilla::Module::ContractID + {"@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID}, + {"@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID}, #endif -+ { "@mozilla.org/widget/nativemenuservice;1", &kNS_NATIVEMENUSERVICE_CID }, - { nullptr } - }; ++ {"@mozilla.org/widget/nativemenuservice;1", &kNS_NATIVEMENUSERVICE_CID}, + {nullptr}}; + static void nsWidgetGtk2ModuleDtor() { --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp -@@ -68,6 +68,7 @@ +@@ -71,6 +71,7 @@ #include "mozilla/Assertions.h" #include "mozilla/Likely.h" @@ -5205,21 +5190,20 @@ #include "mozilla/Preferences.h" #include "nsIPrefService.h" #include "nsIGConfService.h" -@@ -5279,6 +5280,11 @@ nsWindow::HideWindowChrome(bool aShouldH - SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); +@@ -4815,6 +4816,10 @@ void nsWindow::HideWindowChrome(bool aSh + SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); } -+void -+nsWindow::SetMenuBar(UniquePtr<nsMenuBar> aMenuBar) { -+ mMenuBar = std::move(aMenuBar); ++void nsWindow::SetMenuBar(UniquePtr<nsMenuBar> aMenuBar) { ++ mMenuBar = std::move(aMenuBar); +} + - bool - nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, - bool aIsWheel, bool aAlwaysRollup) + bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel, + bool aAlwaysRollup) { + nsIRollupListener *rollupListener = GetActiveRollupListener(); --- a/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h -@@ -41,6 +41,8 @@ +@@ -38,6 +38,8 @@ #include "IMContextWrapper.h" @@ -5228,21 +5212,21 @@ #undef LOG #ifdef MOZ_LOGGING -@@ -179,6 +181,8 @@ public: - nsIScreen* aTargetScreen = nullptr) override; - virtual void HideWindowChrome(bool aShouldHide) override; +@@ -171,6 +173,8 @@ class nsWindow final : public nsBaseWidg + nsIScreen* aTargetScreen = nullptr) override; + virtual void HideWindowChrome(bool aShouldHide) override; -+ void SetMenuBar(mozilla::UniquePtr<nsMenuBar> aMenuBar); ++ void SetMenuBar(mozilla::UniquePtr<nsMenuBar> aMenuBar); + - /** - * GetLastUserInputTime returns a timestamp for the most recent user input - * event. This is intended for pointer grab requests (including drags). -@@ -660,6 +664,8 @@ private: + /** + * GetLastUserInputTime returns a timestamp for the most recent user input + * event. This is intended for pointer grab requests (including drags). +@@ -644,6 +648,8 @@ class nsWindow final : public nsBaseWidg - mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; - static CSDSupportLevel sCSDSupportLevel; + mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; + static CSDSupportLevel sCSDSupportLevel; + -+ mozilla::UniquePtr<nsMenuBar> mMenuBar; ++ mozilla::UniquePtr<nsMenuBar> mMenuBar; }; #endif /* __nsWindow_h__ */ @@ -5263,7 +5247,7 @@ --- a/xpfe/appshell/nsWebShellWindow.cpp +++ b/xpfe/appshell/nsWebShellWindow.cpp -@@ -66,7 +66,7 @@ +@@ -68,7 +68,7 @@ #include "gfxPlatform.h" @@ -5294,7 +5278,7 @@ import sys # Static atom definitions, used to generate nsGkAtomList.h. -@@ -2321,7 +2322,7 @@ STATIC_ATOMS = [ +@@ -2391,7 +2392,7 @@ STATIC_ATOMS = [ InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"), InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"), # END ATOMS |