--- a/MozillaFirefox/MozillaFirefox.spec Mon Jul 23 06:33:59 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Wed Jul 25 11:15:27 2012 +0200
@@ -17,9 +17,9 @@
#
-%define major 14
-%define mainver %major.99
-%define update_channel beta
+%define major 15
+%define mainver %major.98
+%define update_channel aurora
Name: MozillaFirefox
BuildRequires: Mesa-devel
@@ -44,7 +44,7 @@
%else
BuildRequires: wireless-tools
%endif
-BuildRequires: mozilla-nspr-devel >= 4.9.1
+BuildRequires: mozilla-nspr-devel >= 4.9.2
BuildRequires: mozilla-nss-devel >= 3.13.5
BuildRequires: nss-shared-helper-devel
%if %suse_version > 1140
@@ -54,7 +54,7 @@
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2012071800
+%define releasedate 2012072300
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@@ -94,7 +94,6 @@
Patch10: mozilla-sle11.patch
Patch11: mozilla-disable-neon-option.patch
Patch13: mozilla-arm-disable-edsp.patch
-Patch14: mozilla-crashreporter-restart-args.patch
Patch15: mozilla-gstreamer.patch
Patch16: mozilla-ppc.patch
# Firefox/browser
@@ -125,7 +124,7 @@
%define desktop_file_name %{name}
%endif
### build options
-%define branding 1
+%define branding 0
%define localize 1
%ifarch ppc ppc64 s390 s390x ia64 %arm
%define crashreporter 0
@@ -223,7 +222,6 @@
%endif
#%patch11 -p1
%patch13 -p1
-%patch14 -p1
%patch15 -p1
%patch16 -p1
#
@@ -275,8 +273,8 @@
ac_add_options --sysconfdir=%{_sysconfdir}
ac_add_options --mandir=%{_mandir}
ac_add_options --includedir=%{_includedir}
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
+#ac_add_options --with-system-nspr
+#ac_add_options --with-system-nss
ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
#ac_add_options --with-system-jpeg # libjpeg-turbo is used internally
#ac_add_options --with-system-png # doesn't work because of missing APNG support
--- a/MozillaFirefox/create-tar.sh Mon Jul 23 06:33:59 2012 +0200
+++ b/MozillaFirefox/create-tar.sh Wed Jul 25 11:15:27 2012 +0200
@@ -1,9 +1,9 @@
#!/bin/bash
-CHANNEL="beta"
+CHANNEL="aurora"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_15_0b1_RELEASE"
-VERSION="14.99"
+RELEASE_TAG="default"
+VERSION="15.98"
# mozilla
echo "cloning $BRANCH..."
--- a/MozillaFirefox/mozilla-crashreporter-restart-args.patch Mon Jul 23 06:33:59 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-crashreporter-restart-args.patch
\ No newline at end of file
--- a/firefox-kde.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/firefox-kde.patch Wed Jul 25 11:15:27 2012 +0200
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1126 @@
+@@ -0,0 +1,1210 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -29,7 +29,7 @@
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-+ onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();"
++ onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
+ title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
+ title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
+#ifdef XP_MACOSX
@@ -142,6 +142,7 @@
+ footertype="promobox"
+ orient="vertical"
+ ignorekeys="true"
++ consumeoutsideclicks="true"
+ hidden="true"
+ onpopupshown="StarUI.panelShown(event);"
+ aria-labelledby="editBookmarkPanelTitle">
@@ -186,6 +187,49 @@
+ </hbox>
+ </panel>
+
++ <panel id="editSharePopup"
++ type="arrow"
++ orient="vertical"
++ ignorekeys="true"
++ hidden="true"
++ onpopupshown="SocialShareButton.panelShown(event);"
++ consumeoutsideclicks="true"
++ level="top">
++ <hbox id="editSharePopupBottomButtons" pack="end">
++#ifdef XP_UNIX
++ <button id="editSharePopupUndoButton"
++ class="editSharePopupBottomButton"
++ label="&social.sharePopup.undo.label;"
++ accesskey="&social.sharePopup.undo.accesskey;"
++ command="Social:UnsharePage"/>
++ <button id="editSharePopupOkButton"
++ class="editSharePopupBottomButton"
++ default="true"
++ autofocus="autofocus"
++ label="&social.sharePopup.ok.label;"
++ accesskey="&social.sharePopup.ok.accesskey;"
++ oncommand="SocialShareButton.dismissSharePopup();"/>
++#else
++ <button id="editSharePopupOkButton"
++ class="editSharePopupBottomButton"
++ default="true"
++ autofocus="autofocus"
++ label="&social.sharePopup.ok.label;"
++ accesskey="&social.sharePopup.ok.accesskey;"
++ oncommand="SocialShareButton.dismissSharePopup();"/>
++ <button id="editSharePopupUndoButton"
++ class="editSharePopupBottomButton"
++ label="&social.sharePopup.undo.label;"
++ accesskey="&social.sharePopup.undo.accesskey;"
++ command="Social:UnsharePage"/>
++#endif
++ </hbox>
++ </panel>
++
++ <panel id="social-notification-panel" type="arrow" hidden="true" noautofocus="true">
++ <browser id="social-notification-browser" type="content" flex="1"/>
++ </panel>
++
+ <menupopup id="inspector-node-popup">
+ <menuitem id="inspectorHTMLCopyInner"
+ label="&inspectorHTMLCopyInner.label;"
@@ -264,6 +308,7 @@
+ type="arrow"
+ hidden="true"
+ noautofocus="true"
++ consumeoutsideclicks="true"
+ onpopupshown="gIdentityHandler.onPopupShown(event);"
+ level="top">
+ <hbox id="identity-popup-container" align="top">
@@ -349,11 +394,8 @@
+ <tooltip id="bhTooltip"/>
+
+ <panel id="customizeToolbarSheetPopup"
-+ noautohide="true">
-+ <iframe id="customizeToolbarSheetIFrame"
-+ style="&dialog.dimensions;"
-+ hidden="true"/>
-+ </panel>
++ noautohide="true"
++ sheetstyle="&dialog.dimensions;"/>
+
+ <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
+
@@ -492,19 +534,16 @@
+ We only add the identity-box button to the tab order when the location bar
+ has focus, otherwise pressing F6 focuses it instead of the location bar -->
+ <box id="identity-box" role="button"
++ align="center"
+ onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+ ondragstart="gIdentityHandler.onDragStart(event);">
-+ <hbox id="identity-box-inner" align="center">
-+ <hbox id="page-proxy-stack"
-+ onclick="PageProxyClickHandler(event);">
-+ <image id="page-proxy-favicon"
-+ pageproxystate="invalid"/>
-+ </hbox>
-+ <hbox id="identity-icon-labels">
-+ <label id="identity-icon-label" class="plain" flex="1"/>
-+ <label id="identity-icon-country-label" class="plain"/>
-+ </hbox>
++ <image id="page-proxy-favicon"
++ onclick="PageProxyClickHandler(event);"
++ pageproxystate="invalid"/>
++ <hbox id="identity-icon-labels">
++ <label id="identity-icon-label" class="plain" flex="1"/>
++ <label id="identity-icon-country-label" class="plain"/>
+ </hbox>
+ </box>
+ <box id="urlbar-display-box" align="center">
@@ -517,6 +556,12 @@
+ tooltiptext="&pageReportIcon.tooltip;"
+ onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
+
++ <label id="share-button-status" collapsed="true" role="status"/>
++ <image id="share-button"
++ class="urlbar-icon"
++ hidden="true"
++ onclick="SocialShareButton.onClick(event);"/>
++
+ <image id="star-button"
+ class="urlbar-icon"
+ onclick="PlacesStarButton.onClick(event);"/>
@@ -568,6 +613,45 @@
+ onclick="BrowserGoHome(event);"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+
++ <toolbaritem id="social-toolbar-button"
++ class="toolbarbutton-1 chromeclass-toolbar-additional"
++ removable="false"
++ title="&socialToolbar.title;"
++ hidden="true">
++ <hbox id="social-toolbar-button-box" class="social-statusarea-container">
++ <button id="social-provider-image" type="menu">
++ <menupopup id="social-statusarea-popup">
++ <hbox id="social-statusarea-user" pack="left" align="center">
++ <image id="social-statusarea-user-portrait"/>
++ <vbox>
++ <label id="social-statusarea-notloggedin"
++ value="&social.notLoggedIn.label;"/>
++ <button id="social-statusarea-username"
++ oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"/>
++ </vbox>
++ </hbox>
++ </menupopup>
++ </button>
++ <hbox id="social-status-iconbox" flex="1">
++ <box class="social-notification-icon-container" collapsed="true"
++ onclick="SocialToolbar.showAmbientPopup(this);">
++ <image class="social-notification-icon-image"/>
++ <box class="social-notification-icon-counter" collapsed="true"/>
++ </box>
++ <box class="social-notification-icon-container" collapsed="true"
++ onclick="SocialToolbar.showAmbientPopup(this);">
++ <image class="social-notification-icon-image"/>
++ <box class="social-notification-icon-counter" collapsed="true"/>
++ </box>
++ <box class="social-notification-icon-container" collapsed="true"
++ onclick="SocialToolbar.showAmbientPopup(this);">
++ <image class="social-notification-icon-image"/>
++ <box class="social-notification-icon-counter" collapsed="true"/>
++ </box>
++ </hbox>
++ </hbox>
++ </toolbaritem>
++
+ <toolbaritem id="bookmarks-menu-button-container"
+ class="chromeclass-toolbar-additional"
+ removable="true"
@@ -1047,21 +1131,21 @@
+ </stack>
+ <toolbarbutton id="developer-toolbar-webconsole"
+ label="&webConsoleButton.label;"
-+ class="devtools-toolbarbutton"
++ class="developer-toolbar-button"
+ command="Tools:WebConsole"/>
+ <toolbarbutton id="developer-toolbar-inspector"
+ label="&inspectorButton.label;"
-+ class="devtools-toolbarbutton"
++ class="developer-toolbar-button"
+ hidden="true"
+ command="Tools:Inspect"/>
-+ <toolbarbutton id="developer-toolbar-responsiveui"
-+ label="&responsiveDesignTool.label;"
-+ class="devtools-toolbarbutton"
++ <toolbarbutton id="developer-toolbar-styleeditor"
++ label="&styleeditor.label;"
++ class="developer-toolbar-button"
+ hidden="true"
-+ command="Tools:ResponsiveUI"/>
++ command="Tools:StyleEditor"/>
+ <toolbarbutton id="developer-toolbar-debugger"
-+ label="&scriptsButton.label;"
-+ class="devtools-toolbarbutton"
++ label="&debuggerMenu.label2;"
++ class="developer-toolbar-button"
+ hidden="true"
+ command="Tools:Debugger"/>
+#ifndef XP_MACOSX
@@ -1167,7 +1251,7 @@
+#include "nsUnixShellService.h"
#endif
- #if defined(XP_WIN) && !defined(__MINGW32__)
+ #if defined(XP_WIN)
#include "nsIEHistoryEnumerator.h"
#endif
@@ -1186,7 +1270,7 @@
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
#endif
- #if defined(XP_WIN) && !defined(__MINGW32__)
+ #if defined(XP_WIN)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
#endif
@@ -1206,7 +1290,7 @@
#endif
{ &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
- #if defined(XP_WIN) && !defined(__MINGW32__)
+ #if defined(XP_WIN)
{ &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
#elif defined(XP_MACOSX)
{ &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
@@ -1331,7 +1415,7 @@
+#include "nsCOMPtr.h"
+#include "nsIPrefService.h"
+#include "nsIProcess.h"
-+#include "nsILocalFile.h"
++#include "nsIFile.h"
+#include "nsServiceManagerUtils.h"
+#include "nsComponentManagerUtils.h"
+#include "nsIMutableArray.h"
@@ -1478,7 +1562,7 @@
+ }
+
+NS_IMETHODIMP
-+nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI)
++nsKDEShellService::OpenApplicationWithURI(nsIFile* aApplication, const nsACString& aURI)
+ {
+ nsCOMPtr<nsIMutableArray> command = do_CreateInstance( NS_ARRAY_CONTRACTID );
+ if (!command)
@@ -1503,7 +1587,7 @@
+ }
+
+NS_IMETHODIMP
-+nsKDEShellService::GetDefaultFeedReader(nsILocalFile** _retval)
++nsKDEShellService::GetDefaultFeedReader(nsIFile** _retval)
+ {
+ *_retval = nsnull;
+
@@ -1537,7 +1621,7 @@
+ return NS_ERROR_FAILURE;
+
+ nsresult rv;
-+ nsCOMPtr<nsILocalFile> defaultReader =
++ nsCOMPtr<nsIFile> defaultReader =
+ do_CreateInstance("@mozilla.org/file/local;1", &rv);
+ NS_ENSURE_SUCCESS(rv, rv);
+
@@ -1727,8 +1811,8 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -522,18 +522,20 @@
- @BINPATH@/@PREF_DIR@/services-aitc.js
+@@ -558,18 +558,20 @@
+ @BINPATH@/@PREF_DIR@/services-sync.js
#endif
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js
--- a/firefox-multilocale-chrome.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/firefox-multilocale-chrome.patch Wed Jul 25 11:15:27 2012 +0200
@@ -1,12 +1,12 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 2f0c475e3ea9ba2309ab4ff7debb8bd0d6850a14
+# Parent 5c446cfb862fdb6685634dbeea9bff31fa19fc3e
Add searchplugins to chrome packaging for proper localization
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr
+@@ -327,16 +327,20 @@ pref("browser.download.useToolkitUI", fa
pref("browser.download.panel.removeFinishedDownloads", false);
// search engines URL
@@ -112,4 +112,4 @@
locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties)
locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties)
#ifdef MOZ_WEBAPP_RUNTIME
- % locale webapprt @AB_CD@ %locale/webapprt/
+ ../webapprt/chrome/@AB_CD@.jar:
--- a/idldir.patch Mon Jul 23 06:33:59 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-From: Wolfgang Rosenauer <stark@suse.de>
-Subject: fix IDL installation dir
-This is only needed to get the correct path in xulrunner-config
-
-Index: config/autoconf.mk.in
-===================================================================
-RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
-retrieving revision 3.449
-diff -u -r3.449 autoconf.mk.in
---- config/autoconf.mk.in 16 Feb 2008 22:23:08 -0000 3.449
-+++ b/config/autoconf.mk.in 19 Feb 2008 14:07:13 -0000
-@@ -62,7 +62,7 @@
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = $(includedir)
-
- installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
--- a/mozilla-crashreporter-restart-args.patch Mon Jul 23 06:33:59 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 07bb4ecfd6d6cc16360e7a32ee10b885d523f20d
-Bug 762780 - crashreporter restart command should support MOZ_APP_LAUNCHER
-
-diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
---- a/toolkit/crashreporter/nsExceptionHandler.cpp
-+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
-@@ -1360,32 +1360,25 @@ nsresult
- SetRestartArgs(int argc, char** argv)
- {
- if (!gExceptionHandler)
- return NS_OK;
-
- int i;
- nsCAutoString envVar;
- char *env;
-+ char *argv1 = getenv("MOZ_APP_LAUNCHER");
- for (i = 0; i < argc; i++) {
- envVar = "MOZ_CRASHREPORTER_RESTART_ARG_";
- envVar.AppendInt(i);
- envVar += "=";
--#if defined(XP_UNIX) && !defined(XP_MACOSX)
-- // we'd like to run the script around the binary
-- // instead of the binary itself, so remove the -bin
-- // if it exists on the first argument
-- int arg_len = 0;
-- if (i == 0 &&
-- (arg_len = strlen(argv[i])) > 4 &&
-- strcmp(argv[i] + arg_len - 4, "-bin") == 0) {
-- envVar.Append(argv[i], arg_len - 4);
-- } else
--#endif
-- {
-+ if (argv1 && i == 0) {
-+ // Is there a request to suppress default binary launcher?
-+ envVar += argv1;
-+ } else {
- envVar += argv[i];
- }
-
- // PR_SetEnv() wants the string to be available for the lifetime
- // of the app, so dup it here
- env = ToNewCString(envVar);
- if (!env)
- return NS_ERROR_OUT_OF_MEMORY;
--- a/mozilla-gstreamer.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-gstreamer.patch Wed Jul 25 11:15:27 2012 +0200
@@ -1,14 +1,12 @@
# HG changeset patch
-# Parent a9a49c20c491011f981b6c110aadfa6a01a1431e
+# Parent e4b87e710b1a5f0bb7db058911bc163b4bf30227
# User Wolfgang Rosenauer <wr@rosenauer.org>
-Bug 761030 - Crash with HTML 5 video with gstreamer enabled (TM: 16)
-
No Bug - use GStreamer _only_ for MP4 (not WebM/OGG)
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
-@@ -2278,21 +2278,17 @@ nsHTMLMediaElement::CreateDecoder(const
+@@ -2277,21 +2277,17 @@ nsHTMLMediaElement::CreateDecoder(const
nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder();
if (decoder->Init(this)) {
return decoder.forget();
@@ -30,7 +28,7 @@
#ifdef MOZ_WAVE
if (IsWaveType(aType)) {
nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder();
-@@ -2306,21 +2302,17 @@ nsHTMLMediaElement::CreateDecoder(const
+@@ -2305,21 +2301,17 @@ nsHTMLMediaElement::CreateDecoder(const
nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType);
if (decoder->Init(this)) {
return decoder.forget();
@@ -52,25 +50,3 @@
#ifdef MOZ_GSTREAMER
if (IsH264Type(aType)) {
-diff --git a/content/media/gstreamer/nsGStreamerReader.cpp b/content/media/gstreamer/nsGStreamerReader.cpp
---- a/content/media/gstreamer/nsGStreamerReader.cpp
-+++ b/content/media/gstreamer/nsGStreamerReader.cpp
-@@ -447,16 +447,18 @@ bool nsGStreamerReader::DecodeVideoFrame
- for(int i = 0; i < 3; i++) {
- b.mPlanes[i].mData = data + gst_video_format_get_component_offset(format, i,
- width, height);
- b.mPlanes[i].mStride = gst_video_format_get_row_stride(format, i, width);
- b.mPlanes[i].mHeight = gst_video_format_get_component_height(format,
- i, height);
- b.mPlanes[i].mWidth = gst_video_format_get_component_width(format,
- i, width);
-+ b.mPlanes[i].mOffset = 0;
-+ b.mPlanes[i].mSkip = 0;
- }
-
- bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer,
- GST_BUFFER_FLAG_DELTA_UNIT);
- /* XXX ? */
- PRInt64 offset = 0;
- VideoData *video = VideoData::Create(mInfo,
- mDecoder->GetImageContainer(),
--- a/mozilla-kde.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-kde.patch Wed Jul 25 11:15:27 2012 +0200
@@ -180,7 +180,7 @@
#include "AndroidBridge.h"
#endif
-@@ -2236,16 +2240,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2233,16 +2237,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -206,7 +206,7 @@
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2269,19 +2282,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2266,19 +2279,20 @@ nsDownload::SetState(DownloadState aStat
// If downloads are automatically removed per the user's
// retention policy, there's no reason to make the text clickable
// because if it is, they'll click open the download manager and
@@ -232,45 +232,49 @@
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -45,29 +45,33 @@ toolkit.jar:
- *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
- *+ content/global/bindings/browser.xml (widgets/browser.xml)
- *+ content/global/bindings/button.xml (widgets/button.xml)
- *+ content/global/bindings/checkbox.xml (widgets/checkbox.xml)
- *+ content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
- *+ content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
+ content/global/bindings/browser.xml (widgets/browser.xml)
+ content/global/bindings/button.xml (widgets/button.xml)
+ content/global/bindings/checkbox.xml (widgets/checkbox.xml)
+ content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
+ content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
*+ content/global/bindings/dialog.xml (widgets/dialog.xml)
+*+ content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
- *+ content/global/bindings/editor.xml (widgets/editor.xml)
- * content/global/bindings/expander.xml (widgets/expander.xml)
+ content/global/bindings/editor.xml (widgets/editor.xml)
+ content/global/bindings/expander.xml (widgets/expander.xml)
* content/global/bindings/filefield.xml (widgets/filefield.xml)
*+ content/global/bindings/findbar.xml (widgets/findbar.xml)
- *+ content/global/bindings/general.xml (widgets/general.xml)
- *+ content/global/bindings/groupbox.xml (widgets/groupbox.xml)
+ content/global/bindings/general.xml (widgets/general.xml)
+ content/global/bindings/groupbox.xml (widgets/groupbox.xml)
*+ content/global/bindings/listbox.xml (widgets/listbox.xml)
- *+ content/global/bindings/menu.xml (widgets/menu.xml)
- *+ content/global/bindings/menulist.xml (widgets/menulist.xml)
- *+ content/global/bindings/notification.xml (widgets/notification.xml)
- *+ content/global/bindings/numberbox.xml (widgets/numberbox.xml)
- *+ content/global/bindings/popup.xml (widgets/popup.xml)
+ content/global/bindings/menu.xml (widgets/menu.xml)
+ content/global/bindings/menulist.xml (widgets/menulist.xml)
+ content/global/bindings/notification.xml (widgets/notification.xml)
+ content/global/bindings/numberbox.xml (widgets/numberbox.xml)
+ content/global/bindings/popup.xml (widgets/popup.xml)
*+ content/global/bindings/preferences.xml (widgets/preferences.xml)
+*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
+% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
- *+ content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
- *+ content/global/bindings/radio.xml (widgets/radio.xml)
- *+ content/global/bindings/resizer.xml (widgets/resizer.xml)
- *+ content/global/bindings/richlistbox.xml (widgets/richlistbox.xml)
- *+ content/global/bindings/scale.xml (widgets/scale.xml)
- *+ content/global/bindings/scrollbar.xml (widgets/scrollbar.xml)
- *+ content/global/bindings/scrollbox.xml (widgets/scrollbox.xml)
- *+ content/global/bindings/splitter.xml (widgets/splitter.xml)
+ content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
+ content/global/bindings/radio.xml (widgets/radio.xml)
+ content/global/bindings/resizer.xml (widgets/resizer.xml)
+ content/global/bindings/richlistbox.xml (widgets/richlistbox.xml)
+ content/global/bindings/scale.xml (widgets/scale.xml)
+ content/global/bindings/scrollbar.xml (widgets/scrollbar.xml)
+ content/global/bindings/scrollbox.xml (widgets/scrollbox.xml)
+ content/global/bindings/splitter.xml (widgets/splitter.xml)
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,447 @@
+@@ -0,0 +1,451 @@
+<?xml version="1.0"?>
++<!-- This Source Code Form is subject to the terms of the Mozilla Public
++ - License, v. 2.0. If a copy of the MPL was not distributed with this
++ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
++
+
+<bindings id="dialogBindings"
+ xmlns="http://www.mozilla.org/xbl"
@@ -721,7 +725,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1373 @@
+@@ -0,0 +1,1339 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE bindings [
@@ -1986,9 +1990,9 @@
+ <handlers>
+ <handler event="command">
+ // This "command" event handler tracks changes made to preferences by
-+ // the user in this window.
-+ if (event.sourceEvent)
-+ event = event.sourceEvent;
++ // the user in this window.
++ if (event.sourceEvent)
++ event = event.sourceEvent;
+ this.userChangedValue(event.target);
+ </handler>
+ <handler event="select">
@@ -2047,43 +2051,9 @@
+</bindings>
+
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is the Preferences System.
-+#
-+# The Initial Developer of the Original Code is
-+# Ben Goodger.
-+# Portions created by the Initial Developer are Copyright (C) 2005
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+# Ben Goodger <ben@mozilla.org>
-+# Josh Aas <josh@mozilla.com>
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 2 or later (the "GPL"), or
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# This is PrefWindow 6. The Code Could Well Be Ready, Are You?
@@ -3256,7 +3226,7 @@
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
-@@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -105,11 +105,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
INCLUDES += \
-I$(srcdir)/../xpwidgets \
@@ -3288,7 +3258,7 @@
#include "nsIFileURL.h"
#include "nsIURI.h"
#include "nsIWidget.h"
- #include "nsILocalFile.h"
+ #include "nsIFile.h"
#include "nsIStringBundle.h"
#include "nsArrayEnumerator.h"
@@ -3310,7 +3280,7 @@
using namespace mozilla;
#define MAX_PREVIEW_SIZE 180
-@@ -253,17 +255,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+@@ -252,17 +254,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -3331,7 +3301,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
+@@ -357,16 +361,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
return NS_ERROR_FAILURE;
}
@@ -3351,7 +3321,7 @@
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
-@@ -506,8 +513,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -505,8 +512,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
*aReturn = nsIFilePicker::returnCancel;
break;
}
@@ -3504,7 +3474,7 @@
+ i < count;
+ ++i )
+ {
-+ nsCOMPtr<nsILocalFile> localfile;
++ nsCOMPtr<nsIFile> localfile;
+ nsresult rv = NS_NewNativeLocalFile( output[ i ],
+ PR_FALSE,
+ getter_AddRefs(localfile));
@@ -3525,19 +3495,19 @@
+ }
+ }
+ // Remember last used directory.
-+ nsCOMPtr<nsILocalFile> file;
++ nsCOMPtr<nsIFile> file;
+ GetFile(getter_AddRefs(file));
+ if (file) {
+ nsCOMPtr<nsIFile> dir;
+ file->GetParent(getter_AddRefs(dir));
-+ nsCOMPtr<nsILocalFile> localDir(do_QueryInterface(dir));
++ nsCOMPtr<nsIFile> localDir(do_QueryInterface(dir));
+ if (localDir) {
+ localDir.swap(mPrevDisplayDirectory);
+ }
+ }
+ if (mMode == nsIFilePicker::modeSave)
+ {
-+ nsCOMPtr<nsILocalFile> file;
++ nsCOMPtr<nsIFile> file;
+ GetFile(getter_AddRefs(file));
+ if (file)
+ {
@@ -3597,7 +3567,7 @@
nsTArray<nsCString> mFilterNames;
private:
- static nsILocalFile *mPrevDisplayDirectory;
+ static nsIFile *mPrevDisplayDirectory;
+
+ bool kdeRunning();
+ bool getKdeRunning();
@@ -3778,13 +3748,13 @@
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -48,16 +48,17 @@
+@@ -49,16 +49,17 @@
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
#include "private/pprio.h"
- #ifdef MOZ_WIDGET_GTK2
+ #ifdef MOZ_WIDGET_GTK
#include "nsIGIOService.h"
#include "nsIGnomeVFSService.h"
+#include "nsKDEUtils.h"
@@ -3796,7 +3766,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1760,44 +1761,51 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3804,7 +3774,7 @@
NS_IMETHODIMP
nsLocalFile::Reveal()
{
- #ifdef MOZ_WIDGET_GTK2
+ #ifdef MOZ_WIDGET_GTK
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (!giovfs && !gnomevfs)
@@ -3862,7 +3832,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1826,16 +1834,23 @@ nsLocalFile::Launch()
+@@ -1823,16 +1831,23 @@ nsLocalFile::Launch()
if (nsnull == connection)
return NS_ERROR_FAILURE;
--- a/mozilla-ntlm-full-path.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-ntlm-full-path.patch Wed Jul 25 11:15:27 2012 +0200
@@ -1,12 +1,12 @@
# HG changeset patch
# User Petr Cerny <pcerny@novell.com>
-# Parent a843037ea4cee813a68dd529e7a503d1e40b81e4
+# Parent 4f5fe2278cd5cff898ad762457312f60a7e82a67
Bug 634334 - call to the ntlm_auth helper fails
diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
--- a/extensions/auth/nsAuthSambaNTLM.cpp
+++ b/extensions/auth/nsAuthSambaNTLM.cpp
-@@ -200,17 +200,17 @@ static PRUint8* ExtractMessage(const nsA
+@@ -168,17 +168,17 @@ static PRUint8* ExtractMessage(const nsA
nsresult
nsAuthSambaNTLM::SpawnNTLMAuthHelper()
{
@@ -14,14 +14,14 @@
if (!username)
return NS_ERROR_FAILURE;
- char* args[] = {
+ const char* const args[] = {
- "ntlm_auth",
+ "/usr/bin/ntlm_auth",
"--helper-protocol", "ntlmssp-client-1",
"--use-cached-creds",
- "--username", const_cast<char*>(username),
+ "--username", username,
nsnull
};
- bool isOK = SpawnIOChild(args, &mChildPID, &mFromChildFD, &mToChildFD);
+ bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, &mFromChildFD, &mToChildFD);
if (!isOK)
--- a/mozilla-ppc.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-ppc.patch Wed Jul 25 11:15:27 2012 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 0f6722dd9d75458124795d22e9240887c9b4aeca
+# Parent 58ae98c85e39def96a90cb21c90e871f41a03a71
# User Wolfgang Rosenauer <wr@rosenauer.org>
Bug 746112 - RegExp hang on ppc64 in execute.
Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15
@@ -67,9 +67,9 @@
parentheses.subpatternId = subpatternId;
parentheses.isCopy = false;
parentheses.isTerminal = false;
-diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
---- a/memory/jemalloc/jemalloc.c
-+++ b/memory/jemalloc/jemalloc.c
+diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
+--- a/memory/mozjemalloc/jemalloc.c
++++ b/memory/mozjemalloc/jemalloc.c
@@ -1086,17 +1086,19 @@ struct arena_s {
static unsigned ncpus;
#endif
--- a/mozilla-repo.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-repo.patch Wed Jul 25 11:15:27 2012 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent c9af3b8022c3f92070c1bd205553d799887cd1b8
+# Parent 7820633b718ca1983da7b105d7868c455809cff1
diff --git a/build/Makefile.in b/build/Makefile.in
--- a/build/Makefile.in
@@ -48,7 +48,7 @@
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
-@@ -128,20 +128,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -131,22 +131,22 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
TEST_PACKAGE = $(PKG_BASENAME).tests.zip
ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -71,10 +71,12 @@
# JavaScript Shell
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
+
+ endif # PACKAGE_NAME_MK_INCLUDED
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
-@@ -220,20 +220,20 @@ endif
+@@ -218,20 +218,20 @@ endif
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
ifdef MOZ_SOURCE_STAMP
--- a/mozilla-shared-nss-db.patch Mon Jul 23 06:33:59 2012 +0200
+++ b/mozilla-shared-nss-db.patch Wed Jul 25 11:15:27 2012 +0200
@@ -7,7 +7,7 @@
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
-@@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO
+@@ -540,16 +540,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO
MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
@@ -20,9 +20,9 @@
+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
+NSSHELPER_LIBS = @NSSHELPER_LIBS@
+
- MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
+ MOZ_NATIVE_MAKEDEPEND = @MOZ_NATIVE_MAKEDEPEND@
- export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@
+ CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@
MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@
COMPILER_DEPEND = @COMPILER_DEPEND@
@@ -31,7 +31,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8052,16 +8052,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -66,11 +66,11 @@
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
-@@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS)
- DEFINES += \
- -DNSS_ENABLE_ECC \
- -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
- -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
+@@ -90,12 +90,14 @@ DEFINES += \
+ $(NULL)
+
+ EXPORTS += \
+ nsNSSShutDown.h \
$(NULL)
# Use local includes because they are inserted before INCLUDES
@@ -107,7 +107,7 @@
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsDirectoryService.h"
-@@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1740,18 +1747,34 @@ nsNSSComponent::InitializeNSS(bool showW
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -147,7 +147,7 @@
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -441,17 +441,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
endif
endif
endif
@@ -163,6 +163,6 @@
CXXFLAGS += $(TK_CFLAGS)
OS_LIBS += \
-framework SystemConfiguration \
- -framework QuickTime \
+ -framework QTKit \
-framework IOKit \
-F/System/Library/PrivateFrameworks -framework CoreUI \
--- a/series Mon Jul 23 06:33:59 2012 +0200
+++ b/series Wed Jul 25 11:15:27 2012 +0200
@@ -1,7 +1,6 @@
# xulrunner/gecko patches
toolkit-download-folder.patch
mozilla-pkgconfig.patch
-idldir.patch
mozilla-nongnome-proxies.patch
mozilla-prefer_plugin_pref.patch
mozilla-shared-nss-db.patch
@@ -15,7 +14,6 @@
mozilla-repo.patch
mozilla-sle11.patch
mozilla-arm-disable-edsp.patch
-mozilla-crashreporter-restart-args.patch
mozilla-gstreamer.patch
mozilla-ppc.patch
#mozilla-disable-neon-option.patch
--- a/xulrunner/idldir.patch Mon Jul 23 06:33:59 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../idldir.patch
\ No newline at end of file
--- a/xulrunner/mozilla-crashreporter-restart-args.patch Mon Jul 23 06:33:59 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-crashreporter-restart-args.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.spec Mon Jul 23 06:33:59 2012 +0200
+++ b/xulrunner/xulrunner.spec Wed Jul 25 11:15:27 2012 +0200
@@ -70,13 +70,11 @@
Source9: compare-locales.tar.bz2
Patch1: toolkit-download-folder.patch
Patch2: mozilla-pkgconfig.patch
-Patch3: idldir.patch
Patch4: mozilla-nongnome-proxies.patch
Patch5: mozilla-prefer_plugin_pref.patch
Patch6: mozilla-language.patch
Patch7: mozilla-ntlm-full-path.patch
Patch9: mozilla-sle11.patch
-Patch12: mozilla-crashreporter-restart-args.patch
Patch13: mozilla-gstreamer.patch
Patch14: mozilla-ppc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -184,7 +182,6 @@
%setup -n mozilla -q -b 1 -b 9
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -192,7 +189,6 @@
%if %suse_version < 1120
%patch9 -p1
%endif
-%patch12 -p1
%patch13 -p1
%patch14 -p1