diff --git a/.gitignore b/.gitignore index 2c63ed8..652baa4 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /webkitgtk-2.9.92.tar.xz /webkitgtk-2.10.0.tar.xz /webkitgtk-2.10.1.tar.xz +/webkitgtk-2.10.2.tar.xz diff --git a/sources b/sources index 361a61c..269a786 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e81686a19530a12a3c0aeb857b7afdac webkitgtk-2.10.1.tar.xz +892e3077ad6c10c8233e7e8b5497cd7a webkitgtk-2.10.2.tar.xz diff --git a/webkitgtk-2.10.1-cmake_fix.patch b/webkitgtk-2.10.1-cmake_fix.patch deleted file mode 100644 index e3fa428..0000000 --- a/webkitgtk-2.10.1-cmake_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up webkitgtk-2.10.1/Source/cmake/FindOpenGL.cmake.cmake_fix webkitgtk-2.10.1/Source/cmake/FindOpenGL.cmake ---- webkitgtk-2.10.1/Source/cmake/FindOpenGL.cmake.cmake_fix 2015-10-14 10:17:48.757312333 +0200 -+++ webkitgtk-2.10.1/Source/cmake/FindOpenGL.cmake 2015-10-14 10:25:34.681328240 +0200 -@@ -59,6 +59,7 @@ if (OPENGL_FOUND) - include(CMakePushCheckState) - CMAKE_PUSH_CHECK_STATE() - set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIRS}) -+ include(CheckIncludeFiles) - check_include_files("GL/glx.h" GLX_FOUND) - CMAKE_POP_CHECK_STATE() - endif () diff --git a/webkitgtk4.spec b/webkitgtk4.spec index d6a30a2..9d31af3 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -8,8 +8,8 @@ %global _hardened_build 1 Name: webkitgtk4 -Version: 2.10.1 -Release: 2%{?dist} +Version: 2.10.2 +Release: 1%{?dist} Summary: GTK+ Web content engine library License: LGPLv2 @@ -26,7 +26,6 @@ Patch3: webkitgtk-2.8.0-page_size_align.patch Patch4: webkitgtk-2.8.0-s390_fixes.patch # https://bugs.webkit.org/show_bug.cgi?id=135972 Patch6: webkitgtk-2.9.4-youtube.patch -Patch7: webkitgtk-2.10.1-cmake_fix.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -117,7 +116,6 @@ This package contains developer documentation for %{name}. %patch4 -p1 -b .s390_fixes %endif %patch6 -p1 -b .youtube -%patch7 -p1 -b .cmake_fix # Remove bundled libraries rm -rf Source/ThirdParty/leveldb/ @@ -226,6 +224,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Thu Oct 15 2015 Tomas Popela - 2.10.2-1 +- Update to 2.10.2 + * Thu Oct 15 2015 Kalev Lember - 2.10.1-2 - Rebuilt