Attachment 10716 Details for Bug 24258 – diff for firefox.spec file

[patch] diff for firefox.spec file

firefox.spec.diff (text/plain), 5.21 KB, created by Giuseppe Ghibò on 2019-02-02 18:14:54 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ghibò

Created: 2019-02-02 18:14:54 CET

Size: 5.21 KB

patch

obsolete

>Index: firefox.spec
>===================================================================
>--- firefox.spec	(revision 1362239)
>+++ firefox.spec	(working copy)
>@@ -19,6 +19,9 @@
> # Use system cairo?
> %global system_cairo      0
> 
>+# Use system nss/nspr
>+%global system_nss        1
>+
> %global major 60
> %global ff_epoch 0
> # (tpg) set version HERE !!!
>@@ -31,8 +34,16 @@
> %global pluginsdir %{_libdir}/mozilla/plugins
> 
> # libxul.so is provided by libxulrunnner2.0.
>-%global __requires_exclude libxul.so
>+%global __requires_exclude ^libxul\\.so
>+%global __provides_exclude ^libxul\\.so
> 
>+# exclude libnss from requires when system_nss is disabled
>+%if !%{?system_nss}
>+# exclude libnss from provides (e.g.: when system_nss is disabled)
>+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^libnss3\\.so|^libnspr4\\.so|^libnssckbi\.so|^libnssdbm3\.so|^libnssutil3\.so|^libfreeblpriv3\\.so|^libplc4\\.so|^libplds4\\.so|^libsmime3\\.so|libsoftokn3\\.so|libssl3\\.so
>+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^libnss3\\.so|^libnspr4\\.so|^libnssckbi\.so|^libnssdbm3\.so|^libnssutil3\.so|^libfreeblpriv3\\.so|^libplc4\\.so|^libplds4\\.so|^libsmime3\\.so|libsoftokn3\\.so|libssl3\\.so
>+%endif
>+
> # Build as a debug package?
> %global debug_build       0
> 
>@@ -45,7 +56,7 @@
> # this seems fragile, so require the exact version or later (#58754)
> %global nspr_version 4.20
> %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
>-%global nss_version 3.36.5
>+%global nss_version 3.36.7
> %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
> %global sqlite_version 3.22.0
> # The actual sqlite version (see #480989):
>@@ -60,7 +71,7 @@
> Name:		firefox
> Version:	%{major}.5.0
> Epoch:		%{ff_epoch}
>-Release:	%mkrel 1
>+Release:	%mkrel 2
> License:	MPLv1.1 or GPLv2+ or LGPLv2+
> Group:		Networking/WWW
> Url:		https://www.mozilla.org/firefox/organizations/
>@@ -115,15 +126,17 @@
> # (doktor5000) if the patches need updating, grab both from the branch corresponding with the current firefox version at
> # http://www.rosenauer.org/hg/mozilla
> Patch1011:	http://www.rosenauer.org/hg/mozilla/file/tip/mozilla-kde.patch
>-# (fwang) please modify patch12 with `sed -e 's/MozillaFirefox/firefox/'` to fit our desktop filename
>+# (fwang) please modify patch1012 with `sed -e 's/MozillaFirefox/firefox/'` to fit our desktop filename
> Patch1012:	http://www.rosenauer.org/hg/mozilla/file/tip/firefox-kde.patch
> 
> Patch1037:	firefox-38.0-nss-version.patch
> Patch1039:	firefox-59.0-optimize-dont-force-O3.patch
> 
>+%if %{?system_nss}
> BuildRequires:	pkgconfig(nspr) >= %{nspr_version}
> BuildRequires:	pkgconfig(nss) >= %{nss_version}
> BuildRequires:	nss-static-devel >= %{nss_version}
>+%endif
> %if %{?system_cairo}
> BuildRequires:	pkgconfig(cairo) >= %{cairo_version}
> %endif
>@@ -135,12 +148,12 @@
> BuildRequires:	bzip2-devel
> BuildRequires:	pkgconfig(zlib)
> BuildRequires:	pkgconfig(libIDL-2.0)
>-BuildRequires:	pkgconfig(gtk+-3.0)
>-BuildRequires:	pkgconfig(gtk+-2.0)
>-BuildRequires:	pkgconfig(pango)
>+BuildRequires:	pkgconfig(gtk+-3.0) >= 3.4.0
>+BuildRequires:	pkgconfig(gtk+-2.0) >= 2.18.0
>+BuildRequires:	pkgconfig(pango) >= 1.22.0
> BuildRequires:	pkgconfig(xt)
> BuildRequires:	pkgconfig(hunspell) >= 1.5.1
>-BuildRequires:	pkgconfig(libstartup-notification-1.0)
>+BuildRequires:	pkgconfig(libstartup-notification-1.0) >= 0.8
> BuildRequires:	pkgconfig(libnotify) >= %{libnotify_version}
> BuildRequires:	pkgconfig(dri)
> %if %mgaver > 5
>@@ -149,13 +162,16 @@
> BuildRequires:	autoconf2.1
> BuildRequires:	pkgconfig(libpulse)
> BuildRequires:	pkgconfig(icu-i18n)
>-BuildRequires:	pkgconfig(gconf-2.0)
>+BuildRequires:	pkgconfig(gconf-2.0) >= 1.2.1
>+
> BuildRequires:	yasm
> BuildRequires:  llvm
> BuildRequires:  llvm-devel
> BuildRequires:  clang
>+%if %{?system_nss}
> Requires:	%{mklibname nss 3} >= 2:%{nss_build_version}
> Requires:	%{mklibname nspr 4} >= 2:%{nspr_build_version}
>+%endif
> BuildRequires:	python
> BuildRequires:	pkgconfig(sqlite3) >= %{sqlite_version}
> Requires:	%{mklibname sqlite3_ 0} >= %{sqlite_build_version}
>@@ -165,7 +181,8 @@
> BuildRequires:	libiw-devel
> BuildRequires:	python-virtualenv
> BuildRequires:	pkgconfig(libproxy-1.0)
>-BuildRequires:  rust
>+# from build/moz.configure/rust.configure
>+BuildRequires:  rust >= 1.24.0
> BuildRequires:  cargo
> 
> Provides:	%{name} = %{epoch}:%{version}
>@@ -236,8 +253,8 @@
> %patch1000 -p1 -b .lang
> %patch1001 -p1 -b .npapi-missing-include
> %patch1005 -p1 -b .appname
>-#patch1011 -p1 -b .mozkde
>-#patch1012 -p1 -b .ffkde
>+%patch1011 -p1 -b .mozkde
>+%patch1012 -p1 -b .ffkde
> 
> %patch1037 -p0
> %patch1039 -p1 -b .noo3_noos
>@@ -263,8 +280,13 @@
> %{__cp} %{SOURCE24} mozilla-api-key
> %{__cp} %{SOURCE27} google-api-key
> 
>+%if %{?system_nss}
> echo "ac_add_options --with-system-nspr" >> .mozconfig
> echo "ac_add_options --with-system-nss" >> .mozconfig
>+%else
>+echo "ac_add_options --without-system-nspr" >> .mozconfig
>+echo "ac_add_options --without-system-nss" >> .mozconfig
>+%endif
> 
> echo "ac_add_options --enable-system-sqlite" >> .mozconfig
> 
>@@ -411,7 +433,7 @@
> export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
> export MOZ_SERVICES_SYNC="1"
> export STRIP=/bin/true
>-./mach build
>+./mach build -v
> 
> %install
> make -C objdir/browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0

