aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Vrátil <dvratil@redhat.com>2012-03-29 19:04:01 +0800
committerDan Vrátil <dvratil@redhat.com>2012-03-29 19:04:01 +0800
commita0319179c74d5c58af5d68cf51ae535ac0317e26 (patch)
tree98094ce6e025e162716702994569dea7a1c0c639
parent954b3f1cc496f469ce0472db87caafccbfa947da (diff)
downloadgsoc2013-evolution-a0319179c74d5c58af5d68cf51ae535ac0317e26.tar
gsoc2013-evolution-a0319179c74d5c58af5d68cf51ae535ac0317e26.tar.gz
gsoc2013-evolution-a0319179c74d5c58af5d68cf51ae535ac0317e26.tar.bz2
gsoc2013-evolution-a0319179c74d5c58af5d68cf51ae535ac0317e26.tar.lz
gsoc2013-evolution-a0319179c74d5c58af5d68cf51ae535ac0317e26.tar.xz
gsoc2013-evolution-a0319179c74d5c58af5d68cf51ae535ac0317e26.tar.zst
gsoc2013-evolution-a0319179c74d5c58af5d68cf51ae535ac0317e26.zip
Bug #673013 - Doesn't expose webkit Cflags/Libs
Fixes #includes in mail/e-mail-display.h and adds webkitgtk-3.0 as dependency to some pkgconfig files. This prevented external modules like evo-gw to compile against Evolution.
-rw-r--r--evolution-plugin.pc.in2
-rw-r--r--evolution-shell.pc.in2
-rw-r--r--mail/e-mail-display.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/evolution-plugin.pc.in b/evolution-plugin.pc.in
index 53603e0216..1eca893d09 100644
--- a/evolution-plugin.pc.in
+++ b/evolution-plugin.pc.in
@@ -15,6 +15,6 @@ errordir=@privdatadir@/errors
Name: evolution-plugin
Description: libraries needed for Evolution plugin development
Version: @VERSION@
-Requires: camel-1.2 libxml-2.0 libgtkhtml-4.0 gtkhtml-editor-4.0
+Requires: camel-1.2 libxml-2.0 libgtkhtml-4.0 gtkhtml-editor-4.0 webkitgtk-3.0
Libs: -L${privlibdir} -leutil -Wl,-R${privlibdir}
Cflags: -I${privincludedir}
diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in
index bdcc1cf638..74a88d5708 100644
--- a/evolution-shell.pc.in
+++ b/evolution-shell.pc.in
@@ -17,7 +17,7 @@ execversion=@BASE_VERSION@
Name: evolution-shell
Description: libraries needed for Evolution shell components
Version: @VERSION@
-Requires: gtk+-3.0 gconf-2.0 libedataserverui-3.0
+Requires: gtk+-3.0 gconf-2.0 libedataserverui-3.0 webkitgtk-3.0
Requires.private: gnome-desktop-3.0
Libs: -L${privlibdir} -leshell -Wl,-R${privlibdir}
Cflags: -I${privincludedir}
diff --git a/mail/e-mail-display.h b/mail/e-mail-display.h
index cbac1e37bb..9865a3ee37 100644
--- a/mail/e-mail-display.h
+++ b/mail/e-mail-display.h
@@ -22,8 +22,8 @@
#ifndef E_MAIL_DISPLAY_H
#define E_MAIL_DISPLAY_H
-#include <widgets/misc/e-web-view.h>
-#include <widgets/misc/e-search-bar.h>
+#include <misc/e-web-view.h>
+#include <misc/e-search-bar.h>
#include "em-format-html.h"
/* Standard GObject macros */