r39242 - in /desktop/unstable/epiphany-browser/debian: changelog patches/01_with_webkit2.patch

[kov at users.alioth.debian.org]

Author: kov
Date: Fri Aug 23 15:11:51 2013
New Revision: 39242

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39242
Log:
Remove a check for HAVE_WEBKIT2 from a widget header file

Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/01_with_webkit2.patch

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=39242&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog	[utf-8] Fri Aug 23 15:11:51 2013
@@ -4,8 +4,12 @@
   * debian/control.in:
   - Drop transitional webkit2 packages, let's not polute unstable with
     them. They have only existed in experimental this time around.
-
- -- Gustavo Noronha Silva <kov at debian.org>  Fri, 23 Aug 2013 10:26:45 -0300
+  * debian/patches/01_with_webkit2.patch:
+  - remove a check for HAVE_WEBKIT2 from a widget header file where it
+    won't be defined due to not including config.h, include the wk2
+    header unconditionally
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Fri, 23 Aug 2013 12:11:13 -0300
 
 epiphany-browser (3.8.2-2) experimental; urgency=low
 

Modified: desktop/unstable/epiphany-browser/debian/patches/01_with_webkit2.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/01_with_webkit2.patch?rev=39242&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/01_with_webkit2.patch	[utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/01_with_webkit2.patch	[utf-8] Fri Aug 23 15:11:51 2013
@@ -1,5 +1,7 @@
---- a/configure.ac
-+++ b/configure.ac
+Index: epiphany-browser-3.8.2/configure.ac
+===================================================================
+--- epiphany-browser-3.8.2.orig/configure.ac	2013-08-23 12:08:34.352933545 -0300
++++ epiphany-browser-3.8.2/configure.ac	2013-08-23 12:08:34.348933516 -0300
 @@ -89,8 +89,9 @@
  GCR_REQUIRED=3.5.5
  AVAHI_REQUIRED=0.6.22
@@ -12,3 +14,19 @@
  
  if test "x$with_webkit2" != xno; then
     WEBKIT_GTK_PC_NAME=webkit2gtk-3.0
+Index: epiphany-browser-3.8.2/lib/widgets/ephy-overview-store.h
+===================================================================
+--- epiphany-browser-3.8.2.orig/lib/widgets/ephy-overview-store.h	2012-09-25 05:04:04.000000000 -0300
++++ epiphany-browser-3.8.2/lib/widgets/ephy-overview-store.h	2013-08-23 12:08:51.137016751 -0300
+@@ -22,11 +22,7 @@
+ #define _EPHY_OVERVIEW_STORE_H
+ 
+ #include <gtk/gtk.h>
+-#ifdef HAVE_WEBKIT2
+ #include <webkit2/webkit2.h>
+-#else
+-#include <webkit/webkit.h>
+-#endif
+ #include "gd-main-view.h"
+ 
+ G_BEGIN_DECLS