[packages/gtk-webkit3] Remove -sh.patch (applied upstream)
megabajt
megabajt at pld-linux.org
Sat Jul 27 00:31:29 CEST 2013
commit 2cae393e7b8a59665220fb2e288fc552d1b25f7d
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Sat Jul 27 00:30:59 2013 +0200
Remove -sh.patch (applied upstream)
gtk-webkit3-sh.patch | 48 ------------------------------------------------
gtk-webkit3.spec | 4 +---
2 files changed, 1 insertion(+), 51 deletions(-)
---
diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec
index 7c4dc59..2be3efe 100644
--- 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}
diff --git a/gtk-webkit3-sh.patch b/gtk-webkit3-sh.patch
deleted file mode 100644
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])
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit3.git/commitdiff/2cae393e7b8a59665220fb2e288fc552d1b25f7d
More information about the pld-cvs-commit
mailing list