packages: mozilla-firefox/mozilla-firefox-install.patch, mozilla-firefox/mo...

qboosh qboosh at pld-linux.org
Wed Mar 14 20:06:33 CET 2012


Author: qboosh                       Date: Wed Mar 14 19:06:33 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 10.0.2

---- Files affected:
packages/mozilla-firefox:
   mozilla-firefox-install.patch (1.5 -> 1.6) , mozilla-firefox.spec (1.277 -> 1.278) 

---- Diffs:

================================================================
Index: packages/mozilla-firefox/mozilla-firefox-install.patch
diff -u packages/mozilla-firefox/mozilla-firefox-install.patch:1.5 packages/mozilla-firefox/mozilla-firefox-install.patch:1.6
--- packages/mozilla-firefox/mozilla-firefox-install.patch:1.5	Mon Oct 17 18:29:05 2011
+++ packages/mozilla-firefox/mozilla-firefox-install.patch	Wed Mar 14 20:06:28 2012
@@ -1,11 +1,11 @@
 --- mozilla/browser/app/Makefile.in	2008-06-22 22:54:03.000000000 +0200
 +++ mozilla/browser/app/Makefile.in	2008-06-23 10:34:59.000000000 +0200
 @@ -397,7 +397,7 @@
- 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
- 	$(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
+ 	rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
+ 	$(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign
  ifdef LIBXUL_SDK
--	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox
-+	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)
+-	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/firefox
++	cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)
  else
  	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
  	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

================================================================
Index: packages/mozilla-firefox/mozilla-firefox.spec
diff -u packages/mozilla-firefox/mozilla-firefox.spec:1.277 packages/mozilla-firefox/mozilla-firefox.spec:1.278
--- packages/mozilla-firefox/mozilla-firefox.spec:1.277	Sat Jan 21 09:22:28 2012
+++ packages/mozilla-firefox/mozilla-firefox.spec	Wed Mar 14 20:06:28 2012
@@ -2,9 +2,6 @@
 # NOTE: PLD distributes iceweasel instead
 #
 # TODO:
-# - handle locales differently (runtime, since it's possible to do)
-# - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
-#   for hints how to make locales
 # - (12:22:58)  patrys:  can you also move _libdir/mozilla-firefox to just _libdir/firefox?
 #   (12:23:25)  patrys:  it's not like we ship official firefox
 # - fix wrapper script to allow playing with profiles (must not use -remote)
@@ -28,12 +25,12 @@
 Summary:	Firefox Community Edition web browser
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
 Name:		mozilla-firefox
-Version:	9.0.1
+Version:	10.0.2
 Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	7cf2bd379792a9b232267c6a79680566
+# Source0-md5:	5ce038d591964f72c534fa33b75a62f5
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-install.patch
@@ -54,7 +51,7 @@
 BuildRequires:	cairo-devel >= 1.10.2-5
 BuildRequires:	dbus-glib-devel >= 0.60
 BuildRequires:	glib2-devel >= 1:2.18
-BuildRequires:	gtk+2-devel >= 2:2.10
+BuildRequires:	gtk+2-devel >= 2:2.14
 %{?with_kerberos:BuildRequires:	heimdal-devel >= 0.7.1}
 BuildRequires:	hunspell-devel
 BuildRequires:	libIDL-devel >= 0.8.0
@@ -67,12 +64,13 @@
 BuildRequires:	libpng(APNG)-devel >= 0.10
 BuildRequires:	libpng-devel >= 1.4.1
 BuildRequires:	libstdc++-devel
-BuildRequires:	libvpx-devel
+BuildRequires:	libvpx-devel >= 1.0.0
 BuildRequires:	nspr-devel >= 1:4.8.9
 BuildRequires:	nss-devel >= 1:3.13.1
 BuildRequires:	pango-devel >= 1:1.14.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig(libffi) >= 3.0.9
 BuildRequires:	python-modules
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.601
@@ -94,7 +92,8 @@
 Requires:	browser-plugins >= 2.0
 Requires:	cairo >= 1.10.2-5
 Requires:	dbus-glib >= 0.60
-Requires:	gtk+2 >= 2:2.18
+Requires:	glib2 >= 1:2.18
+Requires:	gtk+2 >= 2:2.14
 Requires:	libpng >= 1.4.1
 Requires:	libpng(APNG) >= 0.10
 Requires:	myspell-common
@@ -135,6 +134,9 @@
 mv -f mozilla-release mozilla
 cd mozilla
 
+# libvpx fix
+grep -q VPX_CODEC_USE_INPUT_PARTITION configure.in && sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure || exit 1
+
 %patch0 -p1
 
 %if "%{cc_version}" < "3.4"
@@ -228,6 +230,7 @@
 %endif
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
+ac_add_options --with-system-ffi
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
@@ -514,6 +517,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.278  2012/03/14 19:06:28  qboosh
+- updated to 10.0.2
+
 Revision 1.277  2012/01/21 08:22:28  qboosh
 - updated to 9.0.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-install.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox.spec?r1=1.277&r2=1.278&f=u



More information about the pld-cvs-commit mailing list