qpealarmclock: updated to 1.0.9 and added it's clock applet - close #536

10 files changed, 209 insertions, 122 deletions

diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch b/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch
deleted file mode 100644
index bd69318a5c..0000000000
--- a/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- qpealarmclock_V1.0.4/AlarmDetails.h~fix-compile
-+++ qpealarmclock_V1.0.4/AlarmDetails.h
-@@ -64,25 +64,8 @@
-        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 AlarmDetails::Weekdays weekdaysGroups[] =
--    {
--      AlarmDetails::WEEKDAYS_NONE,
--      AlarmDetails::WEEKDAYS_ALL,
--      AlarmDetails::WEEKDAYS_WORKDAYS,
--      AlarmDetails::WEEKDAYS_WEEKEND,
--      AlarmDetails::WEEKDAYS_IGNORE
--    };
-+    static const Weekdays flags[];
-+    static const AlarmDetails::Weekdays weekdaysGroups[];
-   
-     AlarmDetails(int alarmNumberInit);
-     ~AlarmDetails();
---- qpealarmclock_V1.0.4/AlarmDetails.cpp~fix-compile
-+++ qpealarmclock_V1.0.4/AlarmDetails.cpp
-@@ -3,22 +3,39 @@
-  *
-  * Copyright (C) 2002 Dafydd Walters <dwalters@users.sourceforge.net>
-  * Modified by Anton Maslovsky <my-zaurus@narod.ru> 2003/01/28
-- * 
-+ *
-  * This program may be modified or redistributed under the terms of the GNU
-- * General Public License (GPL), version 2 or later. A copy of the GNU GPL 
-- * should have accompanied the source code of this program. If not, please 
-+ * General Public License (GPL), version 2 or later. A copy of the GNU GPL
-+ * should have accompanied the source code of this program. If not, please
-  * write to the Free Software Foundation Inc., 59 Temple Place - Suite 330,
-  * Boston, MA 02111-1307, USA.
-  *
-  * This program is distributed without any warranty.
-- */ 
-+ */
- 
- #include "AlarmDetails.h"
- #include <qpe/config.h>
- #include <qpe/alarmserver.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)
- {
diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch b/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch
deleted file mode 100644
index 82e8c350ab..0000000000
--- a/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Nur in qpealarmclock_V1.0.4: AlarmDetails.h~.
-diff -ur qpealarmclock_V1.0.4.orig/qpealarmclock.desktop qpealarmclock_V1.0.4/qpealarmclock.desktop
---- qpealarmclock_V1.0.4.orig/qpealarmclock.desktop	2004-06-17 00:35:48.000000000 +0200
-+++ qpealarmclock_V1.0.4/qpealarmclock.desktop	2004-06-17 00:36:13.000000000 +0200
-@@ -3,7 +3,7 @@
- Comment[de]=Ein Wecker
- Comment[ru]=Будильник
- Exec=qpealarmclock
--Icon=QpeAlarmClock
-+Icon=qpealarmclock/QpeAlarmClock
- Name=Alarm Clock
- Name[de]=Wecker
- Type=Application
diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/.mtn2git_empty b/packages/qpealarmclock/qpealarmclock-1.0.9/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qpealarmclock/qpealarmclock-1.0.4/.mtn2git_empty
+++ b/packages/qpealarmclock/qpealarmclock-1.0.9/.mtn2git_empty
diff --git a/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch b/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch
new file mode 100644
index 0000000000..a39c91d796
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch
@@ -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)
+ {
diff --git a/packages/qpealarmclock/qpealarmclock_1.0.4.bb b/packages/qpealarmclock/qpealarmclock_1.0.4.bb
deleted file mode 100644
index 19b8532098..0000000000
--- a/packages/qpealarmclock/qpealarmclock_1.0.4.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Alarm Clock"
-SECTION = "opie/applications"
-PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "GPL"
-AUTHOR = "Dafydd Walters"
-HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/applications-AlarmClock.html"
-
-SRC_URI = "http://handhelds.org/~zecke/oe_packages/qpealarmclock_V1.0.4.tar.gz \
-	   file://qpealarm.patch;patch=1 \
-	   file://fix-compile.patch;patch=1 "
-
-S = "${WORKDIR}/qpealarmclock_V${PV}"
-PR = "r1"
-
-APPNAME = "qpealarmclock"
-APPTYPE = "binary"
-APPDESKTOP = "${S}"
-
-do_install () {
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	
-}
-
-inherit opie
diff --git a/packages/qpealarmclock/qpealarmclock_1.0.9.bb b/packages/qpealarmclock/qpealarmclock_1.0.9.bb
new file mode 100644
index 0000000000..597c43fbb0
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclock_1.0.9.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Alarm Clock"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Patrik Gfeller (gfellerpatrik@gmx.net)"
+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
+}
diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty
diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch
new file mode 100644
index 0000000000..a39c91d796
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch
@@ -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)
+ {
diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz
new file mode 100644
index 0000000000..4779ce5945
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz
diff --git a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
new file mode 100644
index 0000000000..33dabde5e9
--- /dev/null
+++ b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Alarm Clock Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+MAINTAINER = "Patrik Gfeller (gfellerpatrik@gmx.net)"
+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
+}