[webkitgtk4/f22] Fix the build with cmake 3.2.x
Tomas Popela
tpopela at fedoraproject.org
Thu Feb 19 13:19:00 UTC 2015
commit f666166da99fc21ab2691571defccce0ca6abc31
Author: Tomas Popela <tpopela at redhat.com>
Date: Thu Feb 19 14:18:43 2015 +0100
Fix the build with cmake 3.2.x
webkitgtk-2.7.90-cmake_regression.patch | 15 +++++++++++++++
webkitgtk4.spec | 9 ++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/webkitgtk-2.7.90-cmake_regression.patch b/webkitgtk-2.7.90-cmake_regression.patch
new file mode 100644
index 0000000..e6c513c
--- /dev/null
+++ b/webkitgtk-2.7.90-cmake_regression.patch
@@ -0,0 +1,15 @@
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index d4e4bee..4d9afe8 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -57,6 +57,10 @@ if (NOT GEOCLUE2_FOUND)
+ endif ()
+
+ if (ENABLE_X11_TARGET)
++ # With cmake 3.2.x we have to explicitly ask for X11 otherwise the X11_X11_LIB
++ # variable won't be set thus the X11 linker flags won't be added and the build
++ # will fail.
++ find_package(X11 REQUIRED)
+ # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
+ check_include_files("GL/glx.h" GLX_FOUND)
+ endif ()
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index e36ed25..6a46336 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -9,7 +9,7 @@
Name: webkitgtk4
Version: 2.7.90
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: GTK+ Web content engine library
License: LGPLv2
@@ -28,6 +28,9 @@ Patch5: webkitgtk-2.7.90-180248.patch
Patch6: webkitgtk-2.7.90-180258.patch
# http://trac.webkit.org/changeset/180264
Patch7: webkitgtk-2.7.90-bmalloc_static.patch
+# https://bugs.webkit.org/show_bug.cgi?id=141796
+# https://bugzilla.redhat.com/show_bug.cgi?id=1194260
+Patch8: webkitgtk-2.7.90-cmake_regression.patch
BuildRequires: at-spi2-core-devel
BuildRequires: bison
@@ -107,6 +110,7 @@ This package contains developer documentation for %{name}.
%patch5 -p1 -b .180248
%patch6 -p1 -b .180258
%patch7 -p1 -b .bmalloc_static
+%patch8 -p1 -b .cmake_regression
# Remove bundled libraries
rm -rf Source/ThirdParty/leveldb/
@@ -209,6 +213,9 @@ make %{?_smp_mflags} -C %{_target_platform}
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
%changelog
+* Thu Feb 19 2015 Tomas Popela <tpopela at redhat.com> - 2.7.90-9
+- Fix the build with cmake 3.2.x
+
* Thu Feb 19 2015 Tomas Popela <tpopela at redhat.com> - 2.7.90-8
- Fix crash in CLoop
- Forgot to reset the release number so continuing with 8
More information about the scm-commits
mailing list