[oe-commits] org.oe.dev merge of '4273804b598541555abb070bcb83ec503beaceff'

mickeyl commit openembedded-commits at lists.openembedded.org
Wed Dec 5 18:06:06 UTC 2007


merge of '4273804b598541555abb070bcb83ec503beaceff'
     and '99925725722e255ce214c4cfb61018cbf2729439'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 18c78b60a5927032930ff3a527704644b4381596
ViewMTN: http://monotone.openembedded.org/revision/info/18c78b60a5927032930ff3a527704644b4381596
Files:
1
conf/distro/include/sane-srcdates.inc
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/evas-native_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/mozilla/mozilla
packages/mozilla/mozilla/files
packages/mozilla/mozilla/files/i386
packages/mozilla/mozilla/files/i486
packages/mozilla/mozilla/files/i586
packages/mozilla/mozilla/files/i686
packages/mozilla/mozilla/firefox-2.0.0.3
packages/openrdate
packages/mozilla/mozilla/files/i386/jsautocfg.h
packages/mozilla/mozilla/files/i486/jsautocfg.h
packages/mozilla/mozilla/files/i586/jsautocfg.h
packages/mozilla/mozilla/files/i686/jsautocfg.h
packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch
packages/openrdate/openrdate_1.1.3.bb
packages/mozilla/firefox-2.0.0.3/mozconfig
packages/mozilla/firefox_2.0.0.3.bb
Diffs:

#
# mt diff -r4273804b598541555abb070bcb83ec503beaceff -r18c78b60a5927032930ff3a527704644b4381596
#
# 
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [8af2f634c8a91d9c27579c3537ca1e7d3132f5c6]
#    to [7749bfba16f5e3781dfb985e24f1664204058a6e]
# 
# patch "packages/efl1/ecore.inc"
#  from [cec350030eb895068d6de7c48653ae95634e61c2]
#    to [a23578418f9709d9270c1064bb6e9c82c205d509]
# 
# patch "packages/efl1/ecore_cvs.bb"
#  from [dec22496c322b59a7a8bc85c16638bc3df968b44]
#    to [beca187339858acf3df078a145b9583c19f8fbb7]
# 
# patch "packages/efl1/evas-native_cvs.bb"
#  from [43075f93e3ccaafd51b16995c68d846aaa61d951]
#    to [711258833aed0945577bccaa289dda0250e2e010]
# 
# patch "packages/efl1/evas.inc"
#  from [fd3e4b3fe2bc86c11be17af6e14d5eff08387a89]
#    to [75e7e49650901c4a5ed2bd9c2e390eb76c130a3c]
# 
# patch "packages/efl1/evas_cvs.bb"
#  from [876a23f29e979df031ca09d730a1840667e998e4]
#    to [e7c55714a5e2929a7519afee0c537e8259fdaa83]
# 
============================================================
--- conf/distro/include/sane-srcdates.inc	8af2f634c8a91d9c27579c3537ca1e7d3132f5c6
+++ conf/distro/include/sane-srcdates.inc	7749bfba16f5e3781dfb985e24f1664204058a6e
@@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20070819"
+EFL_SRCDATE = "20071206"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -89,6 +89,7 @@ SRCDATE_python-emotion ?= "${EFL_SRCDATE
 SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
 SRCDATE_python-edje ?= "${EFL_SRCDATE}"
 SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
+SRCDATE_python-epsilon ?= "${EFL_SRCDATE}"
 SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
 SRCDATE_python-etk ?= "${EFL_SRCDATE}"
 
@@ -102,8 +103,11 @@ SRCDATE_entice ?= "${EFL_SRCDATE}"
 SRCDATE_expedite ?= "${EFL_SRCDATE}"
 SRCDATE_elitaire ?= "${EFL_SRCDATE}"
 SRCDATE_entice ?= "${EFL_SRCDATE}"
+SRCDATE_entrance ?= "${EFL_SRCDATE}"
 SRCDATE_e-utils ?= "${EFL_SRCDATE}"
