diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2009-12-10 17:16:56 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-12-10 17:17:42 +0000 |
| commit | e5a21c4dd986afeaf4307f17a2834f3a60fdf348 (patch) | |
| tree | 928088023b607fda4273782bf56beb34eed55d81 /meta-moblin | |
| parent | 57bf2cf3b6df82181a82a1dce391780c34b56f68 (diff) | |
| download | openembedded-core-contrib-e5a21c4dd986afeaf4307f17a2834f3a60fdf348.tar.gz | |
moblin-web-browser: Update patch
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin')
| -rw-r--r-- | meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch | 28 | ||||
| -rw-r--r-- | meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch index 73abea2c12..196136f722 100644 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch +++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch @@ -1,10 +1,10 @@ Index: git/configure.ac =================================================================== ---- 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) +--- git.orig/configure.ac 2009-12-10 17:14:58.000000000 +0000 ++++ git/configure.ac 2009-12-10 17:15:01.000000000 +0000 +@@ -63,6 +63,13 @@ + NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk" + AC_SUBST(NBTKDATADIR) +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}) @@ -18,18 +18,18 @@ Index: git/configure.ac clutter-1.0 Index: git/libmwbpages/Makefile.am =================================================================== ---- 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 +--- git.orig/libmwbpages/Makefile.am 2009-12-10 17:15:08.000000000 +0000 ++++ git/libmwbpages/Makefile.am 2009-12-10 17:15:15.000000000 +0000 +@@ -28,10 +28,10 @@ + mwb-pages-service.lo : MwbIPagesService.h .idl.h : -- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< -+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< +- $(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< ++ xpidl -I $(MOZIDLDIR) -m header $< .idl.xpt : -- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< -+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< +- $(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< ++ xpidl -I $(MOZIDLDIR) -m typelib $< - dist_xpt_DATA = MwbISettings.xpt MwbIStartPage.xpt MwbIGettext.xpt + xpt_DATA = MwbIPagesService.xpt xptdir = $(pkgdatadir)/components diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb index cd7a9f53c5..a6a643856c 100644 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb +++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb @@ -4,7 +4,7 @@ SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \ file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6" LICENSE = "LGPLv2.1" PV = "0.0+git${SRCPV}" -PR = "r9" +PR = "r10" DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin" |