]> git.pld-linux.org Git - packages/firefox.git/blobdiff - firefox.spec
- rebuild with libvpx 1.6
[packages/firefox.git] / firefox.spec
index 5f25d2f5b8ff3ea9abd9f9c8933701560f4a83c5..5929bea1f8199d8d49359076df70104a29e25130 100644 (file)
@@ -6,7 +6,7 @@
 %bcond_without gtk3            # GTK+ 3.x instead of 2.x
 %bcond_without kerberos        # disable krb5 support
 %bcond_without official        # official Firefox branding
-%bcond_with    pgo             # PGO-enabled build (requires working $DISPLAY == :100)
+%bcond_without pgo             # PGO-enabled build (requires working $DISPLAY == :100)
 # - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964
 %bcond_with    shared_js       # shared libmozjs library [broken]
 
@@ -25,32 +25,33 @@ Summary:    Firefox web browser
 Summary(hu.UTF-8):     Firefox web böngésző
 Summary(pl.UTF-8):     Firefox - przeglądarka WWW
 Name:          firefox
-Version:       46.0.1
-Release:       3
+Version:       48.0.1
+Release:       2
 License:       MPL v2.0
 Group:         X11/Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
-# Source0-md5: 3e3b90268b8a634f7c60a25eb3a04c8c
+# Source0-md5: 8c09b6cbf13ce13aa57d87175da997f4
 Source3:       %{name}.desktop
 Source4:       %{name}.sh
 Source5:       vendor.js
 Source6:       vendor-ac.js
-Patch1:                idl-parser.patch
-Patch2:                xulrunner-new-libxul.patch
-Patch3:                xulrunner-paths.patch
-Patch4:                xulrunner-pc.patch
-Patch5:                install-pc-files.patch
-Patch6:                %{name}-prefs.patch
-Patch7:                %{name}-pld-bookmarks.patch
-Patch8:                %{name}-no-subshell.patch
-Patch9:                %{name}-middle_click_paste.patch
-Patch11:       %{name}-system-virtualenv.patch
-Patch12:       %{name}-Disable-Firefox-Health-Report.patch
-Patch14:       freetype.patch
+Patch0:                idl-parser.patch
+Patch1:                xulrunner-new-libxul.patch
+Patch2:                xulrunner-paths.patch
+Patch3:                xulrunner-pc.patch
+Patch4:                %{name}-prefs.patch
+Patch5:                %{name}-pld-bookmarks.patch
+Patch6:                %{name}-no-subshell.patch
+Patch7:                %{name}-middle_click_paste.patch
+Patch8:                %{name}-system-virtualenv.patch
+Patch9:                %{name}-Disable-Firefox-Health-Report.patch
+Patch10:       freetype.patch
+Patch11:       firefox-gtk3-20.patch
 URL:           https://www.mozilla.org/firefox/
 BuildRequires: OpenGL-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: automake
+BuildRequires: autoconf2_13
 BuildRequires: bzip2-devel
 BuildRequires: cairo-devel >= 1.10.2-5
 BuildRequires: dbus-glib-devel >= 0.60
@@ -205,20 +206,18 @@ Pakiet programistyczny Firefoxa.
 # hunspell needed for factory including mozHunspell.h
 echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Makefile.in
 
-%patch1 -p2
-%patch2 -p1
-%patch3 -p2
+%patch0 -p2
+%patch1 -p1
+%patch2 -p2
+%patch3 -p1
 %patch4 -p1
-%patch5 -p2
-%patch6 -p1
+%patch5 -p1
+%patch6 -p2
 %patch7 -p1
 %patch8 -p2
 %patch9 -p1
