patch cleanup

This commit is contained in:
Martin Stransky 2020-08-18 10:00:40 +02:00
parent 7a74efcc7e
commit 51f4268c7b
4 changed files with 11 additions and 14 deletions

2
.gitignore vendored
View File

@ -410,3 +410,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-78.0.2-20200709.tar.xz /firefox-langpacks-78.0.2-20200709.tar.xz
/firefox-79.0.source.tar.xz /firefox-79.0.source.tar.xz
/firefox-langpacks-79.0-20200727.tar.xz /firefox-langpacks-79.0-20200727.tar.xz
/firefox-80.0.source.tar.xz
/firefox-langpacks-80.0-20200818.tar.xz

View File

@ -158,7 +158,6 @@ Patch47: fedora-shebang-build.patch
Patch48: build-arm-wasm.patch Patch48: build-arm-wasm.patch
Patch49: build-arm-libaom.patch Patch49: build-arm-libaom.patch
#Patch50: Bug-1610814-Fix-NEON-compile-error-with-gcc-and-RGB-.patch #Patch50: Bug-1610814-Fix-NEON-compile-error-with-gcc-and-RGB-.patch
Patch51: mozilla-1640982.patch
# Fedora specific patches # Fedora specific patches
Patch215: firefox-enable-addons.patch Patch215: firefox-enable-addons.patch
@ -182,7 +181,6 @@ Patch575: firefox-pipewire-0-3.patch
#VA-API patches #VA-API patches
Patch584: firefox-disable-ffvpx-with-vapi.patch Patch584: firefox-disable-ffvpx-with-vapi.patch
Patch585: firefox-vaapi-extra-frames.patch Patch585: firefox-vaapi-extra-frames.patch
Patch586: mozilla-1645671.patch
Patch589: mozilla-1656436.patch Patch589: mozilla-1656436.patch
# PGO/LTO patches # PGO/LTO patches
@ -364,7 +362,6 @@ This package contains results of tests executed during build.
%patch48 -p1 -b .build-arm-wasm %patch48 -p1 -b .build-arm-wasm
%patch49 -p1 -b .build-arm-libaom %patch49 -p1 -b .build-arm-libaom
#%patch50 -p1 -b .build-arm-SwizzleNEON #%patch50 -p1 -b .build-arm-SwizzleNEON
%patch51 -p1 -b .mozilla-1640982
# Fedora patches # Fedora patches
%patch215 -p1 -b .addons %patch215 -p1 -b .addons
@ -379,7 +376,6 @@ This package contains results of tests executed during build.
%patch402 -p1 -b .1196777 %patch402 -p1 -b .1196777
# Wayland specific upstream patches # Wayland specific upstream patches
%if 0%{?fedora} < 32 %if 0%{?fedora} < 32
%patch574 -p1 -b .firefox-pipewire-0-2 %patch574 -p1 -b .firefox-pipewire-0-2
@ -389,7 +385,6 @@ This package contains results of tests executed during build.
%patch584 -p1 -b .firefox-disable-ffvpx-with-vapi %patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
%patch585 -p1 -b .firefox-vaapi-extra-frames %patch585 -p1 -b .firefox-vaapi-extra-frames
%patch586 -p1 -b .mozilla-1645671
%patch589 -p1 -b .mozilla-1656436 %patch589 -p1 -b .mozilla-1656436
# PGO patches # PGO patches

View File

@ -1,10 +1,10 @@
diff -up firefox-68.0/widget/gtk/nsWindow.cpp.1196777 firefox-68.0/widget/gtk/nsWindow.cpp diff -up firefox-80.0/widget/gtk/nsWindow.cpp.1196777 firefox-80.0/widget/gtk/nsWindow.cpp
--- firefox-68.0/widget/gtk/nsWindow.cpp.1196777 2019-07-02 11:47:06.864726826 +0200 --- firefox-80.0/widget/gtk/nsWindow.cpp.1196777 2020-08-18 09:47:18.662833910 +0200
+++ firefox-68.0/widget/gtk/nsWindow.cpp 2019-07-02 11:48:09.896544339 +0200 +++ firefox-80.0/widget/gtk/nsWindow.cpp 2020-08-18 09:48:19.437478136 +0200
@@ -156,7 +156,8 @@ const gint kEvents = @@ -158,7 +158,8 @@ const gint kEvents =
#if GTK_CHECK_VERSION(3, 4, 0) GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK | GDK_VISIBILITY_NOTIFY_MASK |
GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_BUTTON_PRESS_MASK |
#endif GDK_BUTTON_RELEASE_MASK | GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK |
- GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK; - GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
+ GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK | + GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
+ GDK_FOCUS_CHANGE_MASK; + GDK_FOCUS_CHANGE_MASK;

View File

@ -1,3 +1,3 @@
SHA512 (firefox-79.0.source.tar.xz) = 19b068446757fca1247efe4135635c48c01f445a724ffb2a34c20b8b63f9bd920e9a78849f268997434d1863ba091eab8a99a02b2073f08d2891d2678d1ff73e
SHA512 (firefox-langpacks-79.0-20200727.tar.xz) = 5e9f1599e3ef2670ebd5d2110c40bc017e46179dcc595b67470e58dd780cd7ba1a966e536a900d78ea8370a4d4f9f952d6385b2311eafca084fb9d86bea0dd20
SHA512 (cbindgen-vendor.tar.xz) = f0425020e2d43a3d28b03f82bdb9719728112a2c94b1d595da384d0674ca21d0940a6f729a690434d670e598fbc6bb5193c89da0a4633a734c70dd786222e711 SHA512 (cbindgen-vendor.tar.xz) = f0425020e2d43a3d28b03f82bdb9719728112a2c94b1d595da384d0674ca21d0940a6f729a690434d670e598fbc6bb5193c89da0a4633a734c70dd786222e711
SHA512 (firefox-80.0.source.tar.xz) = bb058939c63c5b50fc9dc332cc899450d0acce280947a6a4e46d69c02212dd8beb9881f6118074213a03fbe276f9a0ba47967f03802f3a4c7ac5b9bffabeb965
SHA512 (firefox-langpacks-80.0-20200818.tar.xz) = 09e88aab42749462b27ff9becc627e794f8ec15ef945cb68b2e98508adf6e91d1dfed44a014334ee1577bf905441c184ade4ef72a7052ed2c17ccba5d40b422e