Hi all,
I'm going to apply the attached patches to .stable that have already been
applied in .dev. These are all in aid of fixing task-opie-*.
1) opie-irc-removepatches.patch
opie-irc: remove patches (now merged upstream)
Applied to .dev in: e65ed9e5ef27495a6e0a27b271aaeb16c87cc317
2) opie-dagger-removepatches.patch
opie-dagger: remove patch (now merged upstream)
Applied to .dev in: 6b8c5dfa1242c770d1d6c3f4939f19e2d8ea800d
3) opie-usermanager-remove.patch
task-opie-all: drop opie-usermanager (unsupported upstream). Fixes #3311.
Applied to .dev in: 6b62c7103f19ad80055c577649ad13a0747f19aa
4) opie-dasher-remove.patch
task-opie-all: drop opie-dasher (unsupported upstream). Fixes #3601.
Applied to .dev in: d4ada8446f36d70f32222f306b5709b1048f47d7
5) opie-mediaplayer1-1.2.3-add.patch
opie-mediaplayer1: Add 1.2.3 versions of mediaplayer1 and plugins
Applied to .dev in: 03740c225501e66bf2a7218536868643b53812ce
6) opie-restartapplet2-1.2.3-add.patch
opie-restartapplet2: add 1.2.3 package
Applied to .dev in: 156573f21daba762fc9410e3cbeb2c3e7fdebc21
Please speak up now if you have objections.
Cheers,
Paul
#
# old_revision [17246703a149fb0a5eae4d86cdd24af049f20e4c]
#
# delete "packages/opie-dagger/files"
#
# delete "packages/opie-dagger/files/opie-dagger-missing-include.patch"
#
# patch "packages/opie-dagger/opie-dagger_1.2.3.bb"
# from [731e781681311ac4a0a8a2cef066065013783756]
# to [fe9f7ef7ce61bc4723e5e5218b758974d674ff75]
#
# patch "packages/opie-dagger/opie-dagger_cvs.bb"
# from [403703ca3ea4bc740f9175880dc6846c4dc044f9]
# to [baea85961fb89ca910d1c4bcd7eb1993954ff42f]
#
============================================================
--- packages/opie-dagger/opie-dagger_1.2.3.bb 731e781681311ac4a0a8a2cef066065013783756
+++ packages/opie-dagger/opie-dagger_1.2.3.bb fe9f7ef7ce61bc4723e5e5218b758974d674ff75
@@ -1,9 +1,8 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/dagger \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
-SRC_URI += " file://opie-dagger-missing-include.patch;patch=1"
============================================================
--- packages/opie-dagger/opie-dagger_cvs.bb 403703ca3ea4bc740f9175880dc6846c4dc044f9
+++ packages/opie-dagger/opie-dagger_cvs.bb baea85961fb89ca910d1c4bcd7eb1993954ff42f
@@ -1,10 +1,9 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/dagger \
${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/apps"
-SRC_URI += " file://opie-dagger-missing-include.patch;patch=1"
#
# old_revision [17246703a149fb0a5eae4d86cdd24af049f20e4c]
#
# delete "packages/opie-irc/files"
#
# delete "packages/opie-irc/files/utf8-topic.patch"
#
# delete "packages/opie-irc/files/utf8.patch"
#
# patch "packages/opie-irc/opie-irc_1.2.3.bb"
# from [7c1584e98f129223f4252c85d691413f5ade1ec5]
# to [c4b837cfd973ef9166c1d40ef456df935a8807a3]
#
# patch "packages/opie-irc/opie-irc_cvs.bb"
# from [cee4fec93573b3ece698d3fd00fb8ebb408da7e8]
# to [a9a04d935da27288823d2c6ff1bc605bb7ec11ed]
#
============================================================
--- packages/opie-irc/opie-irc_1.2.3.bb 7c1584e98f129223f4252c85d691413f5ade1ec5
+++ packages/opie-irc/opie-irc_1.2.3.bb c4b837cfd973ef9166c1d40ef456df935a8807a3
@@ -1,10 +1,8 @@ require ${PN}.inc
require ${PN}.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opieirc \
${HANDHELDS_CVS};tag=${TAG};module=opie/help \
${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics"
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- file://utf8.patch;patch=1 \
- file://utf8-topic.patch;patch=1 "
============================================================
--- packages/opie-irc/opie-irc_cvs.bb cee4fec93573b3ece698d3fd00fb8ebb408da7e8
+++ packages/opie-irc/opie-irc_cvs.bb a9a04d935da27288823d2c6ff1bc605bb7ec11ed
@@ -1,11 +1,9 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
${HANDHELDS_CVS};module=opie/help \
${HANDHELDS_CVS};module=opie/apps \
+ ${HANDHELDS_CVS};module=opie/pics"
- ${HANDHELDS_CVS};module=opie/pics \
- file://utf8.patch;patch=1 \
- file://utf8-topic.patch;patch=1 "
--- packages/tasks/task-opie-all.bb 2008-09-17 22:26:53.000000000 +0100
+++ packages/tasks/task-opie-all.bb 2008-09-17 22:27:36.000000000 +0100
@@ -24,7 +24,7 @@
opie-screenshotapplet opie-suspendapplet opie-vmemo \
opie-volumeapplet opie-vtapplet opie-zkbapplet \
"
-RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \
+RDEPENDS_task-opie-inputmethods = "opie-dvorak opie-handwriting \
opie-handwriting-classicset opie-jumpx opie-keyboard \
opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"
--- packages/tasks/task-opie-all.bb 2008-09-17 22:29:13.000000000 +0100
+++ packages/tasks/task-opie-all.bb 2008-09-17 22:29:56.000000000 +0100
@@ -50,8 +50,7 @@
opie-formatter opie-language opie-launcher-settings \
opie-light-and-power opie-mediummount opie-networksettings \
opie-packagemanager opie-security opie-sshkeys opie-sysinfo \
- opie-systemtime opie-usermanager opie-icon-reload \
- opie-vmemo-settings"
+ opie-systemtime opie-icon-reload opie-vmemo-settings"
RDEPENDS_task-opie-pim = "task-opie-base-pim task-opie-todayplugins task-opie-datebookplugins \
opie-mail opie-pimconverter"
#
#
# add_file "packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb"
# content [039055825fe8a376f21ef8f02c2372aa92abff1d]
#
# add_file "packages/opie-mediaplayer1/opie-mediaplayer1.inc"
# content [2e379a8e9a2d3bbb86e2740693bbc3fcde093f50]
#
# add_file "packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb"
# content [4481782a4b2584f4f12e6e562174567a6d9b334c]
#
# add_file "packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb"
# content [59a68d584d2c54f2014d823f1c178411ac499757]
#
# add_file "packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb"
# content [385926d5a54356be44f7fd55a88a1cb30c6b5b05]
#
# add_file "packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb"
# content [ef5e42c5ffac57e185d7e39f5d68f4f2780687a3]
#
# add_file "packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb"
# content [4167ef554802cd18ee9db3001a1ff23a27d66635]
#
# add_file "packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb"
# content [ef5e42c5ffac57e185d7e39f5d68f4f2780687a3]
#
# patch "packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb"
# from [729b492d9517094b54bcf5b38786292ec8631900]
# to [4481782a4b2584f4f12e6e562174567a6d9b334c]
#
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb 039055825fe8a376f21ef8f02c2372aa92abff1d
+++ packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb 039055825fe8a376f21ef8f02c2372aa92abff1d
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1.inc 2e379a8e9a2d3bbb86e2740693bbc3fcde093f50
+++ packages/opie-mediaplayer1/opie-mediaplayer1.inc 2e379a8e9a2d3bbb86e2740693bbc3fcde093f50
@@ -0,0 +1,8 @@
+DESCRIPTION = "The classic Opie media player (core+plugins)."
+LICENSE = "GPL"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
+RDEPENDS = "opie-mediaplayer1-core"
+RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
+opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
+
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb 4481782a4b2584f4f12e6e562174567a6d9b334c
+++ packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb 4481782a4b2584f4f12e6e562174567a6d9b334c
@@ -0,0 +1,2 @@
+require ${PN}.inc
+
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb 59a68d584d2c54f2014d823f1c178411ac499757
+++ packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb 59a68d584d2c54f2014d823f1c178411ac499757
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+PV = "${OPIE_CVS_PV}"
+
============================================================
--- packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb 385926d5a54356be44f7fd55a88a1cb30c6b5b05
+++ packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb 385926d5a54356be44f7fd55a88a1cb30c6b5b05
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ file://libmadplugin.pro"
============================================================
--- packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb ef5e42c5ffac57e185d7e39f5d68f4f2780687a3
+++ packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb ef5e42c5ffac57e185d7e39f5d68f4f2780687a3
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
============================================================
--- packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb 4167ef554802cd18ee9db3001a1ff23a27d66635
+++ packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb 4167ef554802cd18ee9db3001a1ff23a27d66635
@@ -0,0 +1,6 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \
+ file://vorbis.pro "
============================================================
--- packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb ef5e42c5ffac57e185d7e39f5d68f4f2780687a3
+++ packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb ef5e42c5ffac57e185d7e39f5d68f4f2780687a3
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer "
============================================================
--- packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb 729b492d9517094b54bcf5b38786292ec8631900
+++ packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb 4481782a4b2584f4f12e6e562174567a6d9b334c
@@ -1,9 +1,2 @@
-DESCRIPTION = "The classic Opie media player (core+plugins)."
-LICENSE = "GPL"
-ALLOW_EMPTY = "1"
-PACKAGE_ARCH = "all"
-RDEPENDS = "opie-mediaplayer1-core"
-RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
-opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"
+require ${PN}.inc
-PR = "r2"
#
#
# add_file "packages/opie-restartapplet2/opie-restartapplet2_1.2.3.bb"
# content [999dfcd24e9a330b61ac77961b4a8ab991dc0b48]
#
============================================================
--- packages/opie-restartapplet2/opie-restartapplet2_1.2.3.bb 999dfcd24e9a330b61ac77961b4a8ab991dc0b48
+++ packages/opie-restartapplet2/opie-restartapplet2_1.2.3.bb 999dfcd24e9a330b61ac77961b4a8ab991dc0b48
@@ -0,0 +1,6 @@
+require ${PN}.inc
+
+
+
+SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/restartapplet2 \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
_______________________________________________
Openembedded-stablebranch mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-stablebranch
