[oe-commits] org.oe.dev merge of '6c2d621bdfd446c13552a5e4b126ef9c5dd20106'
pfalcon commit
openembedded-commits at lists.openembedded.org
Thu Feb 21 17:06:44 UTC 2008
merge of '6c2d621bdfd446c13552a5e4b126ef9c5dd20106'
and 'f8d54cc4c0dfc594e55d38708db17f5d5c68846a'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 9dc2c816a6357d501b8f697a70f48287da272ed0
ViewMTN: http://monotone.openembedded.org/revision/info/9dc2c816a6357d501b8f697a70f48287da272ed0
Files:
1
packages/randrext
packages/randrext/randrext_1.0.bb
packages/randrext/randrext_cvs.bb
packages/recordext
packages/recordext/recordext_cvs.bb
packages/renderext
packages/renderext/renderext_0.8.bb
packages/renderext/renderext_cvs.bb
packages/compositeext
packages/obsolete/compositeext
packages/damageext
packages/obsolete/damageext
packages/fixesext
packages/obsolete/fixesext
packages/panoramixext
packages/obsolete/panoramixext
packages/resourceext
packages/obsolete/resourceext
packages/xxf86dgaext
packages/obsolete/xxf86dgaext
packages/xxf86vmext
packages/obsolete/xxf86vmext
classes/sanity.bbclass
conf/bitbake.conf
conf/distro/include/sane-srcrevs.inc
packages/asterisk/asterisk_1.4.10.bb
packages/asterisk/asterisk_1.4.11.bb
packages/asterisk/asterisk_1.4.17.bb
packages/libxine/libxine-fb_1.0.bb
packages/libxine/libxine-x11_1.0.bb
packages/libxine/libxine_1.1.0.bb
packages/mozilla/firefox.inc
packages/mozilla/firefox_1.0.7.bb
packages/mozilla/firefox_2.0.0.3.bb
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/prismstumbler/prismstumbler_0.7.3.bb
packages/rdesktop/rdesktop_1.3.1.bb
packages/rdesktop/rdesktop_1.4.1.bb
packages/rdesktop/rdesktop_1.5.0.bb
packages/subversion/subversion_1.3.1.bb
packages/subversion/subversion_1.4.0.bb
packages/subversion/subversion_1.4.3.bb
packages/subversion/subversion_1.4.5.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/uclibc/elf2flt_svn.bb
packages/xmms-embedded/xmms-embedded_20040327.bb
packages/xorg-app/mkbold-mkitalic-native_0.11.bb
packages/gpe-login/gpe-login-0.90
packages/gpe-login/files/chvt-keylaunch.patch
packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch
packages/gpe-login/gpe-login-0.90/chvt-keylaunch.patch
packages/gpe-login/gpe-login-0.86
packages/gpe-login/gpe-login_0.91.bb
conf/distro/include/angstrom-2007-for-openmoko-versions.inc
conf/distro/include/preferred-gpe-versions-2.8.inc
packages/gpe-login/files/lock-on-supend.patch
Diffs:
#
# mt diff -r6c2d621bdfd446c13552a5e4b126ef9c5dd20106 -r9dc2c816a6357d501b8f697a70f48287da272ed0
#
#
#
# delete "packages/randrext"
#
# delete "packages/randrext/randrext_1.0.bb"
#
# delete "packages/randrext/randrext_cvs.bb"
#
# delete "packages/recordext"
#
# delete "packages/recordext/recordext_cvs.bb"
#
# delete "packages/renderext"
#
# delete "packages/renderext/renderext_0.8.bb"
#
# delete "packages/renderext/renderext_cvs.bb"
#
# rename "packages/compositeext"
# to "packages/obsolete/compositeext"
#
# rename "packages/damageext"
# to "packages/obsolete/damageext"
#
# rename "packages/fixesext"
# to "packages/obsolete/fixesext"
#
# rename "packages/panoramixext"
# to "packages/obsolete/panoramixext"
#
# rename "packages/resourceext"
# to "packages/obsolete/resourceext"
#
# rename "packages/xxf86dgaext"
# to "packages/obsolete/xxf86dgaext"
#
# rename "packages/xxf86vmext"
# to "packages/obsolete/xxf86vmext"
#
# patch "classes/sanity.bbclass"
# from [476edb8104e59b309dc8324d39e691ffd1116e3a]
# to [17eaa6a6a031b90e039f0607d801649c4c1c56b4]
#
# patch "conf/bitbake.conf"
# from [a605bd5d4d48054b72d21c74a922a9a0a2d12a76]
# to [20411cfe48d828effd31bc1b225638aa75828191]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [c50ac937f3aa1f2966905448c3afbb2e1bb0025f]
# to [5593e5efc3a50fcda9d2247e1e4eb97b9974d204]
#
# patch "packages/asterisk/asterisk_1.4.10.bb"
# from [2d51154605b0ca7b662304502f3cb12e7330014e]
# to [63f58515cb08e7fedd04b521e8d2b6ba74a63457]
#
# patch "packages/asterisk/asterisk_1.4.11.bb"
# from [c8d00d57639bbb867b0f3bab8775bb2375e7fd7a]
# to [60ad063e816162c04cc9f9093a4b97c9e48fb6be]
#
# patch "packages/asterisk/asterisk_1.4.17.bb"
# from [060df18e986c1290e557ca7de184d66634bcb25a]
# to [2f04528dd5495d5de7fee0972edafd159d0453b6]
#
# patch "packages/libxine/libxine-fb_1.0.bb"
# from [73dffac6b8f7d07e4dd71ef60094a9809767d703]
# to [fc3151974c5c92881b17578858d24c3c289d8045]
#
# patch "packages/libxine/libxine-x11_1.0.bb"
# from [047dae9a9fb304d0b88425d4f80a45fd14b4e21b]
# to [01225d1ca79203a58650f9705e2013e16dac5c7c]
#
# patch "packages/libxine/libxine_1.1.0.bb"
# from [c1680bf135560557cf801665aa00e1f00619e237]
# to [9e74c0987d37d121a526263edde2a00ba2d26764]
#
# patch "packages/mozilla/firefox.inc"
# from [ce3d32af7c35197aad91f186be895b364ae58f9b]
# to [2b8653e70c8128f0b821b235f2f0e1fbcc2c8779]
#
# patch "packages/mozilla/firefox_1.0.7.bb"
# from [a8138fce8dfb4fd4ec448e058aecd870575ede96]
# to [f02c0cc9b745dd1b59e3c6948bcb6049880a2178]
#
# patch "packages/mozilla/firefox_2.0.0.3.bb"
# from [0ee74a5aef3cee4364cdc98fcb62c10891e384a5]
# to [9f6ce8af3b3e82e5889f640c7552aed39d0fd930]
#
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
# from [2853cbcd850a08bb25348843fd824ec14dda114e]
# to [be915c43601a85e473bfe81da31c8f2179696358]
#
# patch "packages/prismstumbler/prismstumbler_0.7.3.bb"
# from [7c95fdc5aaf6ba665f6546669d9d8c50e2ebc896]
# to [5e07eff37ac1acddc5f9e7b7094acc7b186aa792]
#
# patch "packages/rdesktop/rdesktop_1.3.1.bb"
# from [123c0963c930eec872198d019f1cf1e48eecccf0]
# to [546d9776aaef7f0a511f8a28671dc0a592278cdb]
#
# patch "packages/rdesktop/rdesktop_1.4.1.bb"
# from [a9ab28ff03d914badd10a000f082d6b5351d7abc]
# to [cef9fbbda34cd8ffc2e16eb427b9930989d5121b]
#
# patch "packages/rdesktop/rdesktop_1.5.0.bb"
# from [8168a10aad2470f1e81cde1b8e148b7691e31cb3]
# to [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
#
# patch "packages/subversion/subversion_1.3.1.bb"
# from [6ff7966e96664ef304c72446fb0683610329c0ab]
# to [fc6b3bacecb3d0e9c501b4769a2b8939cb5c0e83]
#
# patch "packages/subversion/subversion_1.4.0.bb"
# from [f9692d80ac97a59fd09b120d0154ab76bc2babb8]
# to [4015c57dfaaf676b54913d1b5d95c71294ef8219]
#
# patch "packages/subversion/subversion_1.4.3.bb"
# from [74cb237892d32ea834e0050c19f66293c1457d23]
# to [d5f16acf511f297993077ccb53ec969f0d3cf6b1]
#
# patch "packages/subversion/subversion_1.4.5.bb"
# from [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# to [b3247341e42924a7030a8993469f0c0eddeae7cd]
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [cc49be056ab89c25407b8dbef14a32c86fca227f]
# to [2feeb29fabb3786b6eea52cabe765729f2ab5568]
#
# patch "packages/uclibc/elf2flt_svn.bb"
# from [376f3f2ab831cad1d7e4af6fdbc4d054ce873500]
# to [5e4764fa17f04ac0f68f4e90559919814f21f2e0]
#
# patch "packages/xmms-embedded/xmms-embedded_20040327.bb"
# from [03a2dbf2670c2ab7fb9f8c7f99f6b5453b7ad33e]
# to [fa97c83984b56db433bad80d69a6a49429af862a]
#
# patch "packages/xorg-app/mkbold-mkitalic-native_0.11.bb"
# from [b1aea18de213f27a02dd941931cb2b273cdc0922]
# to [112bcd39c5d948f13628b2b335a99e2160820e48]
#
============================================================
--- classes/sanity.bbclass 476edb8104e59b309dc8324d39e691ffd1116e3a
+++ classes/sanity.bbclass 17eaa6a6a031b90e039f0607d801649c4c1c56b4
@@ -162,11 +162,6 @@ python check_sanity_eventhandler() {
from bb import note, error, data, __version__
from bb.event import getName
- try:
- from distutils.version import LooseVersion
- except ImportError:
- def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
-
if getName(e) == "ConfigParsed":
check_sanity(e)
============================================================
--- conf/bitbake.conf a605bd5d4d48054b72d21c74a922a9a0a2d12a76
+++ conf/bitbake.conf 20411cfe48d828effd31bc1b225638aa75828191
@@ -228,6 +228,7 @@ STAGING_DATADIR = "${STAGING_DIR_HOST}${
STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}"
+STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}"
STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
============================================================
--- conf/distro/include/sane-srcrevs.inc c50ac937f3aa1f2966905448c3afbb2e1bb0025f
+++ conf/distro/include/sane-srcrevs.inc 5593e5efc3a50fcda9d2247e1e4eb97b9974d204
@@ -7,6 +7,10 @@
# this is alphabetical!
+# yes, really!
+
+# you know what that means? like... a, b, c, d, e, f, g...
+
SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-bfin-uclibc ?= "1857"
SRCREV_pn-contact ?= "1410"
@@ -41,6 +45,7 @@ SRCREV_pn-libmokoui2 ?= "3688"
SRCREV_pn-libmokojournal2 ?= "3217"
SRCREV_pn-libmokopanelui2 ?= "3349"
SRCREV_pn-libmokoui2 ?= "3688"
+SRCREV_pn-libw100 ?= "47"
SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
SRCREV_pn-lightmediascanner ?= "68"
@@ -57,7 +62,10 @@ SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-moko-gtk-engine ?= "3405"
SRCREV_pn-mpd-alsa ?= "6952"
+SRCREV_pn-mplayer ?= "24587"
SRCREV_pn-neod ?= "3421"
+SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager-applet ?= "200"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
SRCREV_pn-osb-jscore ?= "117"
@@ -132,14 +140,12 @@ SRCREV_pn-tmut ?= "60"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-tmut ?= "60"
+SRCREV_pn-u-boot-openmoko ?= "4100"
+SRCREV_pn-usbpath ?= "3108"
+SRCREV_pn-usbpath-native ?= "3108"
SRCREV_pn-webkit-gtk ?= "28656"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
SRCREV_pn-xoo ?= "1623"
+
-SRCREV_pn-mplayer ?= "24587"
-SRCREV_pn-networkmanager ?= "2887"
-SRCREV_pn-networkmanager-applet ?= "200"
-SRCREV_pn-libw100 ?= "47"
-SRCREV_pn-usbpath ?= "3108"
-SRCREV_pn-usbpath-native ?= "3108"
============================================================
--- packages/asterisk/asterisk_1.4.10.bb 2d51154605b0ca7b662304502f3cb12e7330014e
+++ packages/asterisk/asterisk_1.4.10.bb 63f58515cb08e7fedd04b521e8d2b6ba74a63457
@@ -30,17 +30,17 @@ inherit autotools update-rc.d
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \
+ --with-z=${STAGING_EXECPREFIXDIR} \
+ --with-curl=${STAGING_EXECPREFIXDIR} \
+ --with-termcap=${STAGING_EXECPREFIXDIR} \
+ --with-ogg=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis=${STAGING_EXECPREFIXDIR} \
+ --with-sqlite=${STAGING_EXECPREFIXDIR} \
+ --with-popt=${STAGING_EXECPREFIXDIR} \
+ --with-gnutls=${STAGING_EXECPREFIXDIR} \
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR} \
--without-imap\
--without-netsnmp\
--without-odbc\
============================================================
--- packages/asterisk/asterisk_1.4.11.bb c8d00d57639bbb867b0f3bab8775bb2375e7fd7a
+++ packages/asterisk/asterisk_1.4.11.bb 60ad063e816162c04cc9f9093a4b97c9e48fb6be
@@ -32,17 +32,17 @@ inherit autotools update-rc.d
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR}\
+ --with-z=${STAGING_EXECPREFIXDIR}\
+ --with-curl=${STAGING_EXECPREFIXDIR}\
+ --with-termcap=${STAGING_EXECPREFIXDIR}\
+ --with-ogg=${STAGING_EXECPREFIXDIR}\
+ --with-vorbis=${STAGING_EXECPREFIXDIR}\
+ --with-sqlite=${STAGING_EXECPREFIXDIR}\
+ --with-popt=${STAGING_EXECPREFIXDIR}\
+ --with-gnutls=${STAGING_EXECPREFIXDIR}\
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR}\
--without-imap\
--without-netsnmp\
--without-odbc\
============================================================
--- packages/asterisk/asterisk_1.4.17.bb 060df18e986c1290e557ca7de184d66634bcb25a
+++ packages/asterisk/asterisk_1.4.17.bb 2f04528dd5495d5de7fee0972edafd159d0453b6
@@ -31,17 +31,17 @@ inherit autotools update-rc.d
inherit autotools update-rc.d
-EXTRA_OECONF = "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
- --with-z=${STAGING_DIR}/${TARGET_SYS}\
- --with-curl=${STAGING_DIR}/${TARGET_SYS}\
- --with-termcap=${STAGING_DIR}/${TARGET_SYS}\
- --with-ogg=${STAGING_DIR}/${TARGET_SYS}\
- --with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
- --with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
- --with-popt=${STAGING_DIR}/${TARGET_SYS}\
- --with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \
+ --with-z=${STAGING_EXECPREFIXDIR} \
+ --with-curl=${STAGING_EXECPREFIXDIR} \
+ --with-termcap=${STAGING_EXECPREFIXDIR} \
+ --with-ogg=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis=${STAGING_EXECPREFIXDIR} \
+ --with-sqlite=${STAGING_EXECPREFIXDIR} \
+ --with-popt=${STAGING_EXECPREFIXDIR} \
+ --with-gnutls=${STAGING_EXECPREFIXDIR} \
--without-curses\
- --with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+ --with-ncurses=${STAGING_EXECPREFIXDIR} \
--without-imap\
--without-netsnmp\
--without-odbc\
============================================================
--- packages/libxine/libxine-fb_1.0.bb 73dffac6b8f7d07e4dd71ef60094a9809767d703
+++ packages/libxine/libxine-fb_1.0.bb fc3151974c5c92881b17578858d24c3c289d8045
@@ -26,10 +26,10 @@ SOV = "1.0.7"
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--enable-shared --disable-static \
--disable-fb --disable-alsa --disable-vcd \
============================================================
--- packages/libxine/libxine-x11_1.0.bb 047dae9a9fb304d0b88425d4f80a45fd14b4e21b
+++ packages/libxine/libxine-x11_1.0.bb 01225d1ca79203a58650f9705e2013e16dac5c7c
@@ -27,10 +27,10 @@ SOV = "1.0.7"
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--disable-fb --disable-alsa --disable-vcd \
--disable-asf --disable-faad --disable-iconv \
============================================================
--- packages/libxine/libxine_1.1.0.bb c1680bf135560557cf801665aa00e1f00619e237
+++ packages/libxine/libxine_1.1.0.bb 9e74c0987d37d121a526263edde2a00ba2d26764
@@ -31,10 +31,10 @@ SOV = "1.0.7"
SOV = "1.0.7"
-EXTRA_OECONF="-with-zlib-path=${STAGING_DIR}/${HOST_SYS} \
- --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+EXTRA_OECONF="-with-zlib-path=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis-prefix=${STAGING_EXECPREFIXDIR} \
--disable-oggtest \
- --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} \
+ --with-ogg-prefix=${STAGING_EXECPREFIXDIR} \
--disable-altivec --disable-vis --disable-mlib \
--disable-fb --disable-alsa --disable-vcd \
--disable-asf --disable-faad --disable-iconv \
============================================================
--- packages/mozilla/firefox.inc ce3d32af7c35197aad91f186be895b364ae58f9b
+++ packages/mozilla/firefox.inc 2b8653e70c8128f0b821b235f2f0e1fbcc2c8779
@@ -1,4 +1,5 @@ SRC_URI += "file://mozilla-firefox.png f
SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
+
PACKAGES =+ "firefox-inspector"
FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \
@@ -27,3 +28,11 @@ pkg_postinst_firefox() {
# work around requirement for root access on first startup
chmod -R a+w ${libdir}/firefox*
}
+
+do_stage() {
+ autotools_stage_all
+
+
+
+}
+
============================================================
--- packages/mozilla/firefox_1.0.7.bb a8138fce8dfb4fd4ec448e058aecd870575ede96
+++ packages/mozilla/firefox_1.0.7.bb f02c0cc9b745dd1b59e3c6948bcb6049880a2178
@@ -1,4 +1,5 @@
-PR = "r0"
+PR = "r2"
+
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 \
@@ -8,11 +9,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mo
file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \
file://xptcinvoke-arm.patch;patch=1 \
file://mozilla-eabi.patch;patch=1"
-
S = "${WORKDIR}/mozilla"
-inherit mozilla
-
+inherit autotools mozilla
+
require firefox.inc
EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../"
@@ -20,4 +20,3 @@ do_compile_prepend() {
do_compile_prepend() {
cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
}
-
============================================================
--- packages/mozilla/firefox_2.0.0.3.bb 0ee74a5aef3cee4364cdc98fcb62c10891e384a5
+++ packages/mozilla/firefox_2.0.0.3.bb 9f6ce8af3b3e82e5889f640c7552aed39d0fd930
@@ -6,38 +6,36 @@ SRC_URI = "http://ftp.mozilla.org/pub/mo
file://no-xmb.patch;patch=1 \
file://jsautocfg.h \
file://extensions-hack.patch;patch=1 \
- file://security-cross.patch;patch=1 \
- file://jsautocfg-dontoverwrite.patch;patch=1 \
- file://xptcinvoke-arm.patch;patch=1 \
- file://eabi-fix.patch;patch=1 \
- file://eabi-fix2.patch;patch=1 \
- file://eabi-fix3.patch;patch=1 \
- file://linkage-problem.patch;patch=1 \
- "
+ file://security-cross.patch;patch=1 \
+ file://jsautocfg-dontoverwrite.patch;patch=1 \
+ file://xptcinvoke-arm.patch;patch=1 \
+ file://eabi-fix.patch;patch=1 \
+ file://eabi-fix2.patch;patch=1 \
+ file://eabi-fix3.patch;patch=1 \
+ file://linkage-problem.patch;pa%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf8d54cc4c0dfc594e55d38708db17f5d5c68846a -r9dc2c816a6357d501b8f697a70f48287da272ed0
#
#
#
# delete "packages/gpe-login/gpe-login-0.90"
#
# rename "packages/gpe-login/files/chvt-keylaunch.patch"
# to "packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch"
#
# rename "packages/gpe-login/gpe-login-0.90/chvt-keylaunch.patch"
# to "packages/gpe-login/files/chvt-keylaunch.patch"
#
# add_dir "packages/gpe-login/gpe-login-0.86"
#
# add_file "packages/gpe-login/gpe-login_0.91.bb"
# content [dc8d686e1e1f9d92d60d3b705a3844630bad51ae]
#
# patch "conf/distro/include/angstrom-2007-for-openmoko-versions.inc"
# from [679a152fab923d34ccb9cd6b19ed77f4b7dac487]
# to [c239272a2d456c0cc3f4c30fc4ba59c4be5acf1c]
#
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
# from [4b14c35b3986ab4908cc77104d4e8bedda37428e]
# to [ed638b29796f8e274a83bd2129260b86970f7f34]
#
# patch "packages/gpe-login/files/lock-on-supend.patch"
# from [5406866966cfc13b3e4607b2d9fbc0a94bc0a2a8]
# to [56350a3a838dc5e7407b0d6a28258a6b1a98eade]
#
============================================================
--- packages/gpe-login/gpe-login_0.91.bb dc8d686e1e1f9d92d60d3b705a3844630bad51ae
+++ packages/gpe-login/gpe-login_0.91.bb dc8d686e1e1f9d92d60d3b705a3844630bad51ae
@@ -0,0 +1,26 @@
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd gpe-theme-clearlooks"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r0"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+
+SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
+SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
+SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
+SRC_URI += " file://size-autolock-properly.patch;patch=1 "
+SRC_URI += " file://c-locale.patch;patch=1 "
+
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+
============================================================
--- conf/distro/include/angstrom-2007-for-openmoko-versions.inc 679a152fab923d34ccb9cd6b19ed77f4b7dac487
+++ conf/distro/include/angstrom-2007-for-openmoko-versions.inc c239272a2d456c0cc3f4c30fc4ba59c4be5acf1c
@@ -548,7 +548,7 @@ PREFERRED_VERSION_gpe-lights ?= "0.13"
PREFERRED_VERSION_gpe-keylock ?= "0.12"
PREFERRED_VERSION_gpe-life ?= "0.2"
PREFERRED_VERSION_gpe-lights ?= "0.13"
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17"
PREFERRED_VERSION_gpe-mininet ?= "0.7"
============================================================
--- conf/distro/include/preferred-gpe-versions-2.8.inc 4b14c35b3986ab4908cc77104d4e8bedda37428e
+++ conf/distro/include/preferred-gpe-versions-2.8.inc ed638b29796f8e274a83bd2129260b86970f7f34
@@ -32,7 +32,7 @@ PREFERRED_VERSION_gpe-icons ?= "0.25"
PREFERRED_VERSION_gpe-icons ?= "0.25"
-PREFERRED_VERSION_gpe-login ?= "0.90"
+PREFERRED_VERSION_gpe-login ?= "0.91"
PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
PREFERRED_VERSION_gpe-su ?= "0.19"
PREFERRED_VERSION_keylaunch ?= "2.0.10"
============================================================
--- packages/gpe-login/files/lock-on-supend.patch 5406866966cfc13b3e4607b2d9fbc0a94bc0a2a8
+++ packages/gpe-login/files/lock-on-supend.patch 56350a3a838dc5e7407b0d6a28258a6b1a98eade
@@ -1,4 +1,5 @@ upstream: http://bugs.linuxtogo.org/show
upstream: http://bugs.linuxtogo.org/show_bug.cgi?id=125
+status: accepted in 0.91
Lock screen when device goes to suspend, not after some time has passed
since resume and they stole your data from the unprotected screen.
More information about the Openembedded-commits
mailing list