-%patch11 -p2
-%patch12 -p1
-%patch14 -p2
-
-cp -a xulrunner/installer/*.pc.in browser/installer/
+%patch10 -p2
+%patch11 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
 
@@ -235,21 +234,8 @@ cat << 'EOF' > .mozconfig
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
 # Options for 'configure' (same as command-line options).
-ac_add_options --build=%{_target_platform}
 ac_add_options --host=%{_target_platform}
 ac_add_options --prefix=%{_prefix}
-ac_add_options --exec-prefix=%{_exec_prefix}
-ac_add_options --bindir=%{_bindir}
-ac_add_options --sbindir=%{_sbindir}
-ac_add_options --sysconfdir=%{_sysconfdir}
-ac_add_options --datadir=%{_datadir}
-ac_add_options --includedir=%{_includedir}
-ac_add_options --libdir=%{_libdir}
-ac_add_options --libexecdir=%{_libexecdir}
-ac_add_options --localstatedir=%{_localstatedir}
-ac_add_options --sharedstatedir=%{_sharedstatedir}
-ac_add_options --mandir=%{_mandir}
-ac_add_options --infodir=%{_infodir}
 %if %{?debug:1}0
 ac_add_options --disable-optimize
 ac_add_options --enable-debug
@@ -258,11 +244,9 @@ ac_add_options --enable-debugger-info-modules
 ac_add_options --enable-crash-on-assert
 %else
 ac_add_options --disable-debug
-ac_add_options --disable-debug-modules
 ac_add_options --enable-optimize="%{rpmcflags} -Os"
 %endif
 ac_add_options --disable-strip
-ac_add_options --disable-strip-libs
 ac_add_options --disable-install-strip
 %if %{with tests}
 ac_add_options --enable-tests
@@ -273,41 +257,25 @@ ac_add_options --enable-tests
 %else
 ac_add_options --disable-tests
 %endif
-ac_add_options --disable-mochitest
 %endif
-ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-crashreporter
-ac_add_options --disable-elf-dynstr-gc
 ac_add_options --disable-gconf
 ac_add_options --disable-gnomeui
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-installer
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-long-long-warning
 ac_add_options --disable-necko-wifi
-ac_add_options --disable-pedantic
 ac_add_options --disable-updater
-ac_add_options --disable-xterm-updates
-ac_add_options --enable-canvas
 ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
 ac_add_options --enable-extensions=default
 ac_add_options --enable-gio
-ac_add_options --enable-gstreamer=1.0
-ac_add_options --enable-libxul
-ac_add_options --enable-mathml
-ac_add_options --enable-pango
 ac_add_options --enable-readline
 ac_add_options --enable-safe-browsing
 %{?with_shared_js:ac_add_options --enable-shared-js}
 ac_add_options --enable-startup-notification
-ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-url-classifier
-ac_add_options --enable-xinerama
 %{?with_official:ac_add_options --enable-official-branding}
 ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
 ac_add_options --with-distribution-id=org.pld-linux
@@ -319,7 +287,6 @@ ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-ply
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
 ac_add_options --with-x
@@ -332,15 +299,13 @@ XVFB_PID=$!
 [ -n "$XVFB_PID" ] || exit 1
 export DISPLAY=:${D}
 %{__make} -j1 -f client.mk profiledbuild \
+       AUTOCONF=/usr/bin/autoconf2_13 \
        DESTDIR=obj-%{_target_cpu}/dist \
-       CC="%{__cc}" \
-       CXX="%{__cxx}" \
        MOZ_MAKE_FLAGS="%{_smp_mflags}"
 kill $XVFB_PID
 %else
 %{__make} -j1 -f client.mk build \
-       CC="%{__cc}" \
-       CXX="%{__cxx}" \
+       AUTOCONF=/usr/bin/autoconf2_13 \
        MOZ_MAKE_FLAGS="%{_smp_mflags}"
 %endif
 
@@ -496,8 +461,6 @@ fi
 # the signature of the default theme
 %{_datadir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
 %{_libdir}/%{name}/browser/omni.ja
-%{_libdir}/%{name}/webapprt
-%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
 
 %{_libdir}/%{name}/browser/features/loop@mozilla.org.xpi
 %{_libdir}/%{name}/browser/features/e10srollout@mozilla.org.xpi
This page took 0.040975 seconds and 4 git commands to generate.