Index: firefox.spec
===================================================================
--- firefox.spec	(revision 1362239)
+++ firefox.spec	(working copy)
@@ -19,6 +19,9 @@
 # Use system cairo?
 %global system_cairo      0
 
+# Use system nss/nspr
+%global system_nss        1
+
 %global major 60
 %global ff_epoch 0
 # (tpg) set version HERE !!!
@@ -31,8 +34,16 @@
 %global pluginsdir %{_libdir}/mozilla/plugins
 
 # libxul.so is provided by libxulrunnner2.0.
-%global __requires_exclude libxul.so
+%global __requires_exclude ^libxul\\.so
+%global __provides_exclude ^libxul\\.so
 
+# exclude libnss from requires when system_nss is disabled
+%if !%{?system_nss}
+# exclude libnss from provides (e.g.: when system_nss is disabled)
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^libnss3\\.so|^libnspr4\\.so|^libnssckbi\.so|^libnssdbm3\.so|^libnssutil3\.so|^libfreeblpriv3\\.so|^libplc4\\.so|^libplds4\\.so|^libsmime3\\.so|libsoftokn3\\.so|libssl3\\.so
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^libnss3\\.so|^libnspr4\\.so|^libnssckbi\.so|^libnssdbm3\.so|^libnssutil3\.so|^libfreeblpriv3\\.so|^libplc4\\.so|^libplds4\\.so|^libsmime3\\.so|libsoftokn3\\.so|libssl3\\.so
+%endif
+
 # Build as a debug package?
 %global debug_build       0
 
@@ -45,7 +56,7 @@
 # this seems fragile, so require the exact version or later (#58754)
 %global nspr_version 4.20
 %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
-%global nss_version 3.36.5
+%global nss_version 3.36.7
 %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
 %global sqlite_version 3.22.0
 # The actual sqlite version (see #480989):
@@ -60,7 +71,7 @@
 Name:		firefox
 Version:	%{major}.5.0
 Epoch:		%{ff_epoch}
-Release:	%mkrel 1
+Release:	%mkrel 2
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
 Group:		Networking/WWW
 Url:		https://www.mozilla.org/firefox/organizations/
