summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-06-04 13:41:12 +0200
committerMartin Stransky <stransky@redhat.com>2018-06-04 13:41:12 +0200
commit0c068bfe1eb9f20e68923b3cd748ce30bb844841 (patch)
tree9cae1e0b2e7d01ba514a34c4143000a4fae2c569
parentAdded workaround for mozbz#1464823 which makes GL layer compositor usable on ... (diff)
downloadlibrewolf-fedora-ff-0c068bfe1eb9f20e68923b3cd748ce30bb844841.tar.gz
librewolf-fedora-ff-0c068bfe1eb9f20e68923b3cd748ce30bb844841.tar.bz2
librewolf-fedora-ff-0c068bfe1eb9f20e68923b3cd748ce30bb844841.zip
Fixed mozbz#1466473, rhbz#1585300 - Fix GL detection, Fixed desktop file names (rhbz#1585369)
-rw-r--r--firefox-wayland.desktop8
-rw-r--r--firefox.desktop2
-rw-r--r--firefox.spec8
-rw-r--r--mozilla-1466473.patch42
4 files changed, 53 insertions, 7 deletions
diff --git a/firefox-wayland.desktop b/firefox-wayland.desktop
index ad375b0..12669c5 100644
--- a/firefox-wayland.desktop
+++ b/firefox-wayland.desktop
@@ -3,7 +3,7 @@ Version=1.0
Name=Firefox on Wayland
GenericName=Web Browser
Comment=Browse the Web
-Exec=firefox-wayland %u
+Exec=firefox-wayland --name firefox-wayland %u
Icon=firefox
Terminal=false
Type=Application
@@ -119,9 +119,7 @@ Name[wo]=Palanteer bu bees
Name[xh]=Ifestile entsha
Name[zh-CN]=新建窗口
Name[zh-TW]=開新視窗
-
-
-Exec=firefox-wayland %u
+Exec=firefox-wayland --name firefox-wayland --new-window %u
[Desktop Action new-private-window]
Name=Open a New Private Window
@@ -229,5 +227,5 @@ Name[wo]=Panlanteeru biir bu bees
Name[xh]=Ifestile yangasese entsha
Name[zh-CN]=新建隐私浏览窗口
Name[zh-TW]=新增隱私視窗
-Exec=firefox-wayland --private-window %u
+Exec=firefox-wayland --private-window --name firefox-wayland %u
diff --git a/firefox.desktop b/firefox.desktop
index f13e600..89fa082 100644
--- a/firefox.desktop
+++ b/firefox.desktop
@@ -160,7 +160,7 @@ Name[zh-CN]=新建窗口
Name[zh-TW]=開新視窗
-Exec=firefox %u
+Exec=firefox --new-window %u
[Desktop Action new-private-window]
Name=Open a New Private Window
diff --git a/firefox.spec b/firefox.spec
index 7303673..f3291f3 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -102,7 +102,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 60.0.1
-Release: 5%{?pre_tag}%{?dist}
+Release: 6%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -181,6 +181,7 @@ Patch562: rb246410.patch
Patch563: rb245262.patch
Patch564: mozilla-1464808.patch
Patch565: mozilla-1464823.patch
+Patch566: mozilla-1466473.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -378,6 +379,7 @@ This package contains results of tests executed during build.
%patch563 -p1 -b .rb245262
%patch564 -p1 -b .mozilla-1464808
%patch565 -p1 -b .mozilla-1464823
+%patch566 -p1 -b .mozilla-1466473
%endif
%{__rm} -f .mozconfig
@@ -914,6 +916,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Mon Jun 4 2018 Martin Stransky <stransky@redhat.com> - 60.0.1-6
+- Fixed mozbz#1466473, rhbz#1585300 - Fix GL detection.
+- Fixed desktop file names (rhbz#1585369).
+
* Wed May 30 2018 Martin Stransky <stransky@redhat.com> - 60.0.1-5
- Added workaround for mozbz#1464823 which makes GL layer
compositor usable on Wayland.
diff --git a/mozilla-1466473.patch b/mozilla-1466473.patch
new file mode 100644
index 0000000..5ee521d
--- /dev/null
+++ b/mozilla-1466473.patch
@@ -0,0 +1,42 @@
+diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
+--- a/toolkit/xre/moz.build
++++ b/toolkit/xre/moz.build
+@@ -116,17 +116,17 @@ UNIFIED_SOURCES += [
+ # they pull in OS X system headers.
+ # nsEmbedFunctions.cpp cannot be built in unified mode because it pulls in X11 headers.
+ SOURCES += [
+ 'nsAppRunner.cpp',
+ 'nsEmbedFunctions.cpp',
+ 'ProfileReset.cpp',
+ ]
+
+-if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX':
++if CONFIG['MOZ_X11']:
+ UNIFIED_SOURCES += [
+ 'glxtest.cpp',
+ ]
+
+ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
+ UNIFIED_SOURCES += [
+ 'EventTracer.cpp',
+ ]
+@@ -142,17 +142,17 @@ if CONFIG['MOZ_PDF_PRINTING']:
+ LOCAL_INCLUDES += [
+ '../components/printingui',
+ ]
+
+ include('/ipc/chromium/chromium-config.mozbuild')
+
+ FINAL_LIBRARY = 'xul'
+
+-if CONFIG['MOZ_GL_DEFAULT_PROVIDER'] == 'GLX':
++if CONFIG['MOZ_X11']:
+ DEFINES['USE_GLX_TEST'] = True
+
+ for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME',
+ 'MOZ_APP_VERSION', 'OS_TARGET', 'MOZ_WIDGET_TOOLKIT'):
+ DEFINES[var] = '"%s"' % CONFIG[var]
+
+ if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+ DEFINES['MOZ_UPDATER'] = True
+
bgstack15