mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

meta-moblin: Update to Moblin 2.1 released versions

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-01-13 17:07:59 +00:00
parent 3fce6c2d7e
commit 6baeede3c6
48 changed files with 371 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch Normal file
View File

@@ -0,0 +1,35 @@
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2010-01-13 14:57:52.000000000 +0000
+++ git/configure.ac 2010-01-13 15:01:35.000000000 +0000
@@ -57,6 +57,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})
+if test x"${with_idl_prefix}" != x ; then
+ IDLPREFIX=${with_idl_prefix}
+fi
+AC_SUBST([IDLPREFIX])
+
if test "x$build_browser" = "xyes"; then
PKG_CHECK_MODULES(MWB,
clutter-1.0
Index: git/libmwbpages/Makefile.am
===================================================================
--- git.orig/libmwbpages/Makefile.am 2010-01-13 14:57:52.000000000 +0000
+++ git/libmwbpages/Makefile.am 2010-01-13 15:02:20.000000000 +0000
@@ -26,10 +26,10 @@
mwb-pages-service.lo : MwbIPagesService.h
.idl.h :
- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
.idl.xpt :
- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
xpt_DATA = MwbIPagesService.xpt
xptdir = $(pkgdatadir)/components

35
meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch Normal file
View File

@@ -0,0 +1,35 @@
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2010-01-13 14:57:52.000000000 +0000
+++ git/configure.ac 2010-01-13 15:01:35.000000000 +0000
@@ -57,6 +57,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})
+if test x"${with_idl_prefix}" != x ; then
+ IDLPREFIX=${with_idl_prefix}
+fi
+AC_SUBST([IDLPREFIX])
+
if test "x$build_browser" = "xyes"; then
PKG_CHECK_MODULES(MWB,
clutter-1.0
Index: git/libmwbpages/Makefile.am
===================================================================
--- git.orig/libmwbpages/Makefile.am 2010-01-13 14:57:52.000000000 +0000
+++ git/libmwbpages/Makefile.am 2010-01-13 15:02:20.000000000 +0000
@@ -26,10 +26,10 @@
mwb-pages-service.lo : MwbIPagesService.h
.idl.h :
- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $<
+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $<
.idl.xpt :
- $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $<
+ xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $<
xpt_DATA = MwbIPagesService.xpt
xptdir = $(pkgdatadir)/components

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

@@ -1,7 +1,8 @@
DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)"
SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \
file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6"
file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666 \
file://xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch;patch=1;rev=78ddd155cc297811720e4c4835d468ac6c4d9666;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \
file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666"
LICENSE = "LGPLv2.1"
PV = "0.0+git${SRCPV}"
PR = "r11"