catanzaro pushed to webkitgtk4 (master). "Add patch that should fix the build"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 7 20:29:24 UTC 2015
From 880c8325c6638c0b2c63839e6b251b4c90ebc998 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro at gnome.org>
Date: Thu, 7 May 2015 15:27:34 -0500
Subject: Add patch that should fix the build
diff --git a/webkitgtk-2.9.1-development_build.patch b/webkitgtk-2.9.1-development_build.patch
new file mode 100644
index 0000000..82157ae
--- /dev/null
+++ b/webkitgtk-2.9.1-development_build.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index d1b338122c28ce35f82c6256c73b1218b7ee84d4..2508f687f4a4789bce76abbdb7caa05ce7243aed 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -76,8 +76,6 @@ WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_OPENGL)
+ WEBKIT_OPTION_DEPEND(USE_GSTREAMER_GL ENABLE_VIDEO)
+ WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)
+
+-# FIXME: There is no reason these should be different.
+-SET_AND_EXPOSE_TO_BUILD(DEVELOPMENT_BUILD ${DEVELOPER_MODE})
+ if (DEVELOPER_MODE)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index 608c07a..24334da 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -26,6 +26,8 @@ Patch3: webkitgtk-2.8.0-page_size_align.patch
Patch4: webkitgtk-2.8.0-s390_fixes.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1206577
Patch5: webkitgtk-2.8.0-gcc5_fix.patch
+# https://bugs.webkit.org/show_bug.cgi?id=144746
+Patch6: webkitgtk-2.9.1-development_build.patch
BuildRequires: at-spi2-core-devel
BuildRequires: bison
@@ -109,6 +111,7 @@ This package contains developer documentation for %{name}.
%patch4 -p1 -b .s390_fixes
%endif
%patch5 -p1 -b .gcc5_fix
+%patch6 -p1 -b .development_build
# Remove bundled libraries
rm -rf Source/ThirdParty/leveldb/
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/webkitgtk4.git/commit/?h=master&id=880c8325c6638c0b2c63839e6b251b4c90ebc998
More information about the scm-commits
mailing list