Skip to Content.
Sympa Menu

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

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 (5465ddd6bbfddbe314d6dd0045c384ac4d819c4e)
  • Date: Mon, 18 Jul 2022 03:50:33 +0000

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

utils/gsimplecal/DETAILS | 4 +--
utils/gsimplecal/HISTORY | 5 +++
utils/gsimplecal/PRE_BUILD | 1
utils/gsimplecal/dt-init.patch | 54
+++++++++++++++++++++++++++++++++++++++++
4 files changed, 62 insertions(+), 2 deletions(-)

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

gsimplecal: => 2.4

diff --git a/utils/gsimplecal/DETAILS b/utils/gsimplecal/DETAILS
index 3b353f1..ebbcc9b 100755
--- a/utils/gsimplecal/DETAILS
+++ b/utils/gsimplecal/DETAILS
@@ -1,8 +1,8 @@
SPELL=gsimplecal
- VERSION=2.3
+ VERSION=2.4
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/dmedvinsky/${SPELL}/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:b7667c435ddcd44ac6c4c13d7feddc48c206295a31bd98071d788feed9d8cfe6e0bb1af3f788179ef61fd81735ddd43c2551e661a42b7073b58e708399dc94f9
+
SOURCE_HASH=sha512:462e6def99a11c1e69c2faf572d50ad7f59312cbb31a8d7e0694e95b97fb293592b8cf2bde7e62cb52e96f9bca1de36487b8f867183cd3b4ac351b36e1319cb5
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOC_DIRS=""
WEB_SITE=http://dmedvinsky.github.io/gsimplecal/
diff --git a/utils/gsimplecal/HISTORY b/utils/gsimplecal/HISTORY
index 02af9d5..c7b27f1 100644
--- a/utils/gsimplecal/HISTORY
+++ b/utils/gsimplecal/HISTORY
@@ -1,3 +1,8 @@
+2022-07-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4
+ * PRE_BUILD: apply patch
+ * dt-init.patch: added, to fix build
+
2022-07-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.3

diff --git a/utils/gsimplecal/PRE_BUILD b/utils/gsimplecal/PRE_BUILD
index 2db40d8..33f33f8 100755
--- a/utils/gsimplecal/PRE_BUILD
+++ b/utils/gsimplecal/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

+patch -p1 < "${SPELL_DIRECTORY}/dt-init.patch" &&
patch -p0 < "${SPELL_DIRECTORY}/margin-bottom.patch" &&

./autogen.sh
diff --git a/utils/gsimplecal/dt-init.patch b/utils/gsimplecal/dt-init.patch
new file mode 100644
index 0000000..6f1a2d8
--- /dev/null
+++ b/utils/gsimplecal/dt-init.patch
@@ -0,0 +1,54 @@
+From 661f689d30a2dd858df352db036963f89b74a6a0 Mon Sep 17 00:00:00 2001
+From: M B <85039141+m-bartlett AT users.noreply.github.com>
+Date: Sun, 17 Jul 2022 15:56:20 -0600
+Subject: [PATCH] fix datetime initialization
+
+---
+ src/Calendar.cpp | 29 +++++++++++++++++------------
+ 1 file changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/src/Calendar.cpp b/src/Calendar.cpp
+index 1a34ff5..128ba92 100644
+--- a/src/Calendar.cpp
++++ b/src/Calendar.cpp
+@@ -170,17 +170,22 @@ bool Calendar::runExternalViewer()
+ int year, month, day;
+ gtk_calendar_get_date((GtkCalendar*)widget,
+ (guint*)&year, (guint*)&month, (guint*)&day);
+- GDateTime* datetime = g_date_time_new_local(year, month, day, 0, 0,
0.0);
+-
+- struct tm date = {
+- .tm_sec = 0, .tm_min = 0, .tm_hour = 0,
+- .tm_mday = g_date_time_get_day_of_month(datetime),
+- .tm_mon = g_date_time_get_month(datetime),
+- .tm_year = g_date_time_get_year(datetime) - 1900,
+- .tm_wday = (g_date_time_get_day_of_week(datetime)+2)%7,
+- .tm_yday = g_date_time_get_day_of_year(datetime),
+- .tm_isdst = g_date_time_is_daylight_savings(datetime),
+- };
++
++ // gtk_calendar_get_date returns 0-index month, but
g_date_time_new_utc needs 1-indexed
++ GDateTime* datetime = g_date_time_new_utc(year, month+1, day, 0, 0,
0.0);
++
++ struct tm date;
++ date.tm_sec = 0;
++ date.tm_min = 0;
++ date.tm_hour = 0;
++ date.tm_mday = g_date_time_get_day_of_month(datetime);
++ date.tm_mon = month;
++ date.tm_year = g_date_time_get_year(datetime) - 1900;
++ date.tm_wday = g_date_time_get_day_of_week(datetime) % 7;
++ date.tm_yday = g_date_time_get_day_of_year(datetime);
++ date.tm_isdst = g_date_time_is_daylight_savings(datetime);
++
++ g_date_time_unref (datetime);
+
+ size_t buf_size = len + 64;
+ char* cmd = new char[buf_size];
+@@ -191,4 +196,4 @@ bool Calendar::runExternalViewer()
+ } else {
+ return false;
+ }
+-}
++}
+\ No newline at end of file



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5465ddd6bbfddbe314d6dd0045c384ac4d819c4e), Vlad Glagolev, 07/17/2022

Archive powered by MHonArc 2.6.24.

Top of Page