Merge branch 'master' into f27

This commit is contained in:
Martin Stransky 2018-06-04 13:41:27 +02:00
commit 17f11d2fa5
4 changed files with 53 additions and 7 deletions

View File

@ -3,7 +3,7 @@ Version=1.0
Name=Firefox on Wayland Name=Firefox on Wayland
GenericName=Web Browser GenericName=Web Browser
Comment=Browse the Web Comment=Browse the Web
Exec=firefox-wayland %u Exec=firefox-wayland --name firefox-wayland %u
Icon=firefox Icon=firefox
Terminal=false Terminal=false
Type=Application Type=Application
@ -119,9 +119,7 @@ Name[wo]=Palanteer bu bees
Name[xh]=Ifestile entsha Name[xh]=Ifestile entsha
Name[zh-CN]= Name[zh-CN]=
Name[zh-TW]= Name[zh-TW]=
Exec=firefox-wayland --name firefox-wayland --new-window %u
Exec=firefox-wayland %u
[Desktop Action new-private-window] [Desktop Action new-private-window]
Name=Open a 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[xh]=Ifestile yangasese entsha
Name[zh-CN]= Name[zh-CN]=
Name[zh-TW]= Name[zh-TW]=
Exec=firefox-wayland --private-window %u Exec=firefox-wayland --private-window --name firefox-wayland %u

View File

@ -160,7 +160,7 @@ Name[zh-CN]=新建窗口
Name[zh-TW]= Name[zh-TW]=
Exec=firefox %u Exec=firefox --new-window %u
[Desktop Action new-private-window] [Desktop Action new-private-window]
Name=Open a New Private Window Name=Open a New Private Window

View File

@ -102,7 +102,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 60.0.1 Version: 60.0.1
Release: 5%{?pre_tag}%{?dist} Release: 6%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz 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 Patch563: rb245262.patch
Patch564: mozilla-1464808.patch Patch564: mozilla-1464808.patch
Patch565: mozilla-1464823.patch Patch565: mozilla-1464823.patch
Patch566: mozilla-1466473.patch
# Debian patches # Debian patches
Patch500: mozilla-440908.patch Patch500: mozilla-440908.patch
@ -378,6 +379,7 @@ This package contains results of tests executed during build.
%patch563 -p1 -b .rb245262 %patch563 -p1 -b .rb245262
%patch564 -p1 -b .mozilla-1464808 %patch564 -p1 -b .mozilla-1464808
%patch565 -p1 -b .mozilla-1464823 %patch565 -p1 -b .mozilla-1464823
%patch566 -p1 -b .mozilla-1466473
%endif %endif
%{__rm} -f .mozconfig %{__rm} -f .mozconfig
@ -914,6 +916,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %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 * Wed May 30 2018 Martin Stransky <stransky@redhat.com> - 60.0.1-5
- Added workaround for mozbz#1464823 which makes GL layer - Added workaround for mozbz#1464823 which makes GL layer
compositor usable on Wayland. compositor usable on Wayland.

42
mozilla-1466473.patch Normal file
View File

@ -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