[webkitgtk4/f22] Remove disable codec installer patch, not needed in GNOME 3.15.90

catanzaro catanzaro at fedoraproject.org
Mon Feb 16 23:49:54 UTC 2015


commit c7e7f87a441539eaf3a3b295d9c82da94b7da7a8
Author: Michael Catanzaro <mcatanzaro at gnome.org>
Date:   Mon Feb 16 17:49:46 2015 -0600

    Remove disable codec installer patch, not needed in GNOME 3.15.90

 webkitgtk-2.7.2-disable-codec-installer.patch |   20 --------------------
 webkitgtk4.spec                               |   17 ++++++++---------
 2 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index c1dbc54..db18387 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -9,7 +9,7 @@
 
 Name:           webkitgtk4
 Version:        2.7.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GTK+ Web content engine library
 
 License:        LGPLv2
@@ -19,13 +19,10 @@ Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Patch0:         webkitgtk-2.7.4-nspluginwrapper.patch
 Patch2:         webkitgtk-2.5.90-cloop_fix.patch
 Patch3:         webkitgtk-2.5.2-commit_align.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=726326
-# https://bugs.webkit.org/show_bug.cgi?id=135973
-Patch4:         webkitgtk-2.7.2-disable-codec-installer.patch
 # https://bugs.webkit.org/show_bug.cgi?id=140616
-Patch5:         webkitgtk-2.7.3-compile_fix.patch
+Patch4:         webkitgtk-2.7.3-compile_fix.patch
 # https://bugs.webkit.org/show_bug.cgi?id=141381
-Patch6:         webkitgtk-2.7.4-gmutexlocker.patch
+Patch5:         webkitgtk-2.7.4-gmutexlocker.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -101,9 +98,8 @@ This package contains developer documentation for %{name}.
 %ifarch %{power64} aarch64 ppc
 %patch3 -p1 -b .commit_align
 %endif
-%patch4 -p1 -b .disable_codec_installer
-%patch5 -p1 -b .compile_fix
-%patch6 -p1 -b .gmutexlocker
+%patch4 -p1 -b .compile_fix
+%patch5 -p1 -b .gmutexlocker
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/leveldb/
@@ -206,6 +202,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Mon Feb 16 2015 Michael Catanzaro <mcatanzaro at gnome.org> - 2.7.4-7
+- Remove disable codec installer patch, not needed in GNOME 3.15.90
+
 * Tue Feb 10 2015 Michael Catanzaro <mcatanzaro at gnome.org> - 2.7.4-6
 - Temporarily disable cloop patch since it breaks js
 - Add patch for gmutexlocker namespace collision with glib 2.43.4


More information about the scm-commits mailing list