Author: qboosh                       Date: Wed Mar 14 17:16:50 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged libvpx 1.0.0 fix from xulrunner
- force system libffi
- fixed glib2/gtk+2 versions

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.172 -> 1.173) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.172 
packages/iceweasel/iceweasel.spec:1.173
--- packages/iceweasel/iceweasel.spec:1.172     Mon Feb 27 11:22:46 2012
+++ packages/iceweasel/iceweasel.spec   Wed Mar 14 18:16:45 2012
@@ -58,12 +58,14 @@
 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
 BuildRequires: libdnet-devel
 BuildRequires: libevent-devel >= 1.4.7
+# standalone libffi 3.0.9 or gcc's from 4.5(?)+
+BuildRequires: libffi-devel >= 6:3.0.9
 %{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
 BuildRequires: libiw-devel
 BuildRequires: libjpeg-devel >= 6b
@@ -71,12 +73,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
@@ -100,7 +103,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
@@ -145,6 +149,9 @@
 cd mozilla
 /bin/sh %{SOURCE2}
 
+# 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
 %patch1 -p1
 
@@ -240,6 +247,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
@@ -537,6 +545,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.173  2012/03/14 17:16:45  qboosh
+- merged libvpx 1.0.0 fix from xulrunner
+- force system libffi
+- fixed glib2/gtk+2 versions
+
 Revision 1.172  2012/02/27 10:22:46  adwol
 - up to 10.0.2
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.172&r2=1.173&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to