Commit 75fe027f authored by Alberto Garcia's avatar Alberto Garcia
Browse files

Drop detect-gstreamer-gl.patch and detect-woff.patch

parent becc0072
......@@ -10,6 +10,10 @@ webkit2gtk (2.29.1-1) UNRELEASED; urgency=medium
* debian/rules:
+ Replace USER_AGENT_GTK_DISTRIBUTOR_NAME with the new
USER_AGENT_BRANDING build option in Ubuntu.
* debian/patches/detect-gstreamer-gl.patch,
debian/patches/detect-woff.patch:
+ Drop these patches. We won't be making backports of WebKitGTK 2.29.x
for stretch.
-- Alberto Garcia <berto@igalia.com> Mon, 18 May 2020 14:00:33 +0200
......
From: Alberto Garcia <berto@igalia.com>
Subject: Disable USE_GSTREAMER_GL is the package is not found
Forwarded: no
Index: webkitgtk/Source/cmake/GStreamerChecks.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/GStreamerChecks.cmake
+++ webkitgtk/Source/cmake/GStreamerChecks.cmake
@@ -31,7 +31,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
endif ()
if (USE_GSTREAMER_GL AND NOT PC_GSTREAMER_GL_FOUND)
- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
+ set(USE_GSTREAMER_GL OFF)
+ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.")
endif ()
SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
From: Alberto Garcia <berto@igalia.com>
Subject: Disable USE_WOFF2 if the package is not found
Forwarded: no
Index: webkitgtk/Source/cmake/OptionsGTK.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsGTK.cmake
+++ webkitgtk/Source/cmake/OptionsGTK.cmake
@@ -406,7 +406,8 @@ endif ()
if (USE_WOFF2)
find_package(WOFF2Dec 1.0.2)
if (NOT WOFF2DEC_FOUND)
- message(FATAL_ERROR "libwoff2dec is needed for USE_WOFF2.")
+ set(USE_WOFF2 OFF)
+ message(STATUS "libwoff2dec is needed for USE_WOFF2.")
endif ()
endif ()
......@@ -2,8 +2,6 @@ fix-ftbfs-sparc64.patch
fix-ftbfs-x86.patch
fix-ftbfs-m68k.patch
fix-ftbfs-x32.patch
detect-gstreamer-gl.patch
detect-woff.patch
prefer-pthread.patch
dont-detect-sse2.patch
reduce-memory-overheads.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment