Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fe6943d54ede5eaf4d025d7018ed946e90925397)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fe6943d54ede5eaf4d025d7018ed946e90925397)
  • Date: Tue, 20 Oct 2015 06:49:37 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnome2-apps/osmo/CONFIGURE | 2
gnome2-apps/osmo/DEPENDS | 7 ++
gnome2-apps/osmo/DETAILS | 1
gnome2-apps/osmo/HISTORY | 10 +++
gnome2-apps/osmo/PRE_BUILD | 4 +
gnome2-apps/osmo/warning.patch | 107
+++++++++++++++++++++++++++++++++++++++++
6 files changed, 129 insertions(+), 2 deletions(-)

New commits:
commit fe6943d54ede5eaf4d025d7018ed946e90925397
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

osmo: added official patch to fix alarm warning

diff --git a/gnome2-apps/osmo/CONFIGURE b/gnome2-apps/osmo/CONFIGURE
index 356757e..4db054e 100755
--- a/gnome2-apps/osmo/CONFIGURE
+++ b/gnome2-apps/osmo/CONFIGURE
@@ -10,7 +10,7 @@ for o in OSMO_CONTACTS OSMO_TASKS OSMO_NOTES; do
fi
done &&

-config_query_option OSMO_OPTS "Enable Contacts module" y \
+config_query_option OSMO_OPTS "Enable Contacts module (requires HTML
renderer)" y \
"--with-contacts" \
"--without-contacts" &&

diff --git a/gnome2-apps/osmo/DEPENDS b/gnome2-apps/osmo/DEPENDS
index b52e258..d226d6c 100755
--- a/gnome2-apps/osmo/DEPENDS
+++ b/gnome2-apps/osmo/DEPENDS
@@ -13,7 +13,12 @@ fi &&

optional_depends libical "" "" "for iCalendar support" &&
optional_depends gtkspell "" "" "for spell-checking support" &&
-optional_depends webkitgtk "" "" "for HTML rendering support" &&
+
+if list_find "$OSMO_OPTS" "--with-contacts"; then
+ depends webkitgtk
+else
+ optional_depends webkitgtk "" "" "for HTML rendering support"
+fi &&

if list_find "$OSMO_OPTS" "--with-tasks"; then
optional_depends libnotify "" "" "for task notification support"
diff --git a/gnome2-apps/osmo/DETAILS b/gnome2-apps/osmo/DETAILS
index c7697f5..8417169 100755
--- a/gnome2-apps/osmo/DETAILS
+++ b/gnome2-apps/osmo/DETAILS
@@ -1,5 +1,6 @@
SPELL=osmo
VERSION=0.2.14
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-apps/osmo/HISTORY b/gnome2-apps/osmo/HISTORY
index fb3f32f..36bb494 100644
--- a/gnome2-apps/osmo/HISTORY
+++ b/gnome2-apps/osmo/HISTORY
@@ -1,3 +1,13 @@
+2015-10-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * warning.patch: replaced with official patch
+
+2015-10-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * DEPENDS, CONFIGURE: Contacts module requires webkitgtk
+ * PRE_BUILD: added, to apply the patch
+ * warning.patch: added, to restore alarm warning functionality
+
2015-10-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.14; quoting paths
* CONFIGURE: added printing flags; switch to OSMO_OPTS
diff --git a/gnome2-apps/osmo/PRE_BUILD b/gnome2-apps/osmo/PRE_BUILD
new file mode 100755
index 0000000..77774d6
--- /dev/null
+++ b/gnome2-apps/osmo/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p0 < "${SPELL_DIRECTORY}/warning.patch"
diff --git a/gnome2-apps/osmo/warning.patch b/gnome2-apps/osmo/warning.patch
new file mode 100644
index 0000000..d2e6388
--- /dev/null
+++ b/gnome2-apps/osmo/warning.patch
@@ -0,0 +1,107 @@
+--- src/check_events.c.orig 2015-08-08 10:10:12.000000000 +0300
++++ src/check_events.c 2015-10-20 09:34:34.220984261 +0300
+@@ -341,60 +341,60 @@
+ #endif /* HAVE_LIBNOTIFY */
+
+
/*------------------------------------------------------------------------------*/
++static gboolean
++is_show_warning(TASK_ITEM *item, GUI *appGUI) {
++ if (item->warning_days > 0 || item->warning_time > 0) {
++ guint32 current_date, warning_date;
++ gint current_time, warning_time;
++ current_date = utl_date_get_current_julian();
++ current_time = utl_time_get_current_seconds();
++ utl_subtract_from_date(item->due_date_julian, item->due_time,
++ item->warning_days, item->warning_time * 60, &warning_date,
&warning_time);
++
++ if (warning_date < current_date + (warning_time <= current_time) ?
1 : 0) {
++ if (item->repeat == TRUE && item->offline_ignore == TRUE) {
++ if (warning_date < appGUI->run_date + (warning_time <
appGUI->run_time) ? 1 : 0) {
++ return FALSE;
++ }
++ }
+
+-gboolean
++ return TRUE;
++ }
++ }
++ return FALSE;
++}
++
++static gboolean
++is_show_notification(TASK_ITEM *item) {
++ return utl_date_time_in_the_past_js (item->due_date_julian,
item->due_time);
++}
++/*------------------------------------------------------------------------------*/
++
++static gboolean
+ tsk_show_warning_notification (TASK_ITEM *item, GUI *appGUI)
+ {
+-guint32 current_date, warning_date;
+-gint current_time, warning_time;
+-
+ if (tsk_check_notification_id (item->id, NOTIFY_WARNING, appGUI))
+ return FALSE;
+-
+- if (item->warning_days > 0 || item->warning_time > 0) {
+-
+- current_date = utl_date_get_current_julian ();
+- current_time = utl_time_get_current_seconds ();
+- utl_subtract_from_date (item->due_date_julian, item->due_time,
+- item->warning_days,
item->warning_time * 60, &warning_date, &warning_time);
+-
+- if (warning_date < current_date + (warning_time <=
current_time) ? 1 : 0) {
+-
+- if (item->repeat == TRUE && item->offline_ignore ==
TRUE) {
+- if (warning_date < appGUI->run_date +
(warning_time < appGUI->run_time) ? 1 : 0) {
+- return FALSE;
+- }
+- }
+-
+- return TRUE;
+- }
+- }
+-
+- return FALSE;
++ return is_show_warning(item, appGUI);
+ }
+
+
/*------------------------------------------------------------------------------*/
+
+-gboolean
++static gboolean
+ tsk_show_task_notification (TASK_ITEM *item, GUI *appGUI)
+ {
+ if (item->due_date_julian == 0 || tsk_check_notification_id
(item->id, NOTIFY_ALARM, appGUI))
+ return FALSE;
+-
+- if (utl_date_time_in_the_past_js (item->due_date_julian,
item->due_time)) {
+- return TRUE;
+- }
+-
+- return FALSE;
++ return is_show_notification(item);
+ }
+
+
/*------------------------------------------------------------------------------*/
+
+-gboolean
+-tsk_delete_ntask_notification(TASK_ITEM *item) {
++static gboolean
++tsk_delete_ntask_notification(TASK_ITEM *item, GUI *appGUI) {
+ if(item->done) {
+ return TRUE;
+- } else if(!utl_date_time_in_the_past_js(item->due_date_julian,
item->due_time)) {
++ } else if(!is_show_notification(item) && !is_show_warning(item,
appGUI)) {
+ return TRUE;
+ }
+ return FALSE;
+@@ -418,7 +418,7 @@
+ return;
+ }
+
+- if (tsk_delete_ntask_notification(item)) {
++ if (tsk_delete_ntask_notification(item, appGUI)) {
+ notify_task_delete(item->id, appGUI);
+ } else if (item->active == TRUE && item->done == FALSE) {
+



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fe6943d54ede5eaf4d025d7018ed946e90925397), Vlad Glagolev, 10/20/2015

Archive powered by MHonArc 2.6.24.

Top of Page