[oe-commits] org.oe.oz354x qpealarmclock(applet): updated to 1.0.9 - close #1576
hrw commit
openembedded-commits at lists.openembedded.org
Wed Nov 15 11:55:08 UTC 2006
qpealarmclock(applet): updated to 1.0.9 - close #1576
Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: eddaf353e8a8df5ab45400b86d55379dab4a4b49
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eddaf353e8a8df5ab45400b86d55379dab4a4b49
Files:
1
packages/qpealarmclock/qpealarmclock-1.0.4
packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch
packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch
packages/qpealarmclock/qpealarmclock_1.0.4.bb
packages/qpealarmclock/qpealarmclock-1.0.9
packages/qpealarmclock/qpealarmclockapplet-1.0.9
packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch
packages/qpealarmclock/qpealarmclock_1.0.9.bb
packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch
packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz
packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
mtn:manual_merge
true
Diffs:
#
# mt diff -ra53884cd04742dcd7d6af7c05d6d700f91b77833 -reddaf353e8a8df5ab45400b86d55379dab4a4b49
#
#
#
# delete "packages/qpealarmclock/qpealarmclock-1.0.4"
#
# delete "packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch"
#
# delete "packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch"
#
# delete "packages/qpealarmclock/qpealarmclock_1.0.4.bb"
#
# add_dir "packages/qpealarmclock/qpealarmclock-1.0.9"
#
# add_dir "packages/qpealarmclock/qpealarmclockapplet-1.0.9"
#
# add_file "packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch"
# content [a1468d0fae9b13e41687856fe8e8f4baa4726351]
#
# add_file "packages/qpealarmclock/qpealarmclock_1.0.9.bb"
# content [2f888bf557c439ae95e747ede530bd9373bf3b02]
#
# add_file "packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch"
# content [a1468d0fae9b13e41687856fe8e8f4baa4726351]
#
# add_file "packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz"
# content [8c574ddb1436394c763e60dc1fb706e2234016bf]
#
# add_file "packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb"
# content [d910e0e2dcccae0ecb7b5051d559a3ec3212558c]
#
# set "packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch a1468d0fae9b13e41687856fe8e8f4baa4726351
+++ packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch a1468d0fae9b13e41687856fe8e8f4baa4726351
@@ -0,0 +1,67 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qpealarmclock/AlarmDetails.h~fix_compile
++++ qpealarmclock/AlarmDetails.h
+@@ -63,26 +63,9 @@
+
+ WEEKDAYS_IGNORE = 0xFF // do not change any days
+ };
+-
+- static const Weekdays flags[] =
+- {
+- WEEKDAYS_MONDAY,
+- WEEKDAYS_TUESDAY,
+- WEEKDAYS_WEDNSDAY,
+- WEEKDAYS_THURSDAY,
+- WEEKDAYS_FRIDAY,
+- WEEKDAYS_SATURDAY,
+- WEEKDAYS_SUNDAY
+- };
+
+- static const Weekdays weekdaysGroups[] =
+- {
+- WEEKDAYS_NONE,
+- WEEKDAYS_ALL,
+- WEEKDAYS_WORKDAYS,
+- WEEKDAYS_WEEKEND,
+- WEEKDAYS_IGNORE
+- };
++ static const Weekdays flags[];
++ static const AlarmDetails::Weekdays weekdaysGroups[];
+
+ AlarmDetails(int alarmNumberInit);
+ ~AlarmDetails();
+
+--- qpealarmclock/AlarmDetails.cpp~fix-compile-2
++++ qpealarmclock/AlarmDetails.cpp
+@@ -22,8 +22,25 @@
+ #include <qimage.h>
+ #include <qpixmap.h>
+
+-const AlarmDetails::Weekdays AlarmDetails::flags[];
+-const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[];
++const AlarmDetails::Weekdays AlarmDetails::flags[] =
++{
++ WEEKDAYS_MONDAY,
++ WEEKDAYS_TUESDAY,
++ WEEKDAYS_WEDNSDAY,
++ WEEKDAYS_THURSDAY,
++ WEEKDAYS_FRIDAY,
++ WEEKDAYS_SATURDAY,
++ WEEKDAYS_SUNDAY
++};
++
++const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[] =
++{
++ AlarmDetails::WEEKDAYS_NONE,
++ AlarmDetails::WEEKDAYS_ALL,
++ AlarmDetails::WEEKDAYS_WORKDAYS,
++ AlarmDetails::WEEKDAYS_WEEKEND,
++ AlarmDetails::WEEKDAYS_IGNORE
++};
+
+ AlarmDetails::AlarmDetails(int alarmNumberInit) : alarmNumber(alarmNumberInit)
+ {
============================================================
--- packages/qpealarmclock/qpealarmclock_1.0.9.bb 2f888bf557c439ae95e747ede530bd9373bf3b02
+++ packages/qpealarmclock/qpealarmclock_1.0.9.bb 2f888bf557c439ae95e747ede530bd9373bf3b02
@@ -0,0 +1,32 @@
+DESCRIPTION = "Alarm Clock"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "Dafydd Walters & Anton Maslovsky"
+HOMEPAGE = "http://my-zaurus.narod.ru/"
+
+APPNAME = "qpealarmclock"
+APPTYPE = "binary"
+APPDESKTOP = "${S}/dist/opt/QtPalmtop/apps/Applications"
+
+SRC_URI = "http://my-zaurus.narod.ru/downloads/qpealarmclock-1.0.9.tar.gz \
+ file://fix-compile.patch;patch=1 "
+
+S = "${WORKDIR}/qpealarmclock"
+
+inherit palmtop
+
+do_install () {
+# create dirs
+ install -d ${D}${palmtopdir}/bin
+ install -d ${D}${palmtopdir}/apps/Applications
+ install -d ${D}${palmtopdir}/pics/qpealarmclock
+# move files
+ install -m 644 ${S}/dist/opt/QtPalmtop/apps/Applications/qpealarmclock.desktop ${D}${palmtopdir}/apps/Applications/qpealarmclock.desktop
+ install -m 755 ${S}/dist/opt/QtPalmtop/bin/qpealarmclock ${D}${palmtopdir}/bin/qpealarmclock
+ install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/frequency.png ${D}${palmtopdir}/pics/qpealarmclock/frequency.png
+ install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/led.png ${D}${palmtopdir}/pics/qpealarmclock/led.png
+ install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/QpeAlarmClock.png ${D}${palmtopdir}/pics/qpealarmclock/QpeAlarmClock.png
+ install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/smallalarm.png ${D}${palmtopdir}/pics/qpealarmclock/smallalarm.png
+ install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/sound.png ${D}${palmtopdir}/pics/qpealarmclock/sound.png
+}
============================================================
--- packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch a1468d0fae9b13e41687856fe8e8f4baa4726351
+++ packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch a1468d0fae9b13e41687856fe8e8f4baa4726351
@@ -0,0 +1,67 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qpealarmclock/AlarmDetails.h~fix_compile
++++ qpealarmclock/AlarmDetails.h
+@@ -63,26 +63,9 @@
+
+ WEEKDAYS_IGNORE = 0xFF // do not change any days
+ };
+-
+- static const Weekdays flags[] =
+- {
+- WEEKDAYS_MONDAY,
+- WEEKDAYS_TUESDAY,
+- WEEKDAYS_WEDNSDAY,
+- WEEKDAYS_THURSDAY,
+- WEEKDAYS_FRIDAY,
+- WEEKDAYS_SATURDAY,
+- WEEKDAYS_SUNDAY
+- };
+
+- static const Weekdays weekdaysGroups[] =
+- {
+- WEEKDAYS_NONE,
+- WEEKDAYS_ALL,
+- WEEKDAYS_WORKDAYS,
+- WEEKDAYS_WEEKEND,
+- WEEKDAYS_IGNORE
+- };
++ static const Weekdays flags[];
++ static const AlarmDetails::Weekdays weekdaysGroups[];
+
+ AlarmDetails(int alarmNumberInit);
+ ~AlarmDetails();
+
+--- qpealarmclock/AlarmDetails.cpp~fix-compile-2
++++ qpealarmclock/AlarmDetails.cpp
+@@ -22,8 +22,25 @@
+ #include <qimage.h>
+ #include <qpixmap.h>
+
+-const AlarmDetails::Weekdays AlarmDetails::flags[];
+-const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[];
++const AlarmDetails::Weekdays AlarmDetails::flags[] =
++{
++ WEEKDAYS_MONDAY,
++ WEEKDAYS_TUESDAY,
++ WEEKDAYS_WEDNSDAY,
++ WEEKDAYS_THURSDAY,
++ WEEKDAYS_FRIDAY,
++ WEEKDAYS_SATURDAY,
++ WEEKDAYS_SUNDAY
++};
++
++const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[] =
++{
++ AlarmDetails::WEEKDAYS_NONE,
++ AlarmDetails::WEEKDAYS_ALL,
++ AlarmDetails::WEEKDAYS_WORKDAYS,
++ AlarmDetails::WEEKDAYS_WEEKEND,
++ AlarmDetails::WEEKDAYS_IGNORE
++};
+
+ AlarmDetails::AlarmDetails(int alarmNumberInit) : alarmNumber(alarmNumberInit)
+ {
============================================================
# packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz is binary
============================================================
--- packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb d910e0e2dcccae0ecb7b5051d559a3ec3212558c
+++ packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb d910e0e2dcccae0ecb7b5051d559a3ec3212558c
@@ -0,0 +1,41 @@
+DESCRIPTION = "Alarm Clock Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "Anton Maslovsky"
+HOMEPAGE = "http://my-zaurus.narod.ru/"
+RDEPENDS = "qpealarmclock"
+RCONFLICTS = "opie-clockapplet"
+RREPLACES = "opie-clockapplet"
+
+APPNAME = "qpealarmclockapplet"
+APPTYPE = "binary"
+
+SRC_URI = "http://my-zaurus.narod.ru/downloads/clockapplet.tar.gz \
+ file://missing-files.tar.gz \
+ file://fix-compile.patch;patch=1 "
+
+S = "${WORKDIR}/clockapplet"
+
+inherit palmtop
+
+pkg_postinst() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+if pidof -s qpe >/dev/null; then
+ /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
+
+do_install () {
+# create dirs
+ install -d ${D}${palmtopdir}/plugins/applets
+# libs
+ oe_libinstall -so libclockapplet ${D}${palmtopdir}/plugins/applets
+}
More information about the Openembedded-commits
mailing list