mirror of
https://abf.rosa.ru/djam/newmoon.git
synced 2025-02-24 07:32:56 +00:00
Try to fix firefox-kde patch
This commit is contained in:
Andrey Bondrov
parent
35bd0442b9
commit
82f5ad97cd
2 changed files with 15 additions and 38 deletions
|
|
@ -18,7 +18,7 @@
|
|||
Summary: Web browser based on Goanna engine
|
||||
Name: newmoon
|
||||
Version: 26.3.1
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: MPLv2.0
|
||||
Group: Networking/WWW
|
||||
Url: http://www.palemoon.org
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -urN Pale-Moon-26.3.1_Release/browser/base/content/browser-kde.xul Pale-Moon-26.3.1_Release-patched/browser/base/content/browser-kde.xul
|
||||
--- Pale-Moon-26.3.1_Release/browser/base/content/browser-kde.xul 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/base/content/browser-kde.xul 2016-06-27 14:33:00.377534253 +1000
|
||||
@@ -0,0 +1,1097 @@
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/base/content/browser-kde.xul 2016-06-27 20:03:01.818117131 +1000
|
||||
@@ -0,0 +1,1074 @@
|
||||
+#filter substitution
|
||||
+<?xml version="1.0"?>
|
||||
+# -*- Mode: HTML -*-
|
||||
|
|
@ -80,15 +80,6 @@ diff -urN Pale-Moon-26.3.1_Release/browser/base/content/browser-kde.xul Pale-Moo
|
|||
+ <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
|
||||
+ accesskey="&unpinTab.accesskey;"
|
||||
+ oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
|
||||
+ <menu id="context_tabViewMenu" label="&moveToGroup.label;"
|
||||
+ accesskey="&moveToGroup.accesskey;">
|
||||
+ <menupopup id="context_tabViewMenuPopup"
|
||||
+ onpopupshowing="if (event.target == this) TabView.moveToGroupPopupShowing(event);">
|
||||
+ <menuseparator id="context_tabViewNamedGroups" hidden="true"/>
|
||||
+ <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;"
|
||||
+ oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
|
||||
+ </menupopup>
|
||||
+ </menu>
|
||||
+ <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
|
||||
+ accesskey="&moveToNewWindow.accesskey;"
|
||||
+ tbattr="tabbrowser-multiple"
|
||||
|
|
@ -819,16 +810,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/base/content/browser-kde.xul Pale-Moo
|
|||
+ label="&listAllTabs.label;"
|
||||
+ tooltiptext="&listAllTabs.label;"
|
||||
+ removable="true">
|
||||
+ <menupopup id="alltabs-popup"
|
||||
+ position="after_end">
|
||||
+ <menuitem id="menu_tabview"
|
||||
+ class="menuitem-iconic"
|
||||
+ key="key_tabview"
|
||||
+ label="&viewTabGroups.label;"
|
||||
+ command="Browser:ToggleTabView"
|
||||
+ observes="tabviewGroupsNumber"/>
|
||||
+ <menuseparator id="alltabs-popup-separator"/>
|
||||
+ </menupopup>
|
||||
+ <menupopup id="alltabs-popup" position="after_end" />
|
||||
+ </toolbarbutton>
|
||||
+
|
||||
+ <toolbarbutton id="tabs-closebutton"
|
||||
|
|
@ -942,13 +924,8 @@ diff -urN Pale-Moon-26.3.1_Release/browser/base/content/browser-kde.xul Pale-Moo
|
|||
+ mousethrough="always">
|
||||
+ <image/>
|
||||
+ </toolbaritem>
|
||||
+
|
||||
+ <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
+ label="&tabGroupsButton.label;"
|
||||
+ command="Browser:ToggleTabView"
|
||||
+ tooltiptext="&tabGroupsButton.tooltip;"
|
||||
+ observes="tabviewGroupsNumber"/>
|
||||
+ </toolbarpalette>
|
||||
+
|
||||
+ </toolbox>
|
||||
+
|
||||
+ <hbox id="fullscr-toggler" collapsed="true"/>
|
||||
|
|
@ -1101,7 +1078,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/base/content/browser-kde.xul Pale-Moo
|
|||
+</window>
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/base/jar.mn Pale-Moon-26.3.1_Release-patched/browser/base/jar.mn
|
||||
--- Pale-Moon-26.3.1_Release/browser/base/jar.mn 2016-06-24 00:37:32.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/base/jar.mn 2016-06-27 14:35:24.189523961 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/base/jar.mn 2016-06-27 20:04:41.596109991 +1000
|
||||
@@ -55,6 +55,8 @@
|
||||
* content/browser/browser-title.css (content/browser-title.css)
|
||||
* content/browser/browser.js (content/browser.js)
|
||||
|
|
@ -1113,7 +1090,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/base/jar.mn Pale-Moon-26.3.1_Release-
|
|||
content/browser/imagedocument.png (content/imagedocument.png)
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/components/build/nsModule.cpp Pale-Moon-26.3.1_Release-patched/browser/components/build/nsModule.cpp
|
||||
--- Pale-Moon-26.3.1_Release/browser/components/build/nsModule.cpp 2016-06-24 00:37:32.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/build/nsModule.cpp 2016-06-27 14:33:00.377534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/build/nsModule.cpp 2016-06-27 19:56:07.827146759 +1000
|
||||
@@ -13,7 +13,7 @@
|
||||
#elif defined(XP_MACOSX)
|
||||
#include "nsMacShellService.h"
|
||||
|
|
@ -1143,7 +1120,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/components/build/nsModule.cpp Pale-Mo
|
|||
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/components/preferences/advanced.js Pale-Moon-26.3.1_Release-patched/browser/components/preferences/advanced.js
|
||||
--- Pale-Moon-26.3.1_Release/browser/components/preferences/advanced.js 2016-06-24 00:37:32.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/preferences/advanced.js 2016-06-27 14:33:00.377534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/preferences/advanced.js 2016-06-27 19:56:07.827146759 +1000
|
||||
@@ -28,6 +28,12 @@
|
||||
advancedPrefs.selectedIndex = preference.value;
|
||||
}
|
||||
|
|
@ -1177,7 +1154,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/components/preferences/advanced.js Pa
|
|||
document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/Makefile.in Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/Makefile.in
|
||||
--- Pale-Moon-26.3.1_Release/browser/components/shell/src/Makefile.in 2016-06-24 00:37:32.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/Makefile.in 2016-06-27 14:33:00.377534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/Makefile.in 2016-06-27 19:56:07.827146759 +1000
|
||||
@@ -22,5 +22,7 @@
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
|
|
@ -1188,7 +1165,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/Makefile.in Pale
|
|||
rm -f $(DIST)/lib/$(LIBRARY_NAME).lib
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/moz.build Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/moz.build
|
||||
--- Pale-Moon-26.3.1_Release/browser/components/shell/src/moz.build 2016-06-24 00:37:32.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/moz.build 2016-06-27 14:33:00.378534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/moz.build 2016-06-27 19:56:07.828146759 +1000
|
||||
@@ -16,7 +16,9 @@
|
||||
]
|
||||
elif CONFIG['MOZ_WIDGET_GTK']:
|
||||
|
|
@ -1201,7 +1178,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/moz.build Pale-M
|
|||
if CPP_SOURCES:
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/nsKDEShellService.cpp Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsKDEShellService.cpp
|
||||
--- Pale-Moon-26.3.1_Release/browser/components/shell/src/nsKDEShellService.cpp 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsKDEShellService.cpp 2016-06-27 14:33:00.378534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsKDEShellService.cpp 2016-06-27 19:56:07.828146759 +1000
|
||||
@@ -0,0 +1,234 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
|
|
@ -1439,7 +1416,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/nsKDEShellServic
|
|||
+ }
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/nsKDEShellService.h Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsKDEShellService.h
|
||||
--- Pale-Moon-26.3.1_Release/browser/components/shell/src/nsKDEShellService.h 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsKDEShellService.h 2016-06-27 14:33:00.378534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsKDEShellService.h 2016-06-27 19:56:07.828146759 +1000
|
||||
@@ -0,0 +1,59 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
|
|
@ -1502,7 +1479,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/nsKDEShellServic
|
|||
+#endif // nskdeshellservice_h____
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/nsUnixShellService.cpp Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsUnixShellService.cpp
|
||||
--- Pale-Moon-26.3.1_Release/browser/components/shell/src/nsUnixShellService.cpp 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsUnixShellService.cpp 2016-06-27 14:33:00.378534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsUnixShellService.cpp 2016-06-27 19:56:07.828146759 +1000
|
||||
@@ -0,0 +1,52 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
|
|
@ -1558,7 +1535,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/nsUnixShellServi
|
|||
+}
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/nsUnixShellService.h Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsUnixShellService.h
|
||||
--- Pale-Moon-26.3.1_Release/browser/components/shell/src/nsUnixShellService.h 1970-01-01 10:00:00.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsUnixShellService.h 2016-06-27 14:33:00.378534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/components/shell/src/nsUnixShellService.h 2016-06-27 19:56:07.828146759 +1000
|
||||
@@ -0,0 +1,45 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
|
|
@ -1607,7 +1584,7 @@ diff -urN Pale-Moon-26.3.1_Release/browser/components/shell/src/nsUnixShellServi
|
|||
+#endif // nsunixshellservice_h____
|
||||
diff -urN Pale-Moon-26.3.1_Release/browser/installer/package-manifest.in Pale-Moon-26.3.1_Release-patched/browser/installer/package-manifest.in
|
||||
--- Pale-Moon-26.3.1_Release/browser/installer/package-manifest.in 2016-06-24 00:37:32.000000000 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/installer/package-manifest.in 2016-06-27 14:33:00.378534253 +1000
|
||||
+++ Pale-Moon-26.3.1_Release-patched/browser/installer/package-manifest.in 2016-06-27 19:56:07.828146759 +1000
|
||||
@@ -585,9 +585,11 @@
|
||||
; Technically this is an app pref file, but we are keeping it in the original
|
||||
; gre location for now.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue