[poky] [PATCH 5/5] web_svn: Fixup Patching and add libowl

Saul Wold sgw at linux.intel.com
Mon Nov 15 14:01:31 PST 2010


libowl was missing from the link library list
There where patches being pulled in from the SVN trunk that confused
quilt, so we remove the patches directory before doing the patching
Added LIC_FILES_CHKSUM

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 meta/recipes-sato/web/web/owl-window-menu.patch |   17 +++++++++++++++--
 meta/recipes-sato/web/web_svn.bb                |   14 ++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-sato/web/web/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch
index ca7fa2f..8b46c32 100644
--- a/meta/recipes-sato/web/web/owl-window-menu.patch
+++ b/meta/recipes-sato/web/web/owl-window-menu.patch
@@ -1,7 +1,7 @@
 Index: trunk/src/web_main.c
 ===================================================================
---- trunk.orig/src/web_main.c	2007-04-19 15:41:44.000000000 +0100
-+++ trunk/src/web_main.c	2007-04-26 07:43:23.000000000 +0100
+--- trunk.orig/src/web_main.c	2007-12-18 15:04:13.000000000 -0800
++++ trunk/src/web_main.c	2010-11-15 11:40:44.762994000 -0800
 @@ -20,6 +20,8 @@
  #include "web_bookmarks.h"
  #include "web_request.h"
@@ -81,3 +81,16 @@ Index: trunk/src/web_main.c
  	gtk_main ();
  	
  	g_module_close (module);
+Index: trunk/src/Makefile.am
+===================================================================
+--- trunk.orig/src/Makefile.am	2007-12-18 15:04:13.000000000 -0800
++++ trunk/src/Makefile.am	2010-11-15 11:41:15.754994000 -0800
+@@ -18,7 +18,7 @@
+ 	      web.h web_history.h web_bookmarks.h web_request.h \
+ 	      web_utils.h glibcurl.h
+ 
+-web_LDADD   = $(WEB_LIBS)
++web_LDADD   = $(WEB_LIBS) -lowl
+ 
+ MAINTAINERCLEANFILES = config.h.in Makefile.in
+ 
diff --git a/meta/recipes-sato/web/web_svn.bb b/meta/recipes-sato/web/web_svn.bb
index d98a2e3..2fe13f4 100644
--- a/meta/recipes-sato/web/web_svn.bb
+++ b/meta/recipes-sato/web/web_svn.bb
@@ -2,15 +2,25 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl"
 DESCRIPTION = "Web is a multi-platform web browsing application."
-PR = "r3"
+PR = "r4"
 
 PV = "0.0+svnr${SRCREV}"
 
 SRC_URI = 	"svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
-		file://owl-window-menu.patch;patch=1 \
+		file://owl-window-menu.patch \
 		"
 
+LIB_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
 S = "${WORKDIR}/trunk"
 
+do_unpack_append () {
+	bb.build.exec_func('do_remove_patches', d)
+}
+
+do_remove_patches () {
+	rm -rf ${S}/patches
+}
+
 inherit autotools pkgconfig gconf
 
-- 
1.7.1




More information about the poky mailing list