Remove -sh.patch (applied upstream)

diff --git a/gtk-webkit3-sh.patch b/gtk-webkit3-sh.patch
deleted file mode 100644 (file)
index 0e3f5a8..0000000
--- a/gtk-webkit3-sh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- webkitgtk-2.0.3/Source/autotools/FindDependencies.m4.orig  2013-06-11 11:31:36.000000000 +0200
-+++ webkitgtk-2.0.3/Source/autotools/FindDependencies.m4       2013-06-24 17:49:33.605399898 +0200
-@@ -377,8 +377,8 @@
- # Since we support earlier HarfBuzz versions we keep this conditional for now.
- if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-     PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version)
--    FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS"
--    FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS"
-+    FREETYPE_CFLAGS="$FREETYPE_CFLAGS $HARFBUZZ_ICU_CFLAGS"
-+    FREETYPE_LIBS="$FREETYPE_LIBS $HARFBUZZ_ICU_LIBS"
- fi
- AC_SUBST([FREETYPE_CFLAGS])
- AC_SUBST([FREETYPE_LIBS])
-@@ -450,18 +450,18 @@
- 
- if test "$with_acceleration_backend" = "opengl"; then
-     if test "$enable_gles2" = "yes"; then
--        acceleration_backend_description+= "(gles2"
-+        acceleration_backend_description="$acceleration_backend_description(gles2"
-         OPENGL_LIBS="-lGLESv2"
-     else
--        acceleration_backend_description+="(gl"
-+        acceleration_backend_description="$acceleration_backend_description(gl"
-         OPENGL_LIBS="-lGL"
-     fi
-     if test "$enable_egl" = "yes"; then
--        acceleration_backend_description+=", egl"
--        OPENGL_LIBS+=" -lEGL"
-+        acceleration_backend_description="$acceleration_backend_description, egl"
-+        OPENGL_LIBS="$OPENGL_LIBS -lEGL"
-     fi
-     if test "$enable_glx" = "yes"; then
--        acceleration_backend_description+=", glx"
-+        acceleration_backend_description="$acceleration_backend_description, glx"
-     fi
- 
-     # Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
-@@ -469,8 +469,8 @@
-     AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
-     AC_SUBST([DLOPEN_LIBS])
- 
--    OPENGL_LIBS+=" $DLOPEN_LIBS"
--    acceleration_backend_description+=")"
-+    OPENGL_LIBS="$OPENGL_LIBS $DLOPEN_LIBS"
-+    acceleration_backend_description="$acceleration_backend_description)"
- fi
- AC_SUBST([OPENGL_LIBS])
- 

diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index 7c4dc598deea4ef1bd3020d1e850a2a846fd4c00..2be3efe09f175b7624cbff3e86f2db6f482d5243 100644 (file)
--- a/gtk-webkit3.spec
+++ b/gtk-webkit3.spec
@@ -14,8 +14,7 @@ Group:                X11/Libraries
 Source0:       http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 # Source0-md5: 413be319ba171feed9348d1bede6b0a7
 Patch0:                sync-builtins.patch
-Patch1:                %{name}-sh.patch
-Patch2:                gtk-webkit-pl.po.patch
+Patch1:                gtk-webkit-pl.po.patch
 URL:           http://webkitgtk.org/
 BuildRequires: EGL-devel
 BuildRequires: OpenGL-GLX-devel
@@ -123,7 +122,6 @@ Dokumentacja API WebKita.
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}