+SRCDATE_e-wm ?= "${EFL_SRCDATE}"
 SRCDATE_enna ?= "${EFL_SRCDATE}"
+SRCDATE_exquisite ?= "${EFL_SRCDATE}"
 
 # Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
============================================================
--- packages/efl1/ecore.inc	cec350030eb895068d6de7c48653ae95634e61c2
+++ packages/efl1/ecore.inc	a23578418f9709d9270c1064bb6e9c82c205d509
@@ -9,10 +9,12 @@ inherit efl_library
 
 inherit efl_library
 
-SRC_URI += "file://configure.patch;patch=1 \
-           file://fix-tslib-configure.patch;patch=1 \
-           file://fix-directfb-include.patch;patch=1"
+# SRC_URI += "file://configure.patch;patch=1 \
+#           file://fix-tslib-configure.patch;patch=1 \
+#           file://fix-directfb-include.patch;patch=1"
 
+SRC_URI += "file://fix-directfb-include.patch;patch=1"
+
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
 
 PACKAGES += "\
============================================================
--- packages/efl1/ecore_cvs.bb	dec22496c322b59a7a8bc85c16638bc3df968b44
+++ packages/efl1/ecore_cvs.bb	beca187339858acf3df078a145b9583c19f8fbb7
@@ -6,8 +6,8 @@ EXTRA_OECONF = "\
 		--disable-ecore-x-xcb \
 		--enable-ecore-x \
 		--enable-ecore-job \
-		--enable-ecore-directfb \
-		--enable-ecore-sdl \
+		--disable-ecore-directfb \
+		--disable-ecore-sdl \
 		--enable-ecore-fb \
 		--enable-ecore-evas \
 		--disable-ecore-evas-gl \
============================================================
--- packages/efl1/evas-native_cvs.bb	43075f93e3ccaafd51b16995c68d846aaa61d951
+++ packages/efl1/evas-native_cvs.bb	711258833aed0945577bccaa289dda0250e2e010
@@ -6,7 +6,7 @@ EXTRA_OECONF = "\
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
-		--disable-fb				\
+		--enable-fb				\
 		--disable-directfb			\
 		--disable-sdl				\
 		--enable-buffer				\
============================================================
--- packages/efl1/evas.inc	fd3e4b3fe2bc86c11be17af6e14d5eff08387a89
+++ packages/efl1/evas.inc	75e7e49650901c4a5ed2bd9c2e390eb76c130a3c
@@ -1,15 +1,15 @@ LICENSE = "MIT"
 DESCRIPTION = "Evas is a hardware-accelerated canvas API that can draw \
 anti-aliased text, smooth super and sub-images, alpha-blend, as well as drop \
 down to using normal X11 primitives such as pixmaps, lines and rectangles if \
 your CPU or graphics hardware are too slow."
 LICENSE = "MIT"
-# can also depend on valgrind (?)
-DEPENDS = "libsdl-x11 directfb eet freetype jpeg virtual/libx11 libxext"
+# can also depend on valgrind, libsdl-x11, directfb
+DEPENDS = "eet freetype jpeg virtual/libx11 libxext libxrender"
 PV = "0.9.9.041+cvs${SRCDATE}"
 
 inherit efl_library
 
-SRC_URI += "file://fix-configure.patch;patch=1"
+# SRC_URI += "file://fix-configure.patch;patch=1"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
============================================================
--- packages/efl1/evas_cvs.bb	876a23f29e979df031ca09d730a1840667e998e4
+++ packages/efl1/evas_cvs.bb	e7c55714a5e2929a7519afee0c537e8259fdaa83
@@ -1,12 +1,12 @@ require evas.inc
 require evas.inc
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
 		--enable-fb					\
-		--enable-directfb			\
-		--enable-sdl				\
+		--disable-directfb			\
+		--disable-sdl				\
 		--enable-buffer				\
 		--disable-software-ddraw	\
 		--disable-software-qtopia	\


