From ff7b13afad7c1a68bbb39de905c02c2fbf81c0d7 Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 22:19:11 +0100 Subject: [PATCH] automatic version update by autodist [release 70.0-1mamba;Wed Oct 30 2019] --- ...ting-names-for-gdk-application-names.patch | 56 +++ firefox-69.0.2-no-relinking.patch | 41 ++ firefox-70.0-fix-__warn_memset_zero_len.patch | 11 + firefox.spec | 386 ++++++++---------- 4 files changed, 267 insertions(+), 227 deletions(-) create mode 100644 firefox-69.0-use-remoting-names-for-gdk-application-names.patch create mode 100644 firefox-69.0.2-no-relinking.patch create mode 100644 firefox-70.0-fix-__warn_memset_zero_len.patch diff --git a/firefox-69.0-use-remoting-names-for-gdk-application-names.patch b/firefox-69.0-use-remoting-names-for-gdk-application-names.patch new file mode 100644 index 0000000..8cc3786 --- /dev/null +++ b/firefox-69.0-use-remoting-names-for-gdk-application-names.patch @@ -0,0 +1,56 @@ +From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001 +Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens@gmail.com> +From: "Jan Alexander Steffens (heftig)" +Date: Mon, 25 Mar 2019 20:30:11 +0100 +Subject: [PATCH] Use remoting name for GDK application names + +--- + toolkit/xre/nsAppRunner.cpp | 6 +----- + widget/gtk/nsAppShell.cpp | 7 +++---- + 2 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +index 0b808ef215f06..28911c0ffeaec 100644 +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { + // consistently. + + // Set program name to the one defined in application.ini. +- { +- nsAutoCString program(gAppData->name); +- ToLowerCase(program); +- g_set_prgname(program.get()); +- } ++ g_set_prgname(gAppData->remotingName); + + // Initialize GTK here for splash. + +diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp +index 0686ff814916b..ae4a4ea55f420 100644 +--- a/widget/gtk/nsAppShell.cpp ++++ b/widget/gtk/nsAppShell.cpp +@@ -24,6 +24,7 @@ + # include "WakeLockListener.h" + #endif + #include "gfxPlatform.h" ++#include "nsAppRunner.h" + #include "ScreenHelperGTK.h" + #include "HeadlessScreenHelper.h" + #include "mozilla/widget/ScreenManager.h" +@@ -171,10 +172,8 @@ nsresult nsAppShell::Init() { + // option when program uses gdk_set_program_class(). + // + // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 +- nsAutoString brandName; +- mozilla::widget::WidgetUtils::GetBrandShortName(brandName); +- if (!brandName.IsEmpty()) { +- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get()); ++ if (gAppData) { ++ gdk_set_program_class(gAppData->remotingName); + } + } + +-- +2.21.0 + diff --git a/firefox-69.0.2-no-relinking.patch b/firefox-69.0.2-no-relinking.patch new file mode 100644 index 0000000..6dd9884 --- /dev/null +++ b/firefox-69.0.2-no-relinking.patch @@ -0,0 +1,41 @@ + +# HG changeset patch +# User Mike Shal +# Date 1570127498 25200 +# Node ID b8bc2504f108d8a2216ee11405cbbe4cf7a0eaec +# Parent 9a4d6aacc48080f019024c02ac7da1fd576b39fe +Bug XYZ - Only force re-linking on 1-tier PGO builds; r?#firefox-build-system-reviewers + + +diff --git a/config/rules.mk b/config/rules.mk +--- a/config/rules.mk ++++ b/config/rules.mk +@@ -465,25 +465,27 @@ ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_) + $(foreach pgd,$(wildcard *.pgd),pgomgr -clear $(pgd);) + else + ifdef GNU_CC + -$(RM) *.gcda + endif + endif + endif + ++ifdef MOZ_1TIER_PGO + ifneq (,$(MOZ_PROFILE_GENERATE)$(MOZ_PROFILE_USE)) + ifneq (,$(filter target,$(MAKECMDGOALS))) + ifdef GNU_CC + # Force rebuilding libraries and programs in both passes because each + # pass uses different object files. + $(PROGRAM) $(SHARED_LIBRARY) $(LIBRARY): FORCE + endif + endif + endif ++endif + + endif # NO_PROFILE_GUIDED_OPTIMIZE + + ############################################## + + clean clobber realclean clobber_all:: + -$(RM) $(ALL_TRASH) + -$(RM) -r $(ALL_TRASH_DIRS) + diff --git a/firefox-70.0-fix-__warn_memset_zero_len.patch b/firefox-70.0-fix-__warn_memset_zero_len.patch new file mode 100644 index 0000000..9b8c980 --- /dev/null +++ b/firefox-70.0-fix-__warn_memset_zero_len.patch @@ -0,0 +1,11 @@ +--- mozilla-release-FIREFOX_70_0_RELEASE/media/ffvpx/libavcodec/utils.c.orig 2019-10-31 09:15:24.819410877 +0100 ++++ mozilla-release-FIREFOX_70_0_RELEASE/media/ffvpx/libavcodec/utils.c 2019-10-31 09:13:52.736038110 +0100 +@@ -421,7 +421,7 @@ + if (desc->comp[0].depth >= 9) { + for (x = 0; x0) + memset(dst, c[p], bytes); + dst += frame->linesize[p]; + } diff --git a/firefox.spec b/firefox.spec index ec4221e..37d766b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -17,7 +17,7 @@ %define pkgver %(echo %version | tr . _) Name: firefox -Version: 64.0 +Version: 70.0 Release: 1mamba Epoch: 1 Summary: The next generation browsing technology from mozilla.org @@ -52,6 +52,9 @@ Patch9: firefox-42.0-build-add-freetype-system-wrapper.patch Patch10: firefox-43.0.4-fix-missing-PR_snprint.patch Patch11: firefox-47.0-gcc-6.1.0.patch Patch12: firefox-48.0.1-install_dir.patch +Patch13: firefox-69.0-use-remoting-names-for-gdk-application-names.patch +Patch14: firefox-69.0.2-no-relinking.patch +Patch15: firefox-70.0-fix-__warn_memset_zero_len.patch License: GPL, LGPL, MPL 1.1 ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -69,7 +72,6 @@ BuildRequires: libatk-devel BuildRequires: libcairo-devel BuildRequires: libdbus-devel BuildRequires: libdbus-glib-devel -BuildRequires: libffi-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel BuildRequires: libgcc @@ -77,19 +79,14 @@ BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel BuildRequires: libgtk-devel BuildRequires: libgtk2-devel -BuildRequires: libicu-devel -BuildRequires: libjpeg-devel +BuildRequires: libharfbuzz-devel BuildRequires: libnspr-devel BuildRequires: libnss-devel BuildRequires: libpango-devel -BuildRequires: libsqlite-devel BuildRequires: libstartup-notification-devel BuildRequires: libstdc++6-devel -BuildRequires: libvpx-devel BuildRequires: libxcb-devel -BuildRequires: libz-devel ## AUTOBUILDREQ-END -#BuildRequires: xulrunner-devel = %{version} BuildRequires: GConf-devel BuildRequires: libart_lgpl-devel BuildRequires: libbonoboui-devel @@ -108,7 +105,6 @@ BuildRequires: libxml2-devel BuildRequires: libdbus-glib-devel BuildRequires: libcurl-devel BuildRequires: libz-devel -#BuildRequires: mozldap-devel BuildRequires: pkgconfig BuildRequires: libXext-devel BuildRequires: xorg-proto-devel @@ -123,7 +119,8 @@ BuildRequires: bash BuildRequires: yasm BuildRequires: rust-bin BuildRequires: cbindgen -#Requires: xulrunner = %{version} +BuildRequires: cbindgen +BuildRequires: xorg-server-xvfb Provides: xulrunner Obsoletes: xulrunner BuildRoot: %{_tmppath}/firefox-%{version}-root @@ -143,8 +140,9 @@ Mofilla Firefox is the next generation browsing technology from mozilla.org. This package contains static libraries and header files need for development. %prep -%setup -q -n mozilla-release-FIREFOX_%{pkgver}_RELEASE -D -T -:<< ___EOF +%setup -q -n mozilla-release-FIREFOX_%{pkgver}_RELEASE +#-D -T +#:<< ___EOF #cd %{source_dir} # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297 @@ -173,151 +171,124 @@ sed -e 's|__RPM_VERSION_INTERNAL__|%{firefox_internal_version}|' %{PATCH0} | pat # TODO: temporary disabled patch #%patch12 -p1 -#% define _use_internal_dependency_generator 0 -#% define __find_provides %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh -# -#cat > %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh <<_EOF -##! /bin/sh -#grep -v %{buildroot}%{_libdir}/firefox- | \ -#%{_prefix}/lib/rpm/find-provides %{buildroot} %{_target_cpu} -#_EOF -#chmod +x %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh -# -#% define __find_requires %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh -#cat > %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh <<_EOF -##! /bin/sh -#%{_prefix}/lib/rpm/find-requires %{buildroot} %{_target_cpu} 2>/dev/null | -#while read line; do -# [ ! -f %{buildroot}%{firefoxappdir}/\$line ] && echo "\$line" -#done -#_EOF -#chmod +x %{_builddir}/firefox-%{version}/%{source_dir}/find_requires.sh +%patch13 -p1 +%patch14 -p1 +%ifarch %{ix86} +%patch15 -p1 +%endif echo -n "AIzaSyBT3wXwxmFuUQcyeMyp0MbHHhhFwNfWKTc" >google-api-key #echo -n "$_mozilla_api_key" >mozilla-api-key #___EOF +cat > mozconfig.base <.mozconfig mozconfig.base - <.mozconfig mozconfig.base - < 70.0-1mamba +- automatic version update by autodist + +* Sun Jan 13 2019 Automatic Build System 64.0.2-1mamba +- automatic version update by autodist + * Sun Jan 06 2019 Automatic Build System 64.0-1mamba - automatic version update by autodist @@ -2415,7 +2347,7 @@ Zulu language support for Firefox. * Tue Nov 09 2004 Silvan Calarco 1.0-1qilnx - new version build -* Mon Oct 28 2004 Silvan Calarco 1.0rc1-1qilnx +* Thu Oct 28 2004 Silvan Calarco 1.0rc1-1qilnx - new version build * Mon Oct 04 2004 Silvan Calarco 0.10.1-1qilnx