Attachment 8653 Details for Bug 38169 – spec diff между сизифным и 2.53.1 (ftbfs)

[patch] spec diff между сизифным и 2.53.1 (ftbfs)

seamonkey.spec.diff (text/plain), 2.61 KB, created by Michael Shigorin on 2020-03-06 18:01:29 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2020-03-06 18:01:29 MSK

Size: 2.61 KB

patch

obsolete

>--- seamonkey.spec-2.4x	2019-12-01 21:10:14.116559646 +0300
>+++ seamonkey.spec	2020-03-02 17:06:13.740813262 +0300
>@@ -14,8 +14,8 @@
> %define sm_develdir     %sm_prefix-devel
> 
> Name: 	 seamonkey
>-Version: 2.49.5
>-Release: alt2
>+Version: 2.53.1
>+Release: alt1
> Epoch:   1
> 
> Summary: Web browser and mail reader
>@@ -85,7 +85,8 @@
> %if_with system_mozldap
> BuildPreReq: mozldap-devel
> %endif
>-BuildRequires: gcc-c++ libdnet-devel libgtk+2-devel libIDL-devel wget libarchive-devel lbzip2 libpixman-devel
>+BuildRequires: rust rust-cargo /proc
>+BuildRequires: gcc-c++ libdnet-devel libgtk+2-devel libgtk+3-devel libIDL-devel wget libarchive-devel lbzip2 libpixman-devel
> BuildRequires: libjpeg-devel libpng-devel libXinerama-devel libXext-devel
> BuildRequires: libXp-devel libXt-devel makedepend net-tools unzip libalsa-devel yasm libwireless-devel
> BuildRequires: xorg-cf-files zip libXft-devel libvpx-devel
>@@ -162,14 +163,16 @@
> %endif
> 
> %patch0 -p1
>-%patch1 -p1
>+# fails to apply against 2.53.1
>+#patch1 -p1
> %patch2 -p1
> %patch3 -p1
> %if_with system_mozldap
> %patch5 -p1 -b .mozldap
> %endif
> %patch6 -p2
>-%patch7 -p2
>+# fails to apply against 2.53.1
>+#patch7 -p2
> #%%patch8 -p2
> #patch9 -p2
> 
>@@ -181,11 +184,14 @@
> %endif
> 
> ### roll back a changeset breaking gtk2 compatibility (cf. https://bugzilla.mozilla.org/show_bug.cgi?id=1461307)
>-%patch11 -p0
>+# cairo-gtk2 is unsupported build target as of 2.53.1
>+#patch11 -p0
> ### don't link against crmf when using system NSS (cf. https://bugzilla.mozilla.org/show_bug.cgi?id=1371991)
>-%patch12 -p0
>+# fails to apply against 2.53.1
>+#patch12 -p0
> ### temporary fix: protection against dereferencing an invalid pointer in js::ProxyObject::New():
>-%patch13 -p0
>+# fails to apply against 2.53.1
>+#patch13 -p0
> 
> ### Copying .mozconfig to build directory
> cp -f %SOURCE7 .mozconfig
>@@ -219,9 +225,11 @@
> 
> # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
> # however builds tend to fail on other arches when building in parallel.
>+# 2.53.1: let's at least try 8 on x86
> %ifarch %ix86 x86_64
> [ "%__nprocs" -ge 2 ] && MOZ_SMP_FLAGS=-j2
> [ "%__nprocs" -ge 4 ] && MOZ_SMP_FLAGS=-j4
>+[ "%__nprocs" -ge 8 ] && MOZ_SMP_FLAGS=-j8
> %endif
> 
> # a kludge since 2.26 ...
>@@ -467,6 +475,12 @@
> %_sysconfdir/rpm/macros.d/%name
> 
> %changelog
>+* Fri Feb 28 2020 Michael Shigorin <mike@altlinux.org> 1:2.53.1-alt1
>+- 2.53.1
>+  + backup user profile(s) and see the release notes:
>+    http://www.seamonkey-project.org/releases/seamonkey2.53.1/
>+  + cairo-gtk3 build (gtk2 is unsupported now)
>+
> * Sun Dec 01 2019 Michael Shigorin <mike@altlinux.org> 1:2.49.5-alt2
> - applied ftbfs patches by Oleg Zenin (fixes: #37449)
>

Actions: View | Diff

Attachments on bug 38169: 8653