mirror of
https://abf.rosa.ru/djam/firefox.git
synced 2025-02-25 02:52:59 +00:00
Updated to 56.0.2
This commit is contained in:
parent
f30fffb24c
commit
dab0022205
3 changed files with 21 additions and 28 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
firefox-56.0.1.source.tar.xz: a8409d1c2dd129dbd53d5e0745e55a899b55ecd0
|
||||
firefox-56.0.2.source.tar.xz: 1b7310adea833a7c74498505f1207416690c9748
|
||||
|
|
14
firefox.spec
14
firefox.spec
|
@ -7,7 +7,7 @@
|
|||
# This also means only STABLE upstream releases, NO betas.
|
||||
# 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
|
||||
# (tpg) set version HERE !!!
|
||||
%define realver %{major}
|
||||
|
@ -32,15 +32,11 @@ Summary: Next generation web browser
|
|||
Name: firefox
|
||||
Version: %{major}
|
||||
Epoch: %{ff_epoch}
|
||||
Release: 2
|
||||
Release: 1
|
||||
License: MPLv1+
|
||||
Group: Networking/WWW
|
||||
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
|
||||
%endif
|
||||
Source4: %{name}.desktop
|
||||
Source7: firefox.cfg
|
||||
Source9: kde.js
|
||||
|
@ -117,11 +113,7 @@ BuildRequires: pkgconfig(vorbis)
|
|||
BuildRequires: pkgconfig(gconf-2.0)
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
|
||||
%if 0%{?prel}
|
||||
Provides: %{name} = %{epoch}:%{realver}-0.%{prel}
|
||||
%else
|
||||
Provides: %{name} = %{epoch}:%{realver}
|
||||
%endif
|
||||
Provides: mozilla-firefox = %{epoch}:%{version}-%{release}
|
||||
Provides: webclient
|
||||
|
||||
|
@ -336,7 +328,7 @@ cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
|
|||
# Macros from %{name} package
|
||||
%%firefox_major %{major}
|
||||
%%firefox_epoch %{ff_epoch}
|
||||
%%firefox_version %{major}%{?prel:-0.%prel}
|
||||
%%firefox_version %{major}
|
||||
%%firefox_mozillapath %{mozillalibdir}
|
||||
%%firefox_pluginsdir %{pluginsdir}
|
||||
%%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# HG changeset patch
|
||||
# Parent faadbf89d1cb02eefec4c5dfd3ab86bc20d815d5
|
||||
# Parent a930d4c1c3fba77f61071becdc51e3232e0b72ca
|
||||
Description: Add KDE integration to Firefox (toolkit parts)
|
||||
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
|
||||
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);
|
||||
mFilterNames.AppendElement(name);
|
||||
@@ -371,16 +375,34 @@ nsFilePicker::Show(int16_t *aReturn)
|
||||
@@ -371,16 +375,37 @@ nsFilePicker::Show(int16_t *aReturn)
|
||||
|
||||
NS_IMETHODIMP
|
||||
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
|
||||
+ if( nsKDEUtils::kdeSupport()) {
|
||||
+ int16_t result;
|
||||
+ mCallback = aCallback;
|
||||
+ mRunning = true;
|
||||
+ NS_ADDREF_THIS();
|
||||
+ kdeFileDialog(&result);
|
||||
+ if (mCallback) {
|
||||
+ mCallback->Done(result);
|
||||
+ mCallback = nullptr;
|
||||
+ } else {
|
||||
+ mResult = result;
|
||||
+ }
|
||||
+ mRunning = false;
|
||||
+ NS_RELEASE_THIS();
|
||||
+ g_idle_add([](gpointer data) -> gboolean {
|
||||
+ nsFilePicker* queuedPicker = (nsFilePicker*) data;
|
||||
+ int16_t result;
|
||||
+ queuedPicker->kdeFileDialog(&result);
|
||||
+ if (queuedPicker->mCallback) {
|
||||
+ queuedPicker->mCallback->Done(result);
|
||||
+ queuedPicker->mCallback = nullptr;
|
||||
+ } else {
|
||||
+ queuedPicker->mResult = result;
|
||||
+ }
|
||||
+ queuedPicker->mRunning = false;
|
||||
+ return G_SOURCE_REMOVE;
|
||||
+ }, this);
|
||||
+
|
||||
+ return NS_OK;
|
||||
+ }
|
||||
+
|
||||
|
@ -3311,7 +3314,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
|
|||
|
||||
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
|
||||
|
||||
@@ -603,8 +625,235 @@ nsFilePicker::Done(GtkWidget* file_choos
|
||||
@@ -603,8 +628,233 @@ nsFilePicker::Done(GtkWidget* file_choos
|
||||
if (mCallback) {
|
||||
mCallback->Done(result);
|
||||
mCallback = nullptr;
|
||||
|
@ -3408,8 +3411,6 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
|
|||
+ else
|
||||
+ startdir = ToNewUTF8String(mDefault);
|
||||
+ }
|
||||
+ if( startdir.IsEmpty())
|
||||
+ startdir = ".";
|
||||
+
|
||||
+ nsAutoCString filters;
|
||||
+ PRInt32 count = mFilters.Length();
|
||||
|
|
Loading…
Add table
Reference in a new issue