diff options
Diffstat (limited to 'meta-moblin/packages/moblin-web-browser')
5 files changed, 0 insertions, 164 deletions
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch deleted file mode 100644 index d4785eaddf..0000000000 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | Index: git/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- git.orig/configure.ac 2010-01-13 14:57:52.000000000 +0000 | ||
| 4 | +++ git/configure.ac 2010-01-13 15:01:35.000000000 +0000 | ||
| 5 | @@ -57,6 +57,13 @@ | ||
| 6 | NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk" | ||
| 7 | AC_SUBST(NBTKDATADIR) | ||
| 8 | |||
| 9 | +IDLPREFIX= | ||
| 10 | +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}) | ||
| 11 | +if test x"${with_idl_prefix}" != x ; then | ||
| 12 | + IDLPREFIX=${with_idl_prefix} | ||
| 13 | +fi | ||
| 14 | +AC_SUBST([IDLPREFIX]) | ||
| 15 | + | ||
| 16 | if test "x$build_browser" = "xyes"; then | ||
| 17 | PKG_CHECK_MODULES(MWB, | ||
| 18 | clutter-1.0 | ||
| 19 | Index: git/libmwbpages/Makefile.am | ||
| 20 | =================================================================== | ||
| 21 | --- git.orig/libmwbpages/Makefile.am 2010-01-13 14:57:52.000000000 +0000 | ||
| 22 | +++ git/libmwbpages/Makefile.am 2010-01-13 15:02:20.000000000 +0000 | ||
| 23 | @@ -26,10 +26,10 @@ | ||
| 24 | mwb-pages-service.lo : MwbIPagesService.h | ||
| 25 | |||
| 26 | .idl.h : | ||
| 27 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< | ||
| 28 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< | ||
| 29 | |||
| 30 | .idl.xpt : | ||
| 31 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< | ||
| 32 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< | ||
| 33 | |||
| 34 | xpt_DATA = MwbIPagesService.xpt | ||
| 35 | xptdir = $(pkgdatadir)/components | ||
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch deleted file mode 100644 index d4785eaddf..0000000000 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-88f69b3d3242b7106a22721e73fbb15904a24b2f.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | Index: git/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- git.orig/configure.ac 2010-01-13 14:57:52.000000000 +0000 | ||
| 4 | +++ git/configure.ac 2010-01-13 15:01:35.000000000 +0000 | ||
| 5 | @@ -57,6 +57,13 @@ | ||
| 6 | NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk" | ||
| 7 | AC_SUBST(NBTKDATADIR) | ||
| 8 | |||
| 9 | +IDLPREFIX= | ||
| 10 | +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}) | ||
| 11 | +if test x"${with_idl_prefix}" != x ; then | ||
| 12 | + IDLPREFIX=${with_idl_prefix} | ||
| 13 | +fi | ||
| 14 | +AC_SUBST([IDLPREFIX]) | ||
| 15 | + | ||
| 16 | if test "x$build_browser" = "xyes"; then | ||
| 17 | PKG_CHECK_MODULES(MWB, | ||
| 18 | clutter-1.0 | ||
| 19 | Index: git/libmwbpages/Makefile.am | ||
| 20 | =================================================================== | ||
| 21 | --- git.orig/libmwbpages/Makefile.am 2010-01-13 14:57:52.000000000 +0000 | ||
| 22 | +++ git/libmwbpages/Makefile.am 2010-01-13 15:02:20.000000000 +0000 | ||
| 23 | @@ -26,10 +26,10 @@ | ||
| 24 | mwb-pages-service.lo : MwbIPagesService.h | ||
| 25 | |||
| 26 | .idl.h : | ||
| 27 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< | ||
| 28 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< | ||
| 29 | |||
| 30 | .idl.xpt : | ||
| 31 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< | ||
| 32 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< | ||
| 33 | |||
| 34 | xpt_DATA = MwbIPagesService.xpt | ||
| 35 | xptdir = $(pkgdatadir)/components | ||
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch b/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch deleted file mode 100644 index e920b50eeb..0000000000 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | Index: git/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- git.orig/configure.ac 2009-06-23 17:46:31.000000000 +0100 | ||
| 4 | +++ git/configure.ac 2009-06-23 17:46:48.000000000 +0100 | ||
| 5 | @@ -44,6 +44,13 @@ | ||
| 6 | MOZIDLDIR=`${PKG_CONFIG} --variable=idldir libxul`"" | ||
| 7 | AC_SUBST([MOZIDLDIR]) | ||
| 8 | |||
| 9 | +IDLPREFIX= | ||
| 10 | +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}) | ||
| 11 | +if test x"${with_idl_prefix}" != x ; then | ||
| 12 | + IDLPREFIX=${with_idl_prefix} | ||
| 13 | +fi | ||
| 14 | +AC_SUBST([IDLPREFIX]) | ||
| 15 | + | ||
| 16 | AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool) | ||
| 17 | |||
| 18 | AC_OUTPUT([ | ||
| 19 | Index: git/libmwbpages/Makefile.am | ||
| 20 | =================================================================== | ||
| 21 | --- git.orig/libmwbpages/Makefile.am 2009-06-23 17:46:31.000000000 +0100 | ||
| 22 | +++ git/libmwbpages/Makefile.am 2009-06-23 17:47:46.000000000 +0100 | ||
| 23 | @@ -27,10 +27,10 @@ | ||
| 24 | mwb-gettext.lo : MwbIGettext.h | ||
| 25 | |||
| 26 | .idl.h : | ||
| 27 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< | ||
| 28 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< | ||
| 29 | |||
| 30 | .idl.xpt : | ||
| 31 | - $(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< | ||
| 32 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< | ||
| 33 | |||
| 34 | dist_xpt_DATA = MwbIStartPage.xpt MwbIGettext.xpt | ||
| 35 | xptdir = $(MOZHOME)/components | ||
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 deleted file mode 100644 index 86aeae4248..0000000000 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser/xpidl.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | Index: git/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- git.orig/configure.ac 2009-12-10 17:14:58.000000000 +0000 | ||
| 4 | +++ git/configure.ac 2009-12-10 17:15:01.000000000 +0000 | ||
| 5 | @@ -63,6 +63,13 @@ | ||
| 6 | NBTKDATADIR=`${PKG_CONFIG} --variable=prefix nbtk-1.2`"/share/nbtk" | ||
| 7 | AC_SUBST(NBTKDATADIR) | ||
| 8 | |||
| 9 | +IDLPREFIX= | ||
| 10 | +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}) | ||
| 11 | +if test x"${with_idl_prefix}" != x ; then | ||
| 12 | + IDLPREFIX=${with_idl_prefix} | ||
| 13 | +fi | ||
| 14 | +AC_SUBST([IDLPREFIX]) | ||
| 15 | + | ||
| 16 | if test "x$build_browser" = "xyes"; then | ||
| 17 | PKG_CHECK_MODULES(MWB, | ||
| 18 | clutter-1.0 | ||
| 19 | Index: git/libmwbpages/Makefile.am | ||
| 20 | =================================================================== | ||
| 21 | --- git.orig/libmwbpages/Makefile.am 2009-12-10 17:15:08.000000000 +0000 | ||
| 22 | +++ git/libmwbpages/Makefile.am 2009-12-10 17:15:15.000000000 +0000 | ||
| 23 | @@ -28,10 +28,10 @@ | ||
| 24 | mwb-pages-service.lo : MwbIPagesService.h | ||
| 25 | |||
| 26 | .idl.h : | ||
| 27 | - $(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m header $< | ||
| 28 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m header $< | ||
| 29 | |||
| 30 | .idl.xpt : | ||
| 31 | - $(AM_V_GEN)$(MOZHOME)/xpidl -I $(MOZIDLDIR) -m typelib $< | ||
| 32 | + xpidl -I $(IDLPREFIX)$(MOZIDLDIR) -m typelib $< | ||
| 33 | |||
| 34 | xpt_DATA = MwbIPagesService.xpt | ||
| 35 | 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 deleted file mode 100644 index 53c8a3531b..0000000000 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)" | ||
| 2 | SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git;branch=${MOBLINBROWSERBRANCH} \ | ||
| 3 | file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666 \ | ||
| 4 | file://xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch;patch=1;rev=78ddd155cc297811720e4c4835d468ac6c4d9666;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \ | ||
| 5 | file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666" | ||
| 6 | LICENSE = "LGPLv2.1" | ||
| 7 | PV = "0.0+git${SRCPV}" | ||
| 8 | PR = "r11" | ||
| 9 | |||
| 10 | DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk-0.10 libunique mozilla-headless-services libccss nbtk mozilla-headless mutter-moblin" | ||
| 11 | |||
| 12 | S = "${WORKDIR}/git" | ||
| 13 | |||
| 14 | MOBLINBROWSERBRANCH ?= "master" | ||
| 15 | |||
| 16 | EXTRA_OECONF = "--with-idl-prefix=${STAGING_DIR_TARGET}/" | ||
| 17 | |||
| 18 | FILES_${PN} += "${datadir}/moblin-web-browser/chrome/* ${libdir}/xulrunner-*/chrome/* ${datadir}/dbus-1/services/*" | ||
| 19 | FILES_${PN} += "${datadir}/moblin-web-browser/components/* ${libdir}/xulrunner-*/components/*" | ||
| 20 | FILES_${PN}-dbg += "${datadir}/moblin-web-browser/components/.debug/* ${libdir}/xulrunner-*/components/.debug/*" | ||
| 21 | |||
| 22 | |||
| 23 | |||
| 24 | inherit autotools | ||