#
# mt diff -r99925725722e255ce214c4cfb61018cbf2729439 -r18c78b60a5927032930ff3a527704644b4381596
#
# 
# 
# add_dir "packages/mozilla/mozilla"
# 
# add_dir "packages/mozilla/mozilla/files"
# 
# add_dir "packages/mozilla/mozilla/files/i386"
# 
# add_dir "packages/mozilla/mozilla/files/i486"
# 
# add_dir "packages/mozilla/mozilla/files/i586"
# 
# add_dir "packages/mozilla/mozilla/files/i686"
# 
# add_dir "packages/mozilla/mozilla/firefox-2.0.0.3"
# 
# add_dir "packages/openrdate"
# 
# add_file "packages/mozilla/mozilla/files/i386/jsautocfg.h"
#  content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
# 
# add_file "packages/mozilla/mozilla/files/i486/jsautocfg.h"
#  content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
# 
# add_file "packages/mozilla/mozilla/files/i586/jsautocfg.h"
#  content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
# 
# add_file "packages/mozilla/mozilla/files/i686/jsautocfg.h"
#  content [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
# 
# add_file "packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch"
#  content [7863efd4c4cce2aacd3fca003a8f96089e3189bf]
# 
# add_file "packages/openrdate/openrdate_1.1.3.bb"
#  content [23a1926943ef815462e8302b1ea34233d5194de0]
# 
# patch "packages/mozilla/firefox-2.0.0.3/mozconfig"
#  from [035d9834d662d15a37cc3f7aa65c0111e433b3b9]
#    to [411dfae58ddc1627c6aa7e0ae66592e8a6d27877]
# 
# patch "packages/mozilla/firefox_2.0.0.3.bb"
#  from [ff9dc115db7d1ddc78b700764d392c5d86f63481]
#    to [08d4f61dc91156c06adfd55995d6aca49f5c95ba]
# 
============================================================
--- packages/mozilla/mozilla/files/i386/jsautocfg.h	0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
+++ packages/mozilla/mozilla/files/i386/jsautocfg.h	0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
============================================================
--- packages/mozilla/mozilla/files/i486/jsautocfg.h	0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
+++ packages/mozilla/mozilla/files/i486/jsautocfg.h	0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
============================================================
--- packages/mozilla/mozilla/files/i586/jsautocfg.h	0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
+++ packages/mozilla/mozilla/files/i586/jsautocfg.h	0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
============================================================
--- packages/mozilla/mozilla/files/i686/jsautocfg.h	0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
+++ packages/mozilla/mozilla/files/i686/jsautocfg.h	0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545
@@ -0,0 +1,52 @@
+#ifndef js_cpucfg___
+#define js_cpucfg___
+
+/* AUTOMATICALLY GENERATED - DO NOT EDIT */
+
+#define IS_LITTLE_ENDIAN 1
+#undef  IS_BIG_ENDIAN
+
+#define JS_BYTES_PER_BYTE   1L
+#define JS_BYTES_PER_SHORT  2L
+#define JS_BYTES_PER_INT    4L
+#define JS_BYTES_PER_INT64  8L
+#define JS_BYTES_PER_LONG   4L
+#define JS_BYTES_PER_FLOAT  4L
+#define JS_BYTES_PER_DOUBLE 8L
+#define JS_BYTES_PER_WORD   4L
+#define JS_BYTES_PER_DWORD  8L
+
+#define JS_BITS_PER_BYTE    8L
+#define JS_BITS_PER_SHORT   16L
+#define JS_BITS_PER_INT     32L
+#define JS_BITS_PER_INT64   64L
+#define JS_BITS_PER_LONG    32L
+#define JS_BITS_PER_FLOAT   32L
+#define JS_BITS_PER_DOUBLE  64L
+#define JS_BITS_PER_WORD    32L
+
+#define JS_BITS_PER_BYTE_LOG2   3L
+#define JS_BITS_PER_SHORT_LOG2  4L
+#define JS_BITS_PER_INT_LOG2    5L
+#define JS_BITS_PER_INT64_LOG2  6L
+#define JS_BITS_PER_LONG_LOG2   5L
+#define JS_BITS_PER_FLOAT_LOG2  5L
+#define JS_BITS_PER_DOUBLE_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2   5L
+
+#define JS_ALIGN_OF_SHORT   2L
+#define JS_ALIGN_OF_INT     4L
+#define JS_ALIGN_OF_LONG    4L
+#define JS_ALIGN_OF_INT64   8L
+#define JS_ALIGN_OF_FLOAT   4L
+#define JS_ALIGN_OF_DOUBLE  8L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD    4L
+
+#define JS_BYTES_PER_WORD_LOG2   2L
+#define JS_BYTES_PER_DWORD_LOG2  3L
+#define JS_WORDS_PER_DWORD_LOG2  1L
+
+#define JS_STACK_GROWTH_DIRECTION (-1)
+
+#endif /* js_cpucfg___ */
============================================================
--- packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch	7863efd4c4cce2aacd3fca003a8f96089e3189bf
+++ packages/mozilla/mozilla/firefox-2.0.0.3/linkage-problem.patch	7863efd4c4cce2aacd3fca003a8f96089e3189bf
@@ -0,0 +1,14 @@
+--- mozilla/layout/build/Makefile.in~	2007-11-24 00:38:14.000000000 -0200
++++ mozilla/layout/build/Makefile.in	2007-11-24 00:38:14.000000000 -0200
+@@ -229,6 +229,11 @@
+ 		    $(NULL)
+ endif
+ 
++ifdef MOZ_ENABLE_XFT
++EXTRA_DSO_LDOPTS += $(MOZ_XFT_LIBS) \
++		    $(NULL)
++endif
++
+ ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ 		    $(NULL)
============================================================
--- packages/openrdate/openrdate_1.1.3.bb	23a1926943ef815462e8302b1ea34233d5194de0
+++ packages/openrdate/openrdate_1.1.3.bb	23a1926943ef815462e8302b1ea34233d5194de0
@@ -0,0 +1,12 @@
+DESCRIPTION = "Date and time setting software implementing RFC 868 and RFC 2030 protocols"
+HOMEPAGE = "http://sourceforge.net/projects/openrdate/"
+SECTION = "admin"
+LICENSE = "BSD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openrdate/openrdate-${PV}.tar.gz"
+
+inherit autotools
+
+do_stage() {
+        autotools_stage_all
+}
============================================================
--- packages/mozilla/firefox-2.0.0.3/mozconfig	035d9834d662d15a37cc3f7aa65c0111e433b3b9
+++ packages/mozilla/firefox-2.0.0.3/mozconfig	411dfae58ddc1627c6aa7e0ae66592e8a6d27877
@@ -55,3 +55,6 @@ ac_add_options --enable-optimize=-O1
 #ac_add_options --disable-shared
 #ac_add_options --enable-static
 ac_add_options --enable-optimize=-O1
+
+# Use cairo from system
+ac_add_options --enable-system-cairo
============================================================
--- packages/mozilla/firefox_2.0.0.3.bb	ff9dc115db7d1ddc78b700764d392c5d86f63481
+++ packages/mozilla/firefox_2.0.0.3.bb	08d4f61dc91156c06adfd55995d6aca49f5c95ba
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
@@ -10,7 +10,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mo
     file://eabi-fix.patch;patch=1 \
     file://eabi-fix2.patch;patch=1 \
     file://eabi-fix3.patch;patch=1 \
+    file://linkage-problem.patch;patch=1 \
        "
+DEPENDS += cairo
+
 S = "${WORKDIR}/mozilla"
 DEFAULT_PREFERENCE = "-1"
 
@@ -36,4 +39,3 @@ do_stage() {
         # removes 2 lines that call absent headers
         sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h
 }
-






More information about the Openembedded-commits mailing list