[oe-commits] org.oe.dev merge of '32f3152ef198ae19e34181438504621d6e5c0270'
polyonymous commit
openembedded-commits at lists.openembedded.org
Sat Jul 7 18:06:01 UTC 2007
merge of '32f3152ef198ae19e34181438504621d6e5c0270'
and '7ec9615281babcb1bd33e3299ca47a3cd2e4c8f7'
Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 566bc0556b0be7246e5c8fd5cf133b0127dfa627
ViewMTN: http://monotone.openembedded.org/revision.psp?id=566bc0556b0be7246e5c8fd5cf133b0127dfa627
Files:
1
packages/opie-alarm/opie-alarm/dirdefines.patch
classes/opie.bbclass
packages/opie-alarm/opie-alarm_cvs.bb
packages/opie-brightnessapplet/opie-brightnessapplet.inc
packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
packages/opie-clockapplet/opie-clockapplet.inc
packages/opie-clockapplet/opie-clockapplet_cvs.bb
packages/opie-handwriting/opie-handwriting.inc
packages/opie-handwriting/opie-handwriting_cvs.bb
packages/opie-irdaapplet/opie-irdaapplet.inc
packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
packages/opie-multikey/opie-multikey.inc
packages/opie-multikey/opie-multikey_cvs.bb
packages/opie-multikeyapplet/opie-multikeyapplet.inc
packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
packages/opie-pickboard/opie-pickboard.inc
packages/opie-pickboard/opie-pickboard_cvs.bb
packages/opie-screenshotapplet/opie-screenshotapplet.inc
packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
packages/opie-volumeapplet/opie-volumeapplet.inc
packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
packages/ntp/ntp-4.2.2p3/tickadj.c.patch
packages/ntp/ntp_4.2.2p3.bb
Diffs:
#
# mt diff -r32f3152ef198ae19e34181438504621d6e5c0270 -r566bc0556b0be7246e5c8fd5cf133b0127dfa627
#
#
#
# add_file "packages/opie-alarm/opie-alarm/dirdefines.patch"
# content [18a87ea43ad331d054fcb78c95f6da867a9c7b2a]
#
# patch "classes/opie.bbclass"
# from [441638d80c7d1595e6037940f20b24b8bca48ebd]
# to [3520a2c069712e9db8ce48af55f65b869bd6b9fd]
#
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
# from [aadc0b4fc4280abbdfd3f206d4d8e240fbb48621]
# to [ab53754a45a99c30cb4df8437d42d73aad9d163e]
#
# patch "packages/opie-brightnessapplet/opie-brightnessapplet.inc"
# from [62de16971a1b48a77621ad4114ecde3f3d531152]
# to [15c8e1bdc6e1632784366b90cae5549d39907bee]
#
# patch "packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb"
# from [357dae7d139a82674e61fc590023e5dafda6b4ca]
# to [d0ce0a3066cf0ed6b578bdaa47957e8549a58c50]
#
# patch "packages/opie-clockapplet/opie-clockapplet.inc"
# from [2955c4bdf74243549278ab58f85a0bbe8e312305]
# to [5e613749b1afcf926560f357c8cd3fedd4cd4144]
#
# patch "packages/opie-clockapplet/opie-clockapplet_cvs.bb"
# from [2d71329701cc9d032cf6612fb4c94178275c70fc]
# to [2c069ebdc8d5d4a2da3c6bf31ea1ee857166ccf9]
#
# patch "packages/opie-handwriting/opie-handwriting.inc"
# from [b54050ecba304245cba311e24450b0928f6ecb44]
# to [d8cc03a760e3f477e46b2ca41c2060be51792b02]
#
# patch "packages/opie-handwriting/opie-handwriting_cvs.bb"
# from [3fe5acc760918d2967eb71f26a4a7c08b726f119]
# to [ba4eeb1e18966225dae4917b50f9a972d98130cd]
#
# patch "packages/opie-irdaapplet/opie-irdaapplet.inc"
# from [ee8b7dacb81e56a612b5c4aa8225ae8524b8e71d]
# to [06b5615d0710b0afba000b7a9d22c3bfbc219127]
#
# patch "packages/opie-irdaapplet/opie-irdaapplet_cvs.bb"
# from [1e718aff97398e878d897b20f3aeaaa65c1770a3]
# to [fd382bab0b18b6a59dcc5af4f3670033351e8f98]
#
# patch "packages/opie-multikey/opie-multikey.inc"
# from [2dad10b917e9192a7bdd78f73d7250ba8c38c55d]
# to [e11157e9e56aa7d2276ed24630b572e8243416f0]
#
# patch "packages/opie-multikey/opie-multikey_cvs.bb"
# from [eeeb85a14c02e906b881fe457e35e8b763c7a532]
# to [b7e2ee6d6fca8ec45a55a26fbf1c26212279c1bd]
#
# patch "packages/opie-multikeyapplet/opie-multikeyapplet.inc"
# from [e70415e140b696bdb5ca4da6ed54c385d2b32592]
# to [09bb10c4b09349989c8d3c58b53daea34b79775e]
#
# patch "packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb"
# from [a21ecb9655edf8c806e731b7b68481a0de0b8f03]
# to [f862114a2d0ebd4cf8a3f9209be2d1b27e1869e5]
#
# patch "packages/opie-pcmciaapplet/opie-pcmciaapplet.inc"
# from [4eb576754d7724b7e10d0815d6241014f715fffc]
# to [c4fb00be47680dfd9c107f36dcdf6cc0d8251993]
#
# patch "packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb"
# from [26537db0865959e51a2d042dbbdbe1fc065687fc]
# to [30d3e68e5d94babaaef208cef2e5d2cd78c039d9]
#
# patch "packages/opie-pickboard/opie-pickboard.inc"
# from [6c3348bebba171cf6a821b2dc53aee06cabc933e]
# to [a1dda378c833453ad71b6ecfe8526eac4b5b22b2]
#
# patch "packages/opie-pickboard/opie-pickboard_cvs.bb"
# from [bf9f080733292ca5b8f2f33b0b1e343d77eea012]
# to [e496e63e15c6604e194971f17897e6bc661e48cd]
#
# patch "packages/opie-screenshotapplet/opie-screenshotapplet.inc"
# from [448165938e51d35a48d3ee57b742f724edd8db0e]
# to [7fdcbc0fdca9fdcbf8e7ab9a3e4b06da90f793c1]
#
# patch "packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb"
# from [ba177df0b9d2b509edc102817d8617a5372629d9]
# to [abc18809d885ca6f6a712a784ffc9497b88136de]
#
# patch "packages/opie-volumeapplet/opie-volumeapplet.inc"
# from [b3dd53cdcf8f7f06ed2a95df93d5f4703a146f34]
# to [304c790006e6607adce30c1edce2ddf982372623]
#
# patch "packages/opie-volumeapplet/opie-volumeapplet_cvs.bb"
# from [01a7fc1c3a3b0b8094a0379a6ff1190a6fc4fb8e]
# to [2880176909b492f80b4ccf3a92bcf1482bfb1862]
#
============================================================
--- packages/opie-alarm/opie-alarm/dirdefines.patch 18a87ea43ad331d054fcb78c95f6da867a9c7b2a
+++ packages/opie-alarm/opie-alarm/dirdefines.patch 18a87ea43ad331d054fcb78c95f6da867a9c7b2a
@@ -0,0 +1,21 @@
+diff --git a/opiealarm.c b/opiealarm.c
+index 422865c..b948ef2 100644
+--- a/opiealarm.c
++++ b/opiealarm.c
+@@ -367,13 +367,13 @@ int resume ( int resuspend )
+
+ setenv ( "LOGNAME", "root", 1 );
+ setenv ( "HOME", "/root", 1 );
+- setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 );
+- setenv ( "QTDIR", "/opt/QtPalmtop", 1 );
++ setenv ( "LD_LIBRARY_PATH", OPIE_LIBDIR, 1 );
++ setenv ( "QTDIR", OPIE_QTDIR, 1 );
+
+ remove_pidfile ( );
+
+ // no need for system() since this process is no longer useful anyway
+- execv ( "/opt/QtPalmtop/bin/qcop", argv );
++ execv ( OPIE_BINDIR "/qcop", argv );
+
+ perror ( "exec for qcop failed" );
+ return 5;
============================================================
--- classes/opie.bbclass 441638d80c7d1595e6037940f20b24b8bca48ebd
+++ classes/opie.bbclass 3520a2c069712e9db8ce48af55f65b869bd6b9fd
@@ -21,7 +21,8 @@ DEPENDS_prepend = "${@["libopie2 ", ""][
# to be consistent, put all targets into workdir
# NOTE: leave one space at the end, other files are expecting that
-EXTRA_QMAKEVARS_POST += "DESTDIR=${S} "
+EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
+EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
# Opie standard TAG value
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
============================================================
--- packages/opie-alarm/opie-alarm_cvs.bb aadc0b4fc4280abbdfd3f206d4d8e240fbb48621
+++ packages/opie-alarm/opie-alarm_cvs.bb ab53754a45a99c30cb4df8437d42d73aad9d163e
@@ -1,7 +1,8 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r2.1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
+ file://01opiealarm \
+ file://dirdefines.patch;patch=1 "
- file://01opiealarm "
============================================================
--- packages/opie-brightnessapplet/opie-brightnessapplet.inc 62de16971a1b48a77621ad4114ecde3f3d531152
+++ packages/opie-brightnessapplet/opie-brightnessapplet.inc 15c8e1bdc6e1632784366b90cae5549d39907bee
@@ -17,7 +17,7 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ ${bindir}/qcop QPE/TaskBar "reloadApplets()"
else
exit 0
fi
@@ -26,6 +26,6 @@ if [ -n "$D" ]; then exit 1; fi
pkg_postrm() {
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
}
============================================================
--- packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb 357dae7d139a82674e61fc590023e5dafda6b4ca
+++ packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb d0ce0a3066cf0ed6b578bdaa47957e8549a58c50
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/brightnessapplet \
${HANDHELDS_CVS};module=opie/pics"
============================================================
--- packages/opie-clockapplet/opie-clockapplet.inc 2955c4bdf74243549278ab58f85a0bbe8e312305
+++ packages/opie-clockapplet/opie-clockapplet.inc 5e613749b1afcf926560f357c8cd3fedd4cd4144
@@ -13,13 +13,13 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ ${bindir}/qcop QPE/TaskBar "reloadApplets()"
fi
}
pkg_postrm() {
#!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
if [ -n "$D" ]; then false; fi
}
============================================================
--- packages/opie-clockapplet/opie-clockapplet_cvs.bb 2d71329701cc9d032cf6612fb4c94178275c70fc
+++ packages/opie-clockapplet/opie-clockapplet_cvs.bb 2c069ebdc8d5d4a2da3c6bf31ea1ee857166ccf9
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \
${HANDHELDS_CVS};module=opie/pics \
============================================================
--- packages/opie-handwriting/opie-handwriting.inc b54050ecba304245cba311e24450b0928f6ecb44
+++ packages/opie-handwriting/opie-handwriting.inc d8cc03a760e3f477e46b2ca41c2060be51792b02
@@ -1,9 +1,8 @@ APPNAME = "qhandwriting"
DESCRIPTION = "Handwriting input method"
SECTION = "opie/inputmethods"
PRIORITY = "optional"
LICENSE = "GPL"
APPNAME = "qhandwriting"
-PR = "r1"
S = "${WORKDIR}/handwriting"
@@ -14,7 +13,7 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+ ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
else
exit 0
fi
@@ -24,7 +23,7 @@ if [ -n "$D" ]; then exit 1; fi
pkg_postrm() {
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
}
# FILES plugins/inputmethods/libqhandwriting.so*
============================================================
--- packages/opie-handwriting/opie-handwriting_cvs.bb 3fe5acc760918d2967eb71f26a4a7c08b726f119
+++ packages/opie-handwriting/opie-handwriting_cvs.bb ba4eeb1e18966225dae4917b50f9a972d98130cd
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r2"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/handwriting \
${HANDHELDS_CVS};module=opie/etc/qimpen"
============================================================
--- packages/opie-irdaapplet/opie-irdaapplet.inc ee8b7dacb81e56a612b5c4aa8225ae8524b8e71d
+++ packages/opie-irdaapplet/opie-irdaapplet.inc 06b5615d0710b0afba000b7a9d22c3bfbc219127
@@ -13,13 +13,13 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ ${bindir}/qcop QPE/TaskBar "reloadApplets()"
fi
}
pkg_postrm() {
#!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
if [ -n "$D" ]; then false; fi
}
============================================================
--- packages/opie-irdaapplet/opie-irdaapplet_cvs.bb 1e718aff97398e878d897b20f3aeaaa65c1770a3
+++ packages/opie-irdaapplet/opie-irdaapplet_cvs.bb fd382bab0b18b6a59dcc5af4f3670033351e8f98
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = r2
+PR = r3
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \
${HANDHELDS_CVS};module=opie/pics \
============================================================
--- packages/opie-multikey/opie-multikey.inc 2dad10b917e9192a7bdd78f73d7250ba8c38c55d
+++ packages/opie-multikey/opie-multikey.inc e11157e9e56aa7d2276ed24630b572e8243416f0
@@ -15,7 +15,7 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+ ${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
else
exit 0
fi
@@ -24,7 +24,7 @@ if [ -n "$D" ]; then exit 1; fi
pkg_postrm() {
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
}
# FILES plugins/inputmethods/libqmultikey.so* share/multikey/*
============================================================
--- packages/opie-multikey/opie-multikey_cvs.bb eeeb85a14c02e906b881fe457e35e8b763c7a532
+++ packages/opie-multikey/opie-multikey_cvs.bb b7e2ee6d6fca8ec45a55a26fbf1c26212279c1bd
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
${HANDHELDS_CVS};module=opie/share \
============================================================
--- packages/opie-multikeyapplet/opie-multikeyapplet.inc e70415e140b696bdb5ca4da6ed54c385d2b32592
+++ packages/opie-multikeyapplet/opie-multikeyapplet.inc 09bb10c4b09349989c8d3c58b53daea34b79775e
@@ -13,13 +13,13 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ ${bindir}/qcop QPE/TaskBar "reloadApplets()"
fi
}
pkg_postrm() {
#!/bin/sh
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
if [ -n "$D" ]; then false; fi
}
============================================================
--- packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb a21ecb9655edf8c806e731b7b68481a0de0b8f03
+++ packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb f862114a2d0ebd4cf8a3f9209be2d1b27e1869e5
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/multikeyapplet \
${HANDHELDS_CVS};module=opie/apps"
============================================================
--- packages/opie-pcmciaapplet/opie-pcmciaapplet.inc 4eb576754d7724b7e10d0815d6241014f715fffc
+++ packages/opie-pcmciaapplet/opie-pcmciaapplet.inc c4fb00be47680dfd9c107f36dcdf6cc0d8251993
@@ -12,7 +12,7 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ ${bindir}/qcop QPE/TaskBar "reloadApplets()"
else
exit 0
fi
@@ -21,7 +21,7 @@ if [ -n "$D" ]; then exit 1; fi
pkg_postrm() {
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
}
do_install() {
============================================================
--- packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb 26537db0865959e51a2d042dbbdbe1fc065687fc
+++ packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb 30d3e68e5d94babaaef208cef2e5d2cd78c039d9
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/pcmcia \
${HANDHELDS_CVS};module=opie/pics"
============================================================
--- packages/opie-pickboard/opie-pickboard.inc 6c3348bebba171cf6a821b2dc53aee06cabc933e
+++ packages/opie-pickboard/opie-pickboard.inc a1dda378c833453ad71b6ecfe8526eac4b5b22b2
@@ -12,7 +12,7 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ ${bindir}/qcop QPE/TaskBar "reloadApplets()"
else
exit 0
fi
@@ -21,7 +21,7 @@ if [ -n "$D" ]; then exit 1; fi
pkg_postrm() {
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"
+${bindir}/qcop QPE/TaskBar "reloadInputMethods()"
}
============================================================
--- packages/opie-pickboard/opie-pickboard_cvs.bb bf9f080733292ca5b8f2f33b0b1e343d77eea012
+++ packages/opie-pickboard/opie-pickboard_cvs.bb e496e63e15c6604e194971f17897e6bc661e48cd
@@ -1,5 +1,6 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/pickboard"
============================================================
--- packages/opie-screenshotapplet/opie-screenshotapplet.inc 448165938e51d35a48d3ee57b742f724edd8db0e
+++ packages/opie-screenshotapplet/opie-screenshotapplet.inc 7fdcbc0fdca9fdcbf8e7ab9a3e4b06da90f793c1
@@ -14,14 +14,14 @@ if pidof -s qpe >/dev/null; then
#!/bin/sh
if [ -n "$D" ]; then exit 1; fi
if pidof -s qpe >/dev/null; then
- /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ ${bindir}/qcop QPE/TaskBar "reloadApplets()"
fi
}
pkg_postrm() {
#!/bin/sh
if [ -n "$D" ]; then false; fi
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+${bindir}/qcop QPE/TaskBar "reloadApplets()"
}
# FILES plugins/applets/libscreenshotapplet.so*
============================================================
--- packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb ba177df0%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r7ec9615281babcb1bd33e3299ca47a3cd2e4c8f7 -r566bc0556b0be7246e5c8fd5cf133b0127dfa627
#
#
#
# add_file "packages/ntp/ntp-4.2.2p3/tickadj.c.patch"
# content [494ebb057688fef34bcf767bad768b5563fe8cfe]
#
# patch "packages/ntp/ntp_4.2.2p3.bb"
# from [6101494a76d050c7b395badf7ba8e05640523149]
# to [18d53e60ac76e13f601d6679f6b944f33aba70c4]
#
============================================================
--- packages/ntp/ntp-4.2.2p3/tickadj.c.patch 494ebb057688fef34bcf767bad768b5563fe8cfe
+++ packages/ntp/ntp-4.2.2p3/tickadj.c.patch 494ebb057688fef34bcf767bad768b5563fe8cfe
@@ -0,0 +1,32 @@
+Index: ntp-4.2.2p3-r0/ntp-4.2.2p3/util/tickadj.c
+===================================================================
+--- ntp-4.2.2p3/util/tickadj.c 2004-02-25 06:58:33.000000000 +0100
++++ ntp-4.2.2p3/util/tickadj.c 2007-07-07 01:00:54.000000000 +0200
+@@ -21,7 +21,8 @@
+ # include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+
+-#ifdef HAVE___ADJTIMEX /* Linux */
++/* proper handling here has been moved to upstream ntp bugzilla */
++#ifdef linux
+
+ #include <sys/timex.h>
+ struct timex txc;
+@@ -91,7 +92,7 @@
+ }
+
+ if (!errflg) {
+- if (__adjtimex(&txc) < 0)
++ if (adjtimex(&txc) < 0)
+ perror("adjtimex");
+ else if (!quiet)
+ printf("tick = %ld\ntick_adj = %d\n",
+@@ -146,7 +147,7 @@
+ #endif
+ }
+
+- if (__adjtimex(&txc) < 0)
++ if (adjtimex(&txc) < 0)
+ {
+ perror("adjtimex");
+ }
============================================================
--- packages/ntp/ntp_4.2.2p3.bb 6101494a76d050c7b395badf7ba8e05640523149
+++ packages/ntp/ntp_4.2.2p3.bb 18d53e60ac76e13f601d6679f6b944f33aba70c4
@@ -1,7 +1,8 @@ SRC_URI = "http://www.eecis.udel.edu/~nt
require ntp.inc
SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \
file://ipv6only-workaround.patch;patch=1 \
+ file://tickadj.c.patch;patch=1 \
file://ntpd \
file://ntp.conf \
file://ntpdate"
More information about the Openembedded-commits
mailing list