Skip to content

Commit

Permalink
TB: Update to 115.3.1
Browse files Browse the repository at this point in the history
Includes:
- Remove bashisms in mozilla.sh.in
- Add patch to fix broken build in ffmpeg with newer binutils
  • Loading branch information
Martin Sirringhaus committed Oct 2, 2023
1 parent 1aed0b0 commit c6df993
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
11 changes: 3 additions & 8 deletions thunderbird/MozillaThunderbird.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.0.1
%define orig_version 115.0.1
%define mainver %major.3.1
%define orig_version 115.3.1
%define orig_suffix %nil
%define update_channel release
%define source_prefix thunderbird-%{orig_version}
Expand Down Expand Up @@ -201,8 +201,8 @@ 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
Patch29: mozilla-bmo1775202.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /bin/sh
Expand Down Expand Up @@ -322,11 +322,6 @@ export GC_SECTIONS_BREAKS_DEBUG_RANGES=yes
%if 0%{?build_hardened}
export LDFLAGS="\$LDFLAGS -fPIC -Wl,-z,relro,-z,now"
%endif
%ifarch ppc64 ppc64le
%if 0%{?clang_build} == 0
export CFLAGS="\$CFLAGS -mminimal-toc"
%endif
%endif
export CXXFLAGS="\$CFLAGS"
export MOZCONFIG=$RPM_BUILD_DIR/mozconfig
EOF
Expand Down
1 change: 0 additions & 1 deletion thunderbird/mozilla-bmo1775202.patch

This file was deleted.

1 change: 1 addition & 0 deletions thunderbird/mozilla-fix-broken-ffmpeg.patch
4 changes: 2 additions & 2 deletions thunderbird/mozilla.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ if [ "$WAYLAND_DISPLAY" ]; then
fi

# xinput2 (boo#1173320)
source /etc/os-release
. /etc/os-release
if [ "$ID" = "opensuse-tumbleweed" ]; then
export MOZ_USE_XINPUT2=1
fi
Expand Down Expand Up @@ -151,7 +151,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
# Try with a local variant first, then without a local variant
SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"`
MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g" | sed "s|\..*||g"`
function create_langpack_link() {
create_langpack_link() {
local language=$*
local langpack=langpack-${language}@firefox.mozilla.org.xpi
if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then
Expand Down
8 changes: 4 additions & 4 deletions thunderbird/tar_stamps
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PRODUCT="thunderbird"
CHANNEL="esr115"
VERSION="115.0.1"
VERSION="115.3.1"
VERSION_SUFFIX=""
PREV_VERSION="102.12"
PREV_VERSION="115.2.2"
PREV_VERSION_SUFFIX=""
#SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation
RELEASE_REPO="https://hg.mozilla.org/releases/comm-esr115"
RELEASE_TAG="d0fb46f5902aa115c678af4e1cc50ec5782cf67c"
RELEASE_TIMESTAMP="20230719152301"
RELEASE_TAG="42b3addbca70f64493bdbede7f3f66dc40641a0a"
RELEASE_TIMESTAMP="20230928194049"

0 comments on commit c6df993

Please sign in to comment.