diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-sato/web | |
parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
download | poky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz |
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.
A number of recipes were modified since dependencies need to be
corrected.
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-sato/web')
-rw-r--r-- | meta/recipes-sato/web/web/owl-window-menu.patch | 17 | ||||
-rw-r--r-- | meta/recipes-sato/web/web_svn.bb | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/meta/recipes-sato/web/web/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch index b80905fce3..8877229f36 100644 --- a/meta/recipes-sato/web/web/owl-window-menu.patch +++ b/meta/recipes-sato/web/web/owl-window-menu.patch | |||
@@ -81,20 +81,3 @@ Index: trunk/src/web_main.c | |||
81 | gtk_main (); | 81 | gtk_main (); |
82 | 82 | ||
83 | g_module_close (module); | 83 | g_module_close (module); |
84 | Index: trunk/configure.ac | ||
85 | =================================================================== | ||
86 | --- trunk.orig/configure.ac 2007-04-19 15:41:44.000000000 +0100 | ||
87 | +++ trunk/configure.ac 2007-04-25 20:36:34.000000000 +0100 | ||
88 | @@ -14,6 +14,12 @@ | ||
89 | |||
90 | PKG_CHECK_MODULES(WEB, libxml-2.0 glib-2.0 gthread-2.0 gtk+-2.0 libglade-2.0 gconf-2.0 gobject-2.0) | ||
91 | |||
92 | +OWL_CFLAGS="" | ||
93 | +OWL_LIBS="-lowl" | ||
94 | + | ||
95 | +WEB_CFLAGS="$WEB_CFLAGS $OWL_CFLAGS" | ||
96 | +WEB_LIBS="$WEB_LIBS $OWL_LIBS" | ||
97 | + | ||
98 | # -- Hildon stuff for Maemo | ||
99 | hildon=false | ||
100 | AC_ARG_ENABLE(hildon,AS_HELP_STRING([--enable-hildon],[Turn on hildon support]),[ | ||
diff --git a/meta/recipes-sato/web/web_svn.bb b/meta/recipes-sato/web/web_svn.bb index 08005dd253..9aa67b23b2 100644 --- a/meta/recipes-sato/web/web_svn.bb +++ b/meta/recipes-sato/web/web_svn.bb | |||
@@ -2,7 +2,7 @@ LICENSE = "GPLv2" | |||
2 | SECTION = "x11" | 2 | SECTION = "x11" |
3 | DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl" | 3 | DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl" |
4 | DESCRIPTION = "Web is a multi-platform web browsing application." | 4 | DESCRIPTION = "Web is a multi-platform web browsing application." |
5 | PR = "r2" | 5 | PR = "r3" |
6 | 6 | ||
7 | PV = "0.0+svnr${SRCREV}" | 7 | PV = "0.0+svnr${SRCREV}" |
8 | 8 | ||