rpms/webkitgtk/F-12 Makefile, 1.2, 1.3 branch, 1.1, 1.2 sources, 1.14, 1.15 webkit-1.1.14-nspluginwrapper.patch, 1.1, 1.2 webkitgtk.spec, 1.31, 1.32 webkit-1.1.15.4-atomic-word.patch, 1.2, NONE webkit-1.1.15.4-s390x.patch, 1.1, NONE webkit-1.1.15.4-sparc.patch, 1.1, NONE

Thu Jun 3 12:55:48 UTC 2010

Author: sundaram

Update of /cvs/pkgs/rpms/webkitgtk/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18587

Modified Files:
	Makefile branch sources webkit-1.1.14-nspluginwrapper.patch 
	webkitgtk.spec 
Removed Files:
	webkit-1.1.15.4-atomic-word.patch webkit-1.1.15.4-s390x.patch 
	webkit-1.1.15.4-sparc.patch 
Log Message:
* Sun Apr 11 2010 Matthias Clasen <mclasen at redhat.com> 1.2.0-1
- Update to 1.2.0





Index: branch
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/branch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2

--- branch	29 Sep 2009 07:17:53 -0000	1.1
+++ branch	3 Jun 2010 12:55:47 -0000	1.2
@@ -1 +1 @@
-F-12
+F-13


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	11 Dec 2009 21:07:55 -0000	1.14
+++ sources	3 Jun 2010 12:55:47 -0000	1.15
@@ -1 +1 @@
-47301fb7120421ac38bf714db8f5d428  webkit-1.1.15.4.tar.gz
+b2bfcbc4bbf1d0a51f848cb54c21ee66  webkit-1.2.0.tar.gz

webkit-1.1.14-nspluginwrapper.patch:
 PluginDatabase.cpp |    3 +++
 1 file changed, 3 insertions(+)

Index: webkit-1.1.14-nspluginwrapper.patch
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/webkit-1.1.14-nspluginwrapper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webkit-1.1.14-nspluginwrapper.patch	14 Sep 2009 17:56:11 -0000	1.1
+++ webkit-1.1.14-nspluginwrapper.patch	3 Jun 2010 12:55:47 -0000	1.2
@@ -1,9 +1,9 @@
---- webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp.orig	2009-09-14 17:48:44.000000000 +0100
-+++ webkit-1.1.14/WebCore/plugins/PluginDatabase.cpp	2009-09-14 17:50:28.000000000 +0100
-@@ -355,6 +355,9 @@ Vector<String> PluginDatabase::defaultPl
-     paths.append("/usr/lib/netscape/plugins-libc6");
-     paths.append("/usr/lib64/netscape/plugins");
+--- webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp.old	2009-12-01 15:22:10.000000000 +0000
++++ webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp	2009-12-01 15:22:21.000000000 +0000
+@@ -357,6 +357,9 @@ Vector<String> PluginDatabase::defaultPl
      paths.append("/usr/lib64/mozilla/plugins");
+     paths.append("/usr/lib/nsbrowser/plugins");
+     paths.append("/usr/lib64/nsbrowser/plugins");
 +    /* And for nspluginwrapper */
 +    paths.append("/usr/lib64/mozilla/plugins-wrapped");
 +    paths.append("/usr/lib/mozilla/plugins-wrapped");


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/F-12/webkitgtk.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- webkitgtk.spec	31 Mar 2010 14:03:45 -0000	1.31
+++ webkitgtk.spec	3 Jun 2010 12:55:48 -0000	1.32
@@ -34,8 +34,8 @@
 %bcond_with 	wml
 
 Name:		webkitgtk
-Version:	1.1.15.4
-Release:	3%{?dist}.1
+Version:	1.2.0
+Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -47,10 +47,6 @@ URL:		http://www.webkitgtk.org/
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
-# Fix for sparc/sparc64
-# Derived from: https://bugs.webkit.org/show_bug.cgi?id=35429
-Patch0: 	webkit-1.1.15.4-sparc.patch
-
 ## See: https://bugzilla.redhat.com/show_bug.cgi?id=516057
 ## FIXME: We forcibly disable the JIT compiler for the time being.
 ## This is a temporary workaround which causes a slight performance hit on
@@ -59,10 +55,8 @@ Patch0: 	webkit-1.1.15.4-sparc.patch
 ## bug. :)
 #Patch1: 	webkit-1.1.13-no-execmem.patch
 Patch2: 	webkit-1.1.14-nspluginwrapper.patch
-
-Patch3: 	webkit-1.1.15.4-s390x.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# https://bugs.webkit.org/show_bug.cgi?id=36381
+Patch3: 	webkit-1.1.22-icu44.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -122,10 +116,9 @@ LICENSE, README, and AUTHORS files.
 
 %prep
 %setup -qn "webkit-%{version}"
-%patch0 -p1 -b .sparc
 # %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
-%patch3 -p1 -b .s390x
+%patch3 -p2 -b .icu44
 
 %build
 CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure							\
@@ -138,8 +131,11 @@ CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_
 %{?with_svg:		--enable-svg-filters		}	\
 %{?with_wml:		--enable-wml			}
 
-make %{?_smp_mflags}
+mkdir -p DerivedSources/
 
+# Disabled because of https://bugs.webkit.org/show_bug.cgi?id=34846
+#make %{?_smp_mflags}
+make
 
 %install
 rm -rf %{buildroot}
@@ -202,18 +198,30 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Mar 31 2010 Karsten Hopp <karsten at redhat.com> 1.1.15.4-3.1
-- add s390 patch
+* Sun Apr 11 2010 Matthias Clasen <mclasen at redhat.com> 1.2.0-1
+- Update to 1.2.0
+
+* Fri Apr 02 2010 Caolán McNamara <caolanm at redhat.com> 1.1.22-3
+- rebuild for icu 4.4
+
+* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa at redhat.com> 1.1.22-2
+- apply upstream fix for sparc
+
+* Mon Feb 22 2010 Matthias Clasen <mclasen at redhat.com> 1.1.22-1
+- Update to 1.1.22
+
+* Wed Feb 10 2010 Bastien Nocera <bnocera at redhat.com> 1.1.21-1
+- Update to 1.1.21
+
+* Tue Jan 26 2010 Matthias Clasen <mclasen at redhat.com> 1.1.19-1
+- Update to 1.1.19
 
-* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.15.4-3
-- fixup sparc handling
+* Sun Jan 17 2010 Matthias Clasen <mclasen at redhat.com> 1.1.18-1
+- Update to 1.1.18
 
-* Tue Feb 23 2010 Dennis Gilmore <dennis at ausil.us> - 1.1.15.4-2
-- update sparc64 attomic word patch
+* Tue Dec 01 2009 Bastien Nocera <bnocera at redhat.com> 1.1.17-1
+- Update to 1.1.17
 
-* Fri Dec 11 2009 Adam Miller <maxamillion at fedoraproject.org> - 1.1.15.4-1
-- Update to 1.1.15.4
- 
 * Sat Oct 31 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.3-1
 - Update to 1.1.15.3, more crash fixes and important media player fixes
 - See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000047.html


--- webkit-1.1.15.4-atomic-word.patch DELETED ---


--- webkit-1.1.15.4-s390x.patch DELETED ---


--- webkit-1.1.15.4-sparc.patch DELETED ---

