[gnome-ostree] 3.6: WebKit: Don't fail on deprecations



commit f16ba64fc2d125721c3ab45a539d1289d7b7f0db
Author: Colin Walters <walters verbum org>
Date:   Sat Aug 4 10:55:57 2012 -0400

    3.6: WebKit: Don't fail on deprecations

 gnomeos-3.6.json                                   |    3 +-
 .../WebKit-build-Don-t-break-on-deprecations.patch |   33 ++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 4902ccf..2307b6e 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -644,7 +644,8 @@
 
 		{"src": "git:git://git.webkit.org/WebKit.git",
 		 "tag": "4e276ff268f3f3e97abb97f8e5a8cf6d8d97d2db",
-		 "patches": ["WebKit-autogen.patch"]},
+		 "patches": ["WebKit-autogen.patch",
+			     "WebKit-build-Don-t-break-on-deprecations.patch"]},
 
 		{"src": "gnome:librest"},
 
diff --git a/patches/WebKit-build-Don-t-break-on-deprecations.patch b/patches/WebKit-build-Don-t-break-on-deprecations.patch
new file mode 100644
index 0000000..28d988d
--- /dev/null
+++ b/patches/WebKit-build-Don-t-break-on-deprecations.patch
@@ -0,0 +1,33 @@
+From c38d9ad29fbb769f1e76c5360ffbf3b6f80021c5 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Sat, 4 Aug 2012 10:53:44 -0400
+Subject: [PATCH] build: Don't break on deprecations
+
+Since GDK deprecated the thread wrappers.
+---
+ GNUmakefile.am | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/GNUmakefile.am b/GNUmakefile.am
+index c97ef32..0991ca9 100644
+--- a/GNUmakefile.am
++++ b/GNUmakefile.am
+@@ -201,15 +201,6 @@ endif
+ 
+ if !ENABLE_DEBUG
+ global_cppflags += -DNDEBUG
+-else
+-global_cppflags += \
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED \
+-	-DPANGO_DISABLE_DEPRECATED
+-# Might be useful in the future
+-#	-DGDK_MULTIHEAD_SAFE \
+-#	-DGTK_MULTIHEAD_SAFE
+ endif
+ 
+ if ENABLE_COVERAGE
+-- 
+1.7.11.2
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]