Skip to content

Commit

Permalink
Update to 115.6 and remove upstreamed ffmpeg-patch
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Sirringhaus committed Dec 12, 2023
1 parent c6df993 commit 5afe4a4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 82 deletions.
5 changes: 2 additions & 3 deletions firefox/MozillaFirefox.spec
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
# major 69
# mainver %%major.99
%define major 115
%define mainver %major.3.1
%define orig_version 115.3.1
%define mainver %major.6.0
%define orig_version 115.6.0
%define orig_suffix esr
%define update_channel release
%define branding 1
Expand Down Expand Up @@ -233,7 +233,6 @@ Patch18: mozilla-silence-no-return-type.patch
Patch19: mozilla-bmo531915.patch
Patch20: one_swizzle_to_rule_them_all.patch
Patch21: svg-rendering.patch
Patch22: mozilla-fix-broken-ffmpeg.patch
Patch28: mozilla-partial-revert-1768632.patch
# Firefox/browser
Patch101: firefox-kde.patch
Expand Down
1 change: 0 additions & 1 deletion firefox/mozilla-fix-broken-ffmpeg.patch

This file was deleted.

8 changes: 4 additions & 4 deletions firefox/tar_stamps
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PRODUCT="firefox"
CHANNEL="release"
VERSION="115.3.1"
VERSION="115.6.0"
VERSION_SUFFIX="esr"
PREV_VERSION="115.3.0"
PREV_VERSION="115.5.0"
PREV_VERSION_SUFFIX="esr"
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-esr115"
RELEASE_TAG="749617c4473c65f8aebb2e3254777ae99dc17cce"
RELEASE_TIMESTAMP="20230927234915"
RELEASE_TAG="aa9f02961b2bbb92e17fea5d6b8fd14c097baf72"
RELEASE_TIMESTAMP="20231211164624"
74 changes: 0 additions & 74 deletions mozilla-fix-broken-ffmpeg.patch

This file was deleted.

0 comments on commit 5afe4a4

Please sign in to comment.