@@ -115,15 +126,17 @@
 # (doktor5000) if the patches need updating, grab both from the branch corresponding with the current firefox version at
 # http://www.rosenauer.org/hg/mozilla
 Patch1011:	http://www.rosenauer.org/hg/mozilla/file/tip/mozilla-kde.patch
-# (fwang) please modify patch12 with `sed -e 's/MozillaFirefox/firefox/'` to fit our desktop filename
+# (fwang) please modify patch1012 with `sed -e 's/MozillaFirefox/firefox/'` to fit our desktop filename
 Patch1012:	http://www.rosenauer.org/hg/mozilla/file/tip/firefox-kde.patch
 
 Patch1037:	firefox-38.0-nss-version.patch
 Patch1039:	firefox-59.0-optimize-dont-force-O3.patch
 
+%if %{?system_nss}
 BuildRequires:	pkgconfig(nspr) >= %{nspr_version}
 BuildRequires:	pkgconfig(nss) >= %{nss_version}
 BuildRequires:	nss-static-devel >= %{nss_version}
+%endif
 %if %{?system_cairo}
 BuildRequires:	pkgconfig(cairo) >= %{cairo_version}
 %endif
@@ -135,12 +148,12 @@
 BuildRequires:	bzip2-devel
 BuildRequires:	pkgconfig(zlib)
 BuildRequires:	pkgconfig(libIDL-2.0)
-BuildRequires:	pkgconfig(gtk+-3.0)
-BuildRequires:	pkgconfig(gtk+-2.0)
-BuildRequires:	pkgconfig(pango)
+BuildRequires:	pkgconfig(gtk+-3.0) >= 3.4.0
+BuildRequires:	pkgconfig(gtk+-2.0) >= 2.18.0
+BuildRequires:	pkgconfig(pango) >= 1.22.0
 BuildRequires:	pkgconfig(xt)
 BuildRequires:	pkgconfig(hunspell) >= 1.5.1
-BuildRequires:	pkgconfig(libstartup-notification-1.0)
+BuildRequires:	pkgconfig(libstartup-notification-1.0) >= 0.8
 BuildRequires:	pkgconfig(libnotify) >= %{libnotify_version}
 BuildRequires:	pkgconfig(dri)
 %if %mgaver > 5
@@ -149,13 +162,16 @@
 BuildRequires:	autoconf2.1
 BuildRequires:	pkgconfig(libpulse)
 BuildRequires:	pkgconfig(icu-i18n)
-BuildRequires:	pkgconfig(gconf-2.0)
+BuildRequires:	pkgconfig(gconf-2.0) >= 1.2.1
+
 BuildRequires:	yasm
 BuildRequires:  llvm
 BuildRequires:  llvm-devel
 BuildRequires:  clang
+%if %{?system_nss}
 Requires:	%{mklibname nss 3} >= 2:%{nss_build_version}
 Requires:	%{mklibname nspr 4} >= 2:%{nspr_build_version}
+%endif
 BuildRequires:	python
 BuildRequires:	pkgconfig(sqlite3) >= %{sqlite_version}
 Requires:	%{mklibname sqlite3_ 0} >= %{sqlite_build_version}
@@ -165,7 +181,8 @@
 BuildRequires:	libiw-devel
 BuildRequires:	python-virtualenv
 BuildRequires:	pkgconfig(libproxy-1.0)
-BuildRequires:  rust
+# from build/moz.configure/rust.configure
+BuildRequires:  rust >= 1.24.0
 BuildRequires:  cargo
 
 Provides:	%{name} = %{epoch}:%{version}
@@ -236,8 +253,8 @@
 %patch1000 -p1 -b .lang
 %patch1001 -p1 -b .npapi-missing-include
 %patch1005 -p1 -b .appname
-#patch1011 -p1 -b .mozkde
-#patch1012 -p1 -b .ffkde
+%patch1011 -p1 -b .mozkde
+%patch1012 -p1 -b .ffkde
 
 %patch1037 -p0
 %patch1039 -p1 -b .noo3_noos
@@ -263,8 +280,13 @@
 %{__cp} %{SOURCE24} mozilla-api-key
 %{__cp} %{SOURCE27} google-api-key
 
+%if %{?system_nss}
 echo "ac_add_options --with-system-nspr" >> .mozconfig
 echo "ac_add_options --with-system-nss" >> .mozconfig
+%else
+echo "ac_add_options --without-system-nspr" >> .mozconfig
+echo "ac_add_options --without-system-nss" >> .mozconfig
+%endif
 
 echo "ac_add_options --enable-system-sqlite" >> .mozconfig
 
@@ -411,7 +433,7 @@
 export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 export MOZ_SERVICES_SYNC="1"
 export STRIP=/bin/true
-./mach build
+./mach build -v
 
 %install
 make -C objdir/browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0

Actions: View | Diff

Attachments on bug 24258: 10716 | 10717 | 10718