Djam/firefox
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox.git synced 2025-02-25 11:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 56.0.2

Browse source
This commit is contained in:
Алзим 2017-11-02 18:05:13 +03:00
parent f30fffb24c
commit dab0022205
3 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources: sources:
firefox-56.0.1.source.tar.xz: a8409d1c2dd129dbd53d5e0745e55a899b55ecd0 firefox-56.0.2.source.tar.xz: 1b7310adea833a7c74498505f1207416690c9748

14
firefox.spec
View file

@ -7,7 +7,7 @@
# This also means only STABLE upstream releases, NO betas. # This also means only STABLE upstream releases, NO betas.
# This is a discussed topic. Please, do not flame it again. # This is a discussed topic. Please, do not flame it again.
%define major 56.0.1 %define major 56.0.2
%define ff_epoch 0 %define ff_epoch 0
# (tpg) set version HERE !!! # (tpg) set version HERE !!!
%define realver %{major} %define realver %{major}
@ -32,15 +32,11 @@ Summary: Next generation web browser
Name: firefox Name: firefox
Version: %{major} Version: %{major}
Epoch: %{ff_epoch} Epoch: %{ff_epoch}
Release: 2 Release: 1
License: MPLv1+ License: MPLv1+
Group: Networking/WWW Group: Networking/WWW
Url: http://www.mozilla.com/firefox/ Url: http://www.mozilla.com/firefox/
%if 0%{?prel}
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/%{realver}/source/%{name}-%{realver}%prel.source.tar.xz
%else
Source0: https://archive.mozilla.org/pub/firefox/releases/%{realver}/source/%{name}-%{realver}.source.tar.xz Source0: https://archive.mozilla.org/pub/firefox/releases/%{realver}/source/%{name}-%{realver}.source.tar.xz
%endif
Source4: %{name}.desktop Source4: %{name}.desktop
Source7: firefox.cfg Source7: firefox.cfg
Source9: kde.js Source9: kde.js
@ -117,11 +113,7 @@ BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(fontconfig)
%if 0%{?prel}
Provides: %{name} = %{epoch}:%{realver}-0.%{prel}
%else
Provides: %{name} = %{epoch}:%{realver} Provides: %{name} = %{epoch}:%{realver}
%endif
Provides: mozilla-firefox = %{epoch}:%{version}-%{release} Provides: mozilla-firefox = %{epoch}:%{version}-%{release}
Provides: webclient Provides: webclient
@ -336,7 +328,7 @@ cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
# Macros from %{name} package # Macros from %{name} package
%%firefox_major %{major} %%firefox_major %{major}
%%firefox_epoch %{ff_epoch} %%firefox_epoch %{ff_epoch}
%%firefox_version %{major}%{?prel:-0.%prel} %%firefox_version %{major}
%%firefox_mozillapath %{mozillalibdir} %%firefox_mozillapath %{mozillalibdir}
%%firefox_pluginsdir %{pluginsdir} %%firefox_pluginsdir %{pluginsdir}
%%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}

29
mozilla-kde.patch
View file

@ -1,5 +1,5 @@
# HG changeset patch # HG changeset patch
# Parent faadbf89d1cb02eefec4c5dfd3ab86bc20d815d5 # Parent a930d4c1c3fba77f61071becdc51e3232e0b72ca
Description: Add KDE integration to Firefox (toolkit parts) Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com> Author: Lubos Lunak <lunak@suse.com>
@ -3276,7 +3276,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
mFilters.AppendElement(filter); mFilters.AppendElement(filter);
mFilterNames.AppendElement(name); mFilterNames.AppendElement(name);
@@ -371,16 +375,34 @@ nsFilePicker::Show(int16_t *aReturn) @@ -371,16 +375,37 @@ nsFilePicker::Show(int16_t *aReturn)
NS_IMETHODIMP NS_IMETHODIMP
nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@ -3287,19 +3287,22 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
+ // KDE file picker is not handled via callback + // KDE file picker is not handled via callback
+ if( nsKDEUtils::kdeSupport()) { + if( nsKDEUtils::kdeSupport()) {
+ int16_t result;
+ mCallback = aCallback; + mCallback = aCallback;
+ mRunning = true; + mRunning = true;
+ NS_ADDREF_THIS(); + g_idle_add([](gpointer data) -> gboolean {
+ kdeFileDialog(&result); + nsFilePicker* queuedPicker = (nsFilePicker*) data;
+ if (mCallback) { + int16_t result;
+ mCallback->Done(result); + queuedPicker->kdeFileDialog(&result);
+ mCallback = nullptr; + if (queuedPicker->mCallback) {
+ queuedPicker->mCallback->Done(result);
+ queuedPicker->mCallback = nullptr;
+ } else { + } else {
+ mResult = result; + queuedPicker->mResult = result;
+ } + }
+ mRunning = false; + queuedPicker->mRunning = false;
+ NS_RELEASE_THIS(); + return G_SOURCE_REMOVE;
+ }, this);
+
+ return NS_OK; + return NS_OK;
+ } + }
+ +
@ -3311,7 +3314,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
GtkFileChooserAction action = GetGtkFileChooserAction(mMode); GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
@@ -603,8 +625,235 @@ nsFilePicker::Done(GtkWidget* file_choos @@ -603,8 +628,233 @@ nsFilePicker::Done(GtkWidget* file_choos
if (mCallback) { if (mCallback) {
mCallback->Done(result); mCallback->Done(result);
mCallback = nullptr; mCallback = nullptr;
@ -3408,8 +3411,6 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
+ else + else
+ startdir = ToNewUTF8String(mDefault); + startdir = ToNewUTF8String(mDefault);
+ } + }
+ if( startdir.IsEmpty())
+ startdir = ".";
+ +
+ nsAutoCString filters; + nsAutoCString filters;
+ PRInt32 count = mFilters.Length(); + PRInt32 count = mFilters.Length();