sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

moblin-web-browser: Update patch against master 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2009-08-13 14:47:46 +01:00
parent 5a5fdd72bc
commit 5c3a5e9ec2
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch
View File

@ -1,26 +1,26 @@
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2009-06-23 17:46:31.000000000 +0100
+++ git/configure.ac 2009-06-23 17:46:48.000000000 +0100
@@ -44,6 +44,13 @@
MOZIDLDIR=`${PKG_CONFIG} --variable=idldir libxul`""
AC_SUBST([MOZIDLDIR])
--- git.orig/configure.ac 2009-08-12 15:12:47.000000000 +0100
+++ git/configure.ac 2009-08-12 15:13:47.000000000 +0100
@@ -54,6 +54,13 @@
PKG_CHECK_MODULES(CLUTTER_MOZEMBED, clutter-mozembed-0.10)
PKG_CHECK_MODULES(GTK, gtk+-2.0)
+IDLPREFIX=
+AC_ARG_WITH(idl-prefix, AC_HELP_STRING([--with-idl-prefix=DIR],[prefix to add to access to the idl files]), with_idl_prefix=${withval})
+if test x"${with_idl_prefix}" != x ; then
+ IDLPREFIX=${with_idl_prefix}
+ IDLPREFIX=${with_idl_prefix}
+fi
+AC_SUBST([IDLPREFIX])
+
AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
AC_OUTPUT([
if test "x$build_browser" = "xyes"; then
PKG_CHECK_MODULES(MWB,
clutter-1.0
Index: git/libmwbpages/Makefile.am
===================================================================
--- git.orig/libmwbpages/Makefile.am 2009-06-23 17:46:31.000000000 +0100
+++ git/libmwbpages/Makefile.am 2009-06-23 17:47:46.000000000 +0100
@@ -27,10 +27,10 @@
--- git.orig/libmwbpages/Makefile.am 2009-08-12 15:12:47.000000000 +0100
+++ git/libmwbpages/Makefile.am 2009-08-12 15:12:47.000000000 +0100
@@ -31,10 +31,10 @@
mwb-gettext.lo : MwbIGettext.h
.idl.h :
@ -31,5 +31,5 @@ Index: git/libmwbpages/Makefile.am
- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
dist_xpt_DATA = MwbIStartPage.xpt MwbIGettext.xpt
xptdir = $(MOZHOME)/components
dist_xpt_DATA = MwbISettings.xpt MwbIStartPage.xpt MwbIGettext.xpt
xptdir = $(pkgdatadir)/components

2
meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
View File

@ -4,7 +4,7 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
file://xpidl.patch;patch=1;notrev=b55d523da7681febfabf9fc40dcd6fcee982b079"
LICENSE = "LGPLv2.1"
PV = "0.0+git${SRCPV}"
PR = "r5"
PR = "r6"
DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless"