pool/gnome-online-accounts
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 197022 from home:Zaitor:branches:GNOME:Factory

Browse Source 
Add goa-build-against-webkitgtk-2.1.90.patch, fixes build on current factory, can be dropped on next versionbump.

OBS-URL: https://build.opensuse.org/request/show/197022
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-online-accounts?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger 2013-09-02 07:48:14 +00:00 committed by Git OBS Bridge
parent 14ee987806
commit 2d1bc60094
3 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnome-online-accounts.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Sep 1 17:08:03 UTC 2013 - zaitor@opensuse.org
- Add goa-build-against-webkitgtk-2.1.90.patch, fixes build on
current factory, can be dropped on next versionbump.
-------------------------------------------------------------------
Thu Aug 22 20:22:27 UTC 2013 - dimstar@opensuse.org

3
gnome-online-accounts.spec
View File

@ -27,6 +27,8 @@ Group: System/GUI/GNOME
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-online-accounts/3.9/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM goa-build-against-webkitgtk-2.1.90.patch bgo#707006 zaitor@opensuse.org -- Fix build against new webkit, can be dropped on next version of goa.
Patch0: goa-build-against-webkitgtk-2.1.90.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
@ -104,6 +106,7 @@ libraries in GNOME can access the user's online accounts.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
%if 0%{?with_twitter}

53
goa-build-against-webkitgtk-2.1.90.patch Normal file
View File

@ -0,0 +1,53 @@
From f5119db95aab7e97a30aca646833bcd72d4ba51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=C3=A1n=20de=20B=C3=BArca?= <leftmostcat@gmail.com>
Date: Wed, 28 Aug 2013 11:02:30 -0600
Subject: [PATCH] Update to new webkitgtk-2.1.90 API
Fixes: https://bugzilla.gnome.org/707006
---
configure.ac | 2 +-
src/goabackend/goaflickrprovider.c | 4 ++--
src/goabackend/goagoogleprovider.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/goabackend/goaflickrprovider.c b/src/goabackend/goaflickrprovider.c
index 66396ba..7505482 100644
--- a/src/goabackend/goaflickrprovider.c
+++ b/src/goabackend/goaflickrprovider.c
@@ -285,8 +285,8 @@ is_deny_node (GoaOAuthProvider *provider, WebKitDOMNode *node)
if (!WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (node))
goto out;
- element = WEBKIT_DOM_HTML_ELEMENT (node);
- id = webkit_dom_html_element_get_id (element);
+ element = WEBKIT_DOM_ELEMENT (node);
+ id = webkit_dom_element_get_id (element);
if (g_strcmp0 (id, "auth-disallow") != 0)
goto out;
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index ef28cf6..cee9d96 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -270,8 +270,8 @@ is_deny_node (GoaOAuth2Provider *provider, WebKitDOMNode *node)
if (!WEBKIT_DOM_IS_HTML_BUTTON_ELEMENT (node))
goto out;
- element = WEBKIT_DOM_HTML_ELEMENT (node);
- id = webkit_dom_html_element_get_id (element);
+ element = WEBKIT_DOM_ELEMENT (node);
+ id = webkit_dom_element_get_id (element);
if (g_strcmp0 (id, "submit_deny_access") != 0)
goto out;
@@ -300,7 +300,7 @@ is_identity_node (GoaOAuth2Provider *provider, WebKitDOMHTMLInputElement *elemen
if (g_strcmp0 (element_type, "email") != 0)
goto out;
- id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (element));
+ id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (element));
if (g_strcmp0 (id, "Email") != 0)
goto out;
--
1.8